diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml index 8669704..9fd648a 100644 --- a/.github/workflows/build-check.yml +++ b/.github/workflows/build-check.yml @@ -32,7 +32,7 @@ jobs: meson compile -j 1 -C lxi-tools/build pacman -Rsc --noconfirm mingw-w64-ucrt-x86_64-imagemagick mingw-w64-ucrt-x86_64-jq bash msys2_scripts/msys2-lxi-tools-redistributable.sh - export APP_DATA=AppData + export APP_DATA=usr /ucrt64/bin/makensis msys2_scripts/nsis_lxi-toolst.nsi echo $BUILD_VERSION > release_tag.txt cat release_tag.txt diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cac1990..79934e2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: meson compile -j 1 -C lxi-tools/build pacman -Rsc --noconfirm mingw-w64-ucrt-x86_64-imagemagick mingw-w64-ucrt-x86_64-jq bash msys2_scripts/msys2-lxi-tools-redistributable.sh - export APP_DATA=AppData + export APP_DATA=usr /ucrt64/bin/makensis msys2_scripts/nsis_lxi-toolst.nsi echo $BUILD_VERSION > release_tag.txt mv msys2_scripts/lxi-tools-$BUILD_VERSION.exe . diff --git a/msys2_scripts/msys2-lxi-tools-create-exe.sh b/msys2_scripts/msys2-lxi-tools-create-exe.sh index 8b8649b..2d9b796 100644 --- a/msys2_scripts/msys2-lxi-tools-create-exe.sh +++ b/msys2_scripts/msys2-lxi-tools-create-exe.sh @@ -11,7 +11,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) REDISTRIBUTABLE_DIR=lxi-tools-redistributable -export APP_DATA=AppData +export APP_DATA=usr export BUILD_VERSION=$(shell $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/AppData/bin/lxi -v | sed 's/[^0-9.]*\([0-9.]*\).*/\1/') echo VERSION $BUILD_VERSION diff --git a/msys2_scripts/msys2-lxi-tools-redistributable.sh b/msys2_scripts/msys2-lxi-tools-redistributable.sh index 16054d0..549bc02 100644 --- a/msys2_scripts/msys2-lxi-tools-redistributable.sh +++ b/msys2_scripts/msys2-lxi-tools-redistributable.sh @@ -11,7 +11,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) REDISTRIBUTABLE_DIR=lxi-tools-redistributable -LXI_TOOLS_APP_DATA=AppData +LXI_TOOLS_APP_DATA=usr echo "copy required files in folder $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR" diff --git a/msys2_scripts/nsis_lxi-toolst.nsi b/msys2_scripts/nsis_lxi-toolst.nsi index 1a6e970..38a1278 100644 --- a/msys2_scripts/nsis_lxi-toolst.nsi +++ b/msys2_scripts/nsis_lxi-toolst.nsi @@ -8,8 +8,7 @@ Icon "..\lxi-tools\build\src\lxi-tools.ico" Outfile "lxi-tools-$%BUILD_VERSION%.exe" -InstallDir "C:\${COMPANYNAME}" - #\${APPNAME}" +InstallDir "C:\Program Files\${COMPANYNAME}" page directory Page instfiles