diff options
| author | ruki <[email protected]> | 2022-12-27 00:26:41 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-12-27 00:26:41 +0800 |
| commit | 02fb7ef69e78a5d6a8e0066f8866684533836ac3 (patch) | |
| tree | 250bd2c0d19a4eb764e8f24887f6c863bdc57fa0 | |
| parent | 3cb3727b67b20187d04be2270c493d4ce6c6924f (diff) | |
improve archive
| -rwxr-xr-x | scripts/archive-all | 22 | ||||
| -rw-r--r-- | xmake/rules/qt/load.lua | 2 |
2 files changed, 13 insertions, 11 deletions
diff --git a/scripts/archive-all b/scripts/archive-all index a0ca954da..cf397d7bd 100755 --- a/scripts/archive-all +++ b/scripts/archive-all @@ -20,17 +20,19 @@ git clean -dfX git submodule foreach git clean -dfX # copy files to tmpdir/xmake -topdir=$tmpdir/xmake -mkdir -p $topdir/xmake/scripts +version=`cat ./core/xmake.lua | grep -E "^set_version" | grep -oE "[0-9]*\.[0-9]*\.[0-9]*"` +srcdir=$tmpdir/xmake +topdir=$srcdir/xmake-$version +mkdir -p $topdir/scripts cd $tmpdir/repo || exit -cp -r ./core $topdir/xmake -cp -r ./xmake $topdir/xmake/xmake -cp ./scripts/*.sh $topdir/xmake/scripts -cp -r ./scripts/man $topdir/xmake/scripts -cp -r ./scripts/debian $topdir/xmake/scripts -cp ./*.md $topdir/xmake -cp configure $topdir/xmake -cd $topdir || exit +cp -r ./core $topdir +cp -r ./xmake $topdir/xmake +cp ./scripts/*.sh $topdir/scripts +cp -r ./scripts/man $topdir/scripts +cp -r ./scripts/debian $topdir/scripts +cp ./*.md $topdir +cp configure $topdir +cd $srcdir || exit rm -rf ./core/src/tbox/tbox/src/demo rm -rf ./core/src/luajit diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua index 7d641b134..0d6ea17f8 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -130,7 +130,7 @@ function main(target, opt) local languages = target:get("languages") local cxxlang = false for _, lang in ipairs(languages) do - if lang:startswith("cxx") or lang:startswith("c++") then + if lang:startswith("xx") or lang:startswith("++") then cxxlang = true break end |