summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2022-12-22 00:52:34 +0800
committerruki <[email protected]>2022-12-22 00:52:34 +0800
commit5450901c880a20fdf1fae18fc5bc3eb428c8ec7f (patch)
tree86d18752ed0b2a6ecafaa78ccd1c6a5809cbe48d
parent0b991ef3dc40f0683055f1602dcd6f95ffed9e25 (diff)
just find file
-rw-r--r--.github/workflows/freebsd.yml2
-rwxr-xr-xconfigure6
-rwxr-xr-xcore/src/demo/xmake.sh13
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
diff --git a/configure b/configure
index 64c568180..d790179ce 100755
--- a/configure
+++ b/configure
@@ -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