diff options
| -rw-r--r-- | .github/workflows/freebsd.yml | 2 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rwxr-xr-x | core/src/demo/xmake.sh | 13 |
3 files changed, 6 insertions, 15 deletions
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index 08408dddd..4c7ffc0cf 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml @@ -27,7 +27,7 @@ jobs: copyback: false prepare: pkg install -y curl unzip gmake llvm gsed bash perl5 run: | - ./configure --verbose --diagnosis + ./configure gmake -j4 gmake install export XMAKE_ROOT=y @@ -236,12 +236,12 @@ _os_find() { local depth="${3}" if test_nz "${depth}"; then if is_host "macosx"; then - _ret=$(find "${dir}" -depth "${depth}" -name "${name}") + _ret=$(find "${dir}" -type f -depth "${depth}" -name "${name}") else - _ret=$(find "${dir}" -maxdepth "${depth}" -mindepth "${depth}" -name "${name}") + _ret=$(find "${dir}" -type f -maxdepth "${depth}" -mindepth "${depth}" -name "${name}") fi else - _ret=$(find "${dir}" -name "${name}") + _ret=$(find "${dir}" -type f -name "${name}") fi } diff --git a/core/src/demo/xmake.sh b/core/src/demo/xmake.sh index e0a753639..36d40ffb7 100755 --- a/core/src/demo/xmake.sh +++ b/core/src/demo/xmake.sh @@ -24,17 +24,8 @@ target "demo" # add install files add_installfiles "${projectdir}/(xmake/**.lua)" "share" - add_installfiles "${projectdir}/(xmake/scripts/**.sh)" "share" - add_installfiles "${projectdir}/(xmake/scripts/**.cmake)" "share" - add_installfiles "${projectdir}/(xmake/scripts/**.pl)" "share" - add_installfiles "${projectdir}/(xmake/scripts/**.cpp)" "share" - add_installfiles "${projectdir}/(xmake/scripts/gitignore)" "share" - add_installfiles "${projectdir}/(xmake/scripts/PkgInfo)" "share" - add_installfiles "${projectdir}/(xmake/templates/**.c)" "share" - add_installfiles "${projectdir}/(xmake/templates/**.cpp)" "share" - add_installfiles "${projectdir}/(xmake/templates/**.m)" "share" - add_installfiles "${projectdir}/(xmake/templates/**.mm)" "share" - add_installfiles "${projectdir}/(xmake/templates/**.h)" "share" + add_installfiles "${projectdir}/(xmake/scripts/**)" "share" + add_installfiles "${projectdir}/(xmake/templates/**)" "share" add_installfiles "${projectdir}/scripts/xrepo.sh" "bin" "xrepo" # add syslinks |