update submodules (#9)

* update submodules * Add lxi-tools and liblxi version in project version
lxi-tools · Nov 6, 2024 · bd4dcbf · bd4dcbf
1 parent eb9e799
commit bd4dcbf
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 4 deletions.
diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml
@@ -13,6 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           submodules: true
       - uses: msys2/setup-msys2@v2
         with:
@@ -22,6 +23,10 @@ jobs:
       - name: Build
         run: |
           bash msys2_scripts/msys2-lxi-tools-pacman.sh
+          LXI_TAG="$(cd lxi-tools && git describe --tags)"
+          LIBLXI_TAG="$(cd liblxi && git describe --tags)"
+          FULL_TAG=$LXI_TAG-$LIBLXI_TAG
+          cd lxi-tools && meson rewrite kwargs set project / version $FULL_TAG && cd ..
           pacman -S --noconfirm mingw-w64-ucrt-x86_64-imagemagick
           meson setup liblxi/build liblxi
           meson compile -C liblxi/build

diff --git a/.github/workflows/linux-docket-build-check.yml b/.github/workflows/linux-docket-build-check.yml
@@ -8,6 +8,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           submodules: true
       - name: Build in docker
         run:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,6 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           submodules: true
       - uses: msys2/setup-msys2@v2
         with:
@@ -19,6 +20,10 @@ jobs:
       - name: Build
         run: |
           bash msys2_scripts/msys2-lxi-tools-pacman.sh
+          LXI_TAG="$(cd lxi-tools && git describe --tags)"
+          LIBLXI_TAG="$(cd liblxi && git describe --tags)"
+          FULL_TAG=$LXI_TAG-$LIBLXI_TAG
+          cd lxi-tools && meson rewrite kwargs set project / version $FULL_TAG && cd ..
           pacman -S --noconfirm mingw-w64-ucrt-x86_64-imagemagick
           meson setup liblxi/build liblxi
           meson compile -C liblxi/build

diff --git a/liblxi b/liblxi
diff --git a/lxi-tools b/lxi-tools
diff --git a/msys2_scripts/msys2-lxi-tools-compile.sh b/msys2_scripts/msys2-lxi-tools-compile.sh
@@ -33,6 +33,8 @@ cd $SCRIPT_DIR/../$LIBLXI_DIR && meson install -C build
 
 export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/ucrt64/lib/pkgconfig:$PKG_CONFIG_PATH
 
+cd $SCRIPT_DIR/../$LXI_TOOLS_DIR && git config core.filemode false
+
 cd $SCRIPT_DIR/../$LXI_TOOLS_DIR && meson setup build
 
 cd $SCRIPT_DIR/../$LXI_TOOLS_DIR && meson compile -j 1 -C build

diff --git a/msys2_scripts/msys2-lxi-tools-redistributable.sh b/msys2_scripts/msys2-lxi-tools-redistributable.sh
@@ -52,7 +52,7 @@ cp /usr/bin/msys-hx509-5.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_
 cp /usr/bin/msys-iconv-2.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/
 cp /usr/bin/msys-krb5-26.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/
 
-cp /usr/local/bin/msys-lxi-1.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/
+cp /usr/local/bin/*.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/
 cp /usr/bin/msys-ncursesw6.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/
 cp /usr/bin/msys-readline8.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/
 cp /usr/bin/msys-roken-18.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/
@@ -66,4 +66,4 @@ cp /ucrt64/bin/lua54.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA
 cp /ucrt64//bin/zlib1.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/
 cp /ucrt64//bin/gdbus.exe $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/
 
-cp /usr/local/bin/msys-lxi-1.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/
+cp /usr/local/bin/msys-lxi-1.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/
+14 −5		src/cygwin_dnssd.c
+3 −3		src/cygwin_dnssd.h
+33 −11		src/meson.build
+2 −2		src/vxi11.c
+3 −1		meson.build
+3 −6		src/lxi_gui-application.c
+1 −1		src/lxi_gui-main.c
+3 −3		src/lxi_gui-prefs.c
+3 −3		src/lxi_gui-prefs.h
+1 −1		src/lxi_gui-prefs.ui
+18 −14		src/lxi_gui-window.c
+1 −1		src/meson.build
+1 −1		src/options.c
+9 −0		version.sh