Skip to content

Commit caa9ac0

Browse files
doszadosza
authored
Merge pull request #178 from dosza/v0.6.x
v0.6.5
2 parents b0cf2bd + bba228f commit caa9ac0

File tree

9 files changed

+26
-21
lines changed

9 files changed

+26
-21
lines changed

‎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.4
6-
#Date: 02/06/2024
5+
#Version: 0.6.5
6+
#Date: 02/11/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.4
6-
#Date: 02/06/2024
5+
#Version: 0.6.5
6+
#Date: 02/11/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.4
6-
#Date: 02/06/2024
5+
#Version: 0.6.5
6+
#Date: 02/11/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.4
5+
#Version: 0.6.5
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.4
6-
#Date: 02/06/2024
5+
#Version: 0.6.5
6+
#Date: 02/11/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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
#-------------------------------------------------------------------------------------------------#
33
#Universidade federal de Mato Grosso (Alma Mater)
44
#Course: Science Computer
5-
#Version: 0.6.4
6-
#Date: 02/06/2024
5+
#Version: 0.6.5
6+
#Date: 02/11/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.4"
14+
LAMW_INSTALL_VERSION="0.6.5"
1515
ANT_VERSION_STABLE='1.10.11'
1616
CMD_SDK_TOOLS_VERSION="9123335"
1717
CMD_SDK_TOOLS_VERSION_STR="8.0"
@@ -51,7 +51,7 @@ OLD_LAZARUS_STABLE_VERSION=(
5151
)
5252

5353
OLD_LAMW_INSTALL_VERSION=(
54-
0.6.{3..0}
54+
0.6.{4..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: 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.4
6-
#Date: 02/06/2024
5+
#Version: 0.6.5
6+
#Date: 02/11/2024
77
#Description: "installer.sh" is part of the core of LAMW Manager. Contains routines for installing LAMW development environment
88
#-------------------------------------------------------------------------------------------------#
99

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

Lines changed: 6 additions & 6 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.4
6-
#Date: 02/06/2024
5+
#Version: 0.6.5
6+
#Date: 02/11/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

@@ -574,14 +574,14 @@ CreateSDKSimbolicLinks(){
574574
#--------------------------AARCH64 SETTINGS--------------------------
575575
updateFpcAndroidDotCfg(){
576576
local -A fpc_android_changes=(
577-
['\$LLVM_ANDROID_ARM_LIB_PATH']="$ROOT_LAMW/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/$ANDROID_SDK_TARGET"
577+
['\$LLVM_ANDROID_ARM_LIB_PATH']="$ROOT_LAMW/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/30"
578578
['\$GCC_ANDROID_ARM_PATH']="${ARM_ANDROID_TOOLS}"
579-
['\$LLVM_ANDROID_AARCH64_LIB_PATH']="$ROOT_LAMW/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/$ANDROID_SDK_TARGET"
579+
['\$LLVM_ANDROID_AARCH64_LIB_PATH']="$ROOT_LAMW/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/30"
580580
['\$GCC_ANDROID_AARCH64_PATH']="$AARCH64_ANDROID_TOOLS"
581581
['\$GCC_ANDROID_I386_PATH']="$I386_ANDROID_TOOLS"
582-
['\$LLVM_ANDROID_I386_LIB_PATH']="$ROOT_LAMW/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/$ANDROID_SDK_TARGET"
582+
['\$LLVM_ANDROID_I386_LIB_PATH']="$ROOT_LAMW/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/30"
583583
['\$GCC_ANDROID_AMD64_PATH']="$AMD64_ANDROID_TOOLS"
584-
['\$LLVM_ANDROID_AMD64_LIB_PATH']="$ROOT_LAMW/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/$ANDROID_SDK_TARGET"
584+
['\$LLVM_ANDROID_AMD64_LIB_PATH']="$ROOT_LAMW/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/30"
585585
)
586586

587587
arrayMap fpc_android_changes realPath templatePath '

‎lamw_manager/docs/release_notes.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ This page contains information about new features and bug fixes.
55
Latest
66
---
77

8+
### v0.6.5 - 11 Feb, 2024 ###
9+
10+
**Fixes**
11+
+ Fix android NDK LLVM linkage (missing library)
12+
813
### v0.6.4 - 6 Feb, 2024 ###
914

1015
**Fixes**

0 commit comments

Comments
 (0)