Skip to content

Commit

Permalink
remove msys wrapper #3628
Browse files Browse the repository at this point in the history
  • Loading branch information
waruqi committed May 14, 2024
1 parent f446bd8 commit 9a749b3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 17 deletions.
14 changes: 2 additions & 12 deletions core/src/demo/xmake.sh
Expand Up @@ -36,15 +36,7 @@ target "demo"
add_installfiles "${projectdir}/(xmake/templates/**)" "share"
add_installfiles "${projectdir}/scripts/xrepo.sh" "bin" "xrepo"

# fix os.exec() call incorrect program from /mingw64/bin. e.g. python, ..
#
# because xmake is installed to /mingw64/bin/xmake,
# os.exec/CreateProcess always gives the highest priority to finding the process from /mingw64/bin (if it exists),
# rather than from the $PATH environment variable.
#
# we install the xmake executable into a separate directory to ensure
# that os.exec() does not look for additional executables.
#
# remove old xmake shell wrapper if it exists
# @see https://github.com/xmake-io/xmake/issues/3628
if is_host "msys"; then
after_install "xmake_after_install"
Expand All @@ -68,8 +60,6 @@ xmake_after_install() {
local target=${1}
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}"
print "\t@if test -f ${installdir}/bin/xmake; then rm ${installdir}/bin/xmake; fi" >> "${xmake_sh_makefile}"
fi
}
5 changes: 0 additions & 5 deletions scripts/msys/xmake.sh

This file was deleted.

0 comments on commit 9a749b3

Please sign in to comment.