summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/msys2_mingw.yml1
-rwxr-xr-xcore/src/demo/xmake.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/msys2_mingw.yml b/.github/workflows/msys2_mingw.yml
index 2d96441d5..3e336db2a 100644
--- a/.github/workflows/msys2_mingw.yml
+++ b/.github/workflows/msys2_mingw.yml
@@ -43,6 +43,7 @@ jobs:
./configure --prefix=${{ matrix.prefix }}
make
make install
+ ls -l ${{matrix.prefix}}/bin
xmake --version
- name: Tests
diff --git a/core/src/demo/xmake.sh b/core/src/demo/xmake.sh
index 47e86b227..2969eb13c 100755
--- a/core/src/demo/xmake.sh
+++ b/core/src/demo/xmake.sh
@@ -40,7 +40,6 @@ target "demo"
# @see https://github.com/xmake-io/xmake/issues/3628
if is_host "msys"; then
after_install "xmake_after_install"
- add_installfiles "${projectdir}/scripts/msys/xmake.sh" "bin" "xmake"
fi
# add syslinks
@@ -62,6 +61,7 @@ xmake_after_install() {
local installdir=${2}
if test_eq "${project_generator}" "gmake"; then
print "\t@if test -f ${installdir}/bin/xmake.exe; then rm ${installdir}/bin/xmake.exe; fi" >> "${xmake_sh_makefile}"
+ print "\t@cp ${projectdir}/scripts/msys/xmake.sh ${installdir}/bin/xmake" >> "${xmake_sh_makefile}"
print "\t@cp ${buildir}/xmake.exe ${installdir}/share/xmake" >> "${xmake_sh_makefile}"
fi
}