Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lamw_manager/assets/build-lamw-setup
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#-------------------------------------------------------------------------------------------------#
#Universidade federal de Mato Grosso (Alma Mater)
#Course: Science Computer
#Version: 0.6.4
#Date: 02/06/2024
#Version: 0.6.5
#Date: 02/11/2024
#Description: This script generates compiles LAMW Manager source code into an executable installer.
#Note: This script requires makeself, read more in https://makeself.io/
#-------------------------------------------------------------------------------------------------#
Expand Down
4 changes: 2 additions & 2 deletions lamw_manager/core/cross-builder/cross-builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#-------------------------------------------------------------------------------------------------#
#Universidade federal de Mato Grosso (Alma Mater)
#Course: Science Computer
#Version: 0.6.4
#Date: 02/06/2024
#Version: 0.6.5
#Date: 02/11/2024
#Description:The "cross-builder.sh" is part of the core of LAMW Manager. This script contains crosscompile compiler generation routines for ARMv7 / AARCH64- Android
#-------------------------------------------------------------------------------------------------#

Expand Down
4 changes: 2 additions & 2 deletions lamw_manager/core/headers/.init_lamw_manager.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#-------------------------------------------------------------------------------------------------#
#Universidade federal de Mato Grosso (Alma Mater)
#Course: Science Computer
#Version: 0.6.4
#Date: 02/06/2024
#Version: 0.6.5
#Date: 02/11/2024
#Description: The ".init_lamw_manager.sh" is part of the core of LAMW Manager. This script check conditions to init LAMW Manager
#-------------------------------------------------------------------------------------------------#

Expand Down
2 changes: 1 addition & 1 deletion lamw_manager/core/headers/.lamw_comple.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#-------------------------------------------------------------------------------------------------#
#Universidade federal de Mato Grosso (Alma Mater)
#Course: Science Computer
#Version: 0.6.4
#Version: 0.6.5
#Description: This script contains routines for completing LAMW Manager arguments.
#Ref:https://www.vivaolinux.com.br/dica/Shell-script-autocompletion-Como-implementar
#-------------------------------------------------------------------------------------------------#
Expand Down
4 changes: 2 additions & 2 deletions lamw_manager/core/headers/lamw4linux_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#-------------------------------------------------------------------------------------------------#
#Universidade federal de Mato Grosso (Alma Mater)
#Course: Science Computer
#Version: 0.6.4
#Date: 02/06/2024
#Version: 0.6.5
#Date: 02/11/2024
#Description: The "lamw_headers" is part of the core of LAMW Manager. This script contains LAMW Manager variables.
#-------------------------------------------------------------------------------------------------#
LAMW_IDE_HOME_CFG="$LAMW_USER_HOME/.lamw4linux"
Expand Down
8 changes: 4 additions & 4 deletions lamw_manager/core/headers/lamw_headers
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
#-------------------------------------------------------------------------------------------------#
#Universidade federal de Mato Grosso (Alma Mater)
#Course: Science Computer
#Version: 0.6.4
#Date: 02/06/2024
#Version: 0.6.5
#Date: 02/11/2024
#Description: The "lamw_headers" is part of the core of LAMW Manager. This script contains LAMW Manager variables.
#-------------------------------------------------------------------------------------------------#

#--------------------------------------------------------------------------------------------------
# Section Version Variables
#--------------------------------------------------------------------------------------------------

LAMW_INSTALL_VERSION="0.6.4"
LAMW_INSTALL_VERSION="0.6.5"
ANT_VERSION_STABLE='1.10.11'
CMD_SDK_TOOLS_VERSION="9123335"
CMD_SDK_TOOLS_VERSION_STR="8.0"
Expand Down Expand Up @@ -51,7 +51,7 @@ OLD_LAZARUS_STABLE_VERSION=(
)

OLD_LAMW_INSTALL_VERSION=(
0.6.{3..0}
0.6.{4..0}
0.5.9{.{2..1},}
0.5.{8..0}
0.4.{8..4}
Expand Down
4 changes: 2 additions & 2 deletions lamw_manager/core/installer/installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#-------------------------------------------------------------------------------------------------#
#Universidade federal de Mato Grosso (Alma Mater)
#Course: Science Computer
#Version: 0.6.4
#Date: 02/06/2024
#Version: 0.6.5
#Date: 02/11/2024
#Description: "installer.sh" is part of the core of LAMW Manager. Contains routines for installing LAMW development environment
#-------------------------------------------------------------------------------------------------#

Expand Down
12 changes: 6 additions & 6 deletions lamw_manager/core/settings-editor/lamw-settings-editor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#-------------------------------------------------------------------------------------------------#
#Universidade federal de Mato Grosso (mater-alma)
#Course: Science Computer
#Version: 0.6.4
#Date: 02/06/2024
#Version: 0.6.5
#Date: 02/11/2024
#Description: The "lamw-manager-settings-editor.sh" is part of the core of LAMW Manager. Responsible for managing LAMW Manager / LAMW configuration files..
#-----------------------------------------------------------------------f--------------------------#

Expand Down Expand Up @@ -574,14 +574,14 @@ CreateSDKSimbolicLinks(){
#--------------------------AARCH64 SETTINGS--------------------------
updateFpcAndroidDotCfg(){
local -A fpc_android_changes=(
['\$LLVM_ANDROID_ARM_LIB_PATH']="$ROOT_LAMW/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/$ANDROID_SDK_TARGET"
['\$LLVM_ANDROID_ARM_LIB_PATH']="$ROOT_LAMW/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/30"
['\$GCC_ANDROID_ARM_PATH']="${ARM_ANDROID_TOOLS}"
['\$LLVM_ANDROID_AARCH64_LIB_PATH']="$ROOT_LAMW/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/$ANDROID_SDK_TARGET"
['\$LLVM_ANDROID_AARCH64_LIB_PATH']="$ROOT_LAMW/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/30"
['\$GCC_ANDROID_AARCH64_PATH']="$AARCH64_ANDROID_TOOLS"
['\$GCC_ANDROID_I386_PATH']="$I386_ANDROID_TOOLS"
['\$LLVM_ANDROID_I386_LIB_PATH']="$ROOT_LAMW/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/$ANDROID_SDK_TARGET"
['\$LLVM_ANDROID_I386_LIB_PATH']="$ROOT_LAMW/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/30"
['\$GCC_ANDROID_AMD64_PATH']="$AMD64_ANDROID_TOOLS"
['\$LLVM_ANDROID_AMD64_LIB_PATH']="$ROOT_LAMW/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/$ANDROID_SDK_TARGET"
['\$LLVM_ANDROID_AMD64_LIB_PATH']="$ROOT_LAMW/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/30"
)

arrayMap fpc_android_changes realPath templatePath '
Expand Down
5 changes: 5 additions & 0 deletions lamw_manager/docs/release_notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ This page contains information about new features and bug fixes.
Latest
---

### v0.6.5 - 11 Feb, 2024 ###

**Fixes**
+ Fix android NDK LLVM linkage (missing library)

### v0.6.4 - 6 Feb, 2024 ###

**Fixes**
Expand Down