Skip to content

Commit 1da6071

Browse files
doszadosza
authored
Merge pull request #181 from dosza/v0.6.x
v0.6.8
2 parents e2a6eb6 + 461c88d commit 1da6071

File tree

12 files changed

+66
-37
lines changed

12 files changed

+66
-37
lines changed

‎README.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# LAMW Manager
22

33

4-
[![Version](https://img.shields.io/badge/Release-v0.6.7-blue)](https://github.com/dosza/LAMWManager-linux/blob/v0.6.x/lamw_manager/docs/release_notes.md#latest) [![Build-status](https://img.shields.io/github/actions/workflow/status/dosza/LAMWManager-linux/main.yml?branch=v0.6.x)](https://github.com/dosza/LAMWManager-linux/releases/download/v0.6.7/lamw_manager_setup.sh) [![license](https://img.shields.io/github/license/dosza/LAMWManager-linux)](https://github.com/dosza/LAMWManager-linux/blob/v0.6.x/LICENSE) [![Stars](https://img.shields.io/github/stars/dosza/LAMWManager-linux?style=default)](https://github.com/dosza/LAMWManager-linux/stargazers)
4+
[![Version](https://img.shields.io/badge/Release-v0.6.8-blue)](https://github.com/dosza/LAMWManager-linux/blob/v0.6.x/lamw_manager/docs/release_notes.md#latest) [![Build-status](https://img.shields.io/github/actions/workflow/status/dosza/LAMWManager-linux/main.yml?branch=v0.6.x)](https://github.com/dosza/LAMWManager-linux/releases/download/v0.6.8/lamw_manager_setup.sh) [![license](https://img.shields.io/github/license/dosza/LAMWManager-linux)](https://github.com/dosza/LAMWManager-linux/blob/v0.6.x/LICENSE) [![Stars](https://img.shields.io/github/stars/dosza/LAMWManager-linux?style=default)](https://github.com/dosza/LAMWManager-linux/stargazers)
55

66
LAMW Manager is a command line tool,like *APT*, to automate the **installation**, **configuration** and **upgrade**<br/>the framework [LAMW - Lazarus Android Module Wizard](https://github.com/jmpessoa/lazandroidmodulewizard)
77

@@ -58,7 +58,7 @@ LAMW Manager install the following [dependencies] tools:
5858
Getting Started!!
5959
---
6060
**How to use LAMW Manager:**
61-
+ Click here to download [*LAMW Manager Setup*](https://github.com/dosza/LAMWManager-linux/releases/download/v0.6.7/lamw_manager_setup.sh)
61+
+ Click here to download [*LAMW Manager Setup*](https://github.com/dosza/LAMWManager-linux/releases/download/v0.6.8/lamw_manager_setup.sh)
6262
+ Go to download directory and right click *Open in Terminal*
6363
+ Run command : *bash lamw_manager_setup.sh*¹
6464

@@ -92,6 +92,11 @@ Recommended:
9292
1. Close all xfce terminal
9393
2. If that doesn't work, restart your desktop session.
9494

95+
#### LAMW: error moving component ####
96+
97+
Recommend:
98+
1. Go to File -> Restart
99+
95100
Release Notes:
96101
---
97102
For information on new features and bug fixes read the [*Release Notes*](https://github.com/dosza/LAMWManager-linux/blob/v0.6.x/lamw_manager/docs/release_notes.md#latest)
@@ -100,5 +105,5 @@ Congratulations!!
100105
---
101106
You are now a Lazarus for Android developer!</br>[Building Android application with **LAMW** is **RAD**!](https://drive.google.com/open?id=1CeDDpuDfRwYrKpN7VHbossH6GfZUfqjm)
102107

103-
For more info read [**LAMW Manager v0.6.7 Manual**](https://github.com/dosza/LAMWManager-linux/blob/v0.6.x/lamw_manager/docs/man.md)
108+
For more info read [**LAMW Manager v0.6.8 Manual**](https://github.com/dosza/LAMWManager-linux/blob/v0.6.x/lamw_manager/docs/man.md)
104109

‎lamw_manager/assets/build-lamw-setup

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#-------------------------------------------------------------------------------------------------#
33
#Universidade federal de Mato Grosso (Alma Mater)
44
#Course: Science Computer
5-
#Version: 0.6.7
6-
#Date: 05/09/2024
5+
#Version: 0.6.8
6+
#Date: 10/13/2024
77
#Description: This script generates compiles LAMW Manager source code into an executable installer.
88
#Note: This script requires makeself, read more in https://makeself.io/
99
#-------------------------------------------------------------------------------------------------#

‎lamw_manager/core/cross-builder/cross-builder.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#-------------------------------------------------------------------------------------------------#
33
#Universidade federal de Mato Grosso (Alma Mater)
44
#Course: Science Computer
5-
#Version: 0.6.7
6-
#Date: 05/09/2024
5+
#Version: 0.6.8
6+
#Date: 10/13/2024
77
#Description:The "cross-builder.sh" is part of the core of LAMW Manager. This script contains crosscompile compiler generation routines for ARMv7 / AARCH64- Android
88
#-------------------------------------------------------------------------------------------------#
99

‎lamw_manager/core/headers/.init_lamw_manager.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#-------------------------------------------------------------------------------------------------#
33
#Universidade federal de Mato Grosso (Alma Mater)
44
#Course: Science Computer
5-
#Version: 0.6.7
6-
#Date: 05/09/2024
5+
#Version: 0.6.8
6+
#Date: 10/13/2024
77
#Description: The ".init_lamw_manager.sh" is part of the core of LAMW Manager. This script check conditions to init LAMW Manager
88
#-------------------------------------------------------------------------------------------------#
99

‎lamw_manager/core/headers/.lamw_comple.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#-------------------------------------------------------------------------------------------------#
33
#Universidade federal de Mato Grosso (Alma Mater)
44
#Course: Science Computer
5-
#Version: 0.6.7
5+
#Version: 0.6.8
66
#Description: This script contains routines for completing LAMW Manager arguments.
77
#Ref:https://www.vivaolinux.com.br/dica/Shell-script-autocompletion-Como-implementar
88
#-------------------------------------------------------------------------------------------------#

‎lamw_manager/core/headers/lamw4linux_env.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#-------------------------------------------------------------------------------------------------#
33
#Universidade federal de Mato Grosso (Alma Mater)
44
#Course: Science Computer
5-
#Version: 0.6.7
6-
#Date: 05/09/2024
5+
#Version: 0.6.8
6+
#Date: 10/13/2024
77
#Description: The "lamw_headers" is part of the core of LAMW Manager. This script contains LAMW Manager variables.
88
#-------------------------------------------------------------------------------------------------#
99
LAMW_IDE_HOME_CFG="$LAMW_USER_HOME/.lamw4linux"

‎lamw_manager/core/headers/lamw_headers

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
#-------------------------------------------------------------------------------------------------#
33
#Universidade federal de Mato Grosso (Alma Mater)
44
#Course: Science Computer
5-
#Version: 0.6.7
6-
#Date: 05/09/2024
5+
#Version: 0.6.8
6+
#Date: 10/13/2024
77
#Description: The "lamw_headers" is part of the core of LAMW Manager. This script contains LAMW Manager variables.
88
#-------------------------------------------------------------------------------------------------#
99

1010
#--------------------------------------------------------------------------------------------------
1111
# Section Version Variables
1212
#--------------------------------------------------------------------------------------------------
1313

14-
LAMW_INSTALL_VERSION="0.6.7"
14+
LAMW_INSTALL_VERSION="0.6.8"
1515
ANT_VERSION_STABLE='1.10.11'
1616
CMD_SDK_TOOLS_VERSION="11076708"
1717
CMD_SDK_TOOLS_VERSION_STR="12.0"
18-
LAZARUS_STABLE_VERSION="2.0.12"
18+
LAZARUS_STABLE_VERSION="2.2.0"
1919
FPC_TRUNK_VERSION="3.2.2"
2020
FPC_LAZ_DEB_VERSION="2.0.12"
2121
FPC_DEB_VERSION="3.2.0-1"
@@ -51,7 +51,7 @@ OLD_LAZARUS_STABLE_VERSION=(
5151
)
5252

5353
OLD_LAMW_INSTALL_VERSION=(
54-
0.6.{6..0}
54+
0.6.{7..0}
5555
0.5.9{.{2..1},}
5656
0.5.{8..0}
5757
0.4.{8..4}

‎lamw_manager/core/installer/installer.sh

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22
#-------------------------------------------------------------------------------------------------#
33
#Universidade federal de Mato Grosso (Alma Mater)
44
#Course: Science Computer
5-
#Version: 0.6.7
6-
#Date: 05/09/2024
5+
#Version: 0.6.8
6+
#Date: 10/13/2024
77
#Description: "installer.sh" is part of the core of LAMW Manager. Contains routines for installing LAMW development environment
88
#-------------------------------------------------------------------------------------------------#
99

10+
11+
#auxiliar function (must be override after change tag or branch)
12+
afterChangeBranchOrTag(){ :; }
13+
1014
#this function return true if computer is multicore processor
1115
isMultiCoreProcessor(){
1216
local dualcore=2
@@ -255,6 +259,10 @@ gitCheckout(){
255259
if [ -e "$git_src_dir" ]; then
256260
changeDirectory "$git_src_dir"
257261
git config advice.detachedHead false
262+
local current_tag=$(git describe --tags --abbrev=0)
263+
if [ "$current_tag" != "$git_branch" ];then
264+
afterChangeBranchOrTag
265+
fi
258266
git checkout $git_branch
259267
fi
260268
}
@@ -275,6 +283,7 @@ GitPull(){
275283
if [ "$git_branch" != "" ]; then
276284
sucess_filler="$(getCurrentSucessFiller 4 $git_branch)"
277285
startProgressBar
286+
278287
if gitCheckout &>/dev/null; then
279288
stopAsSuccessProgressBar
280289
else stopProgressBarAsFail
@@ -353,8 +362,15 @@ getLazarusSources(){
353362
rm "$old_lazarus_trunk" -rf
354363
fi
355364
fi
365+
366+
#override afterChangeBranchOrTag to mark force rebuild lazarus
367+
function afterChangeBranchOrTag { FORCE_LAZARUS_CLEAN_BUILD=1 ; }
368+
356369
changeDirectory $LAMW4LINUX_HOME
357370
getFromGit "$LAZARUS_STABLE_SRC_LNK" "$LAMW_IDE_HOME" "$LAZARUS_STABLE"
371+
372+
#reset afterChangeBranchOrTag
373+
function afterChangeBranchOrTag { :; }
358374
}
359375

360376
#GET LAMW FrameWork

‎lamw_manager/core/lamw-mgr-core-os.sh

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,13 @@ CheckIfSafeStartLamwManager(){
3939
fi
4040
}
4141

42-
checkRootLAMWInitStatus(){
43-
( [ $UID != 0 ]|| [ "$NO_EXISTENT_ROOT_LAMW_PARENT" = "" ]) && return
4442

45-
local parent="$(dirname NO_EXISTENT_ROOT_LAMW_PARENT)"
43+
safeInitRootLAMW(){
44+
[ $UID != 0 ] && return
4645

47-
if [ -e $parent ];then
48-
if [ -O $parent ]; then
49-
initROOT_LAMW
50-
fi
46+
if [ ! -e "$ROOT_LAMW" ];then
47+
mkdir -p "$ROOT_LAMW"
48+
changeOwnerAllLAMW
5149
fi
5250

5351
}
@@ -83,10 +81,7 @@ installSystemDependencies(){
8381
mainInstall(){
8482
checkIfDistroIsLikeDebian
8583
LAMWPackageManager
86-
checkRootLAMWInitStatus
87-
if ! isLAMWUserOwnerROOTLAMW; then
88-
changeOwnerAllLAMW
89-
fi
84+
safeInitRootLAMW
9085
installSystemDependencies
9186
CleanOldCrossCompileBins
9287
}

‎lamw_manager/core/settings-editor/lamw-settings-editor.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#-------------------------------------------------------------------------------------------------#
33
#Universidade federal de Mato Grosso (mater-alma)
44
#Course: Science Computer
5-
#Version: 0.6.7
6-
#Date: 05/09/2024
5+
#Version: 0.6.8
6+
#Date: 10/13/2024
77
#Description: The "lamw-manager-settings-editor.sh" is part of the core of LAMW Manager. Responsible for managing LAMW Manager / LAMW configuration files..
88
#-----------------------------------------------------------------------f--------------------------#
99

@@ -14,7 +14,8 @@ initLAMWUserConfig(){
1414
"$LAMW_USER_MIMES_PATH"
1515
"$LAMW_USER_APPLICATIONS_PATH"
1616
"$LAMW_USER_HOME/.local/bin"
17-
$LAMW_USER_HOME/.android
17+
"$LAMW_USER_HOME/.android"
18+
"$LAMW_IDE_HOME_CFG"
1819
)
1920

2021
local android_repo_cfg="$LAMW_USER_HOME/.android/repositories.cfg"
@@ -32,8 +33,7 @@ initROOT_LAMW(){
3233
$ANDROID_SDK_ROOT
3334
"$(dirname $JAVA_HOME)"
3435
"$LAMW4LINUX_ETC"
35-
$FPPKG_LOCAL_REPOSITORY
36-
$LAMW_IDE_HOME_CFG
36+
$FPPKG_LOCAL_REPOSITORY
3737
)
3838

3939
for lamw_dir in ${init_root_lamw_dirs[@]}; do

0 commit comments

Comments
 (0)