clean up package

3 files changed, 26 insertions, 12 deletions

diff --git a/scripts/makeself/build-runfile.sh b/scripts/makeself/build-runfile.sh
index 7f65678ad..87a325557 100755
--- a/scripts/makeself/build-runfile.sh
+++ b/scripts/makeself/build-runfile.sh
@@ -2,21 +2,35 @@
 
 cd "$(dirname "$0")/../.."
 xmakeroot=`pwd`
+temproot=/tmp/xmake-makeself
 
 # prepare files to pack
-mkdir -p /tmp/xmake-makeself/xmake
-cp -r ./core /tmp/xmake-makeself/xmake
-cp -r ./scripts /tmp/xmake-makeself/xmake
-cp -r ./xmake /tmp/xmake-makeself/xmake
-cp ./*.md /tmp/xmake-makeself/xmake
-cp makefile /tmp/xmake-makeself/xmake
+rm -rf $temproot
+mkdir -p $temproot/xmake
+cp -r ./core $temproot/xmake
+cp -r ./scripts $temproot/xmake
+cp -r ./xmake $temproot/xmake
+cp ./*.md $temproot/xmake
+cp makefile $temproot/xmake
+cd $temproot/xmake
+rm -rf ./.xmake ./build
+rm -rf ./core/src/tbox/tbox/src/demo
+rm -rf ./core/src/pdcurses
 
-cd /tmp/xmake-makeself
+version=`cat ./core/xmake.lua | grep -E "^set_version" | grep -oE "[0-9]*\.[0-9]*\.[0-9]*"`
+sed -i "s/#xmake-version#/$version/g" ./scripts/makeself/header
+sed -i "s/#xmake-version#/$version/g" ./scripts/makeself/lsm
+
+cd $temproot
 # install makeself
 wget https://github.com/megastep/makeself/releases/download/release-2.4.0/makeself-2.4.0.run -O ./makeself-2.4.0.run
 sh ./makeself-2.4.0.run
 
 # make runfile
-./makeself-2.4.0/makeself.sh --sha256 --lsm ./xmake/scripts/makeself/lsm --help-header ./xmake/scripts/makeself/header ./xmake xmake.run xmake ./scripts/get.sh __local__
-
-cp xmake.run $xmakeroot/scripts/makeself
+./makeself-2.4.0/makeself.sh \
+    --sha256 \
+    --lsm ./xmake/scripts/makeself/lsm \
+    --help-header ./xmake/scripts/makeself/header \
+    ./xmake $xmakeroot/scripts/makeself/xmake.run \
+    xmake \
+    ./scripts/get.sh __local__
diff --git a/scripts/makeself/header b/scripts/makeself/header
index 5622e4b9b..a65aeddf0 100644
--- a/scripts/makeself/header
+++ b/scripts/makeself/header
@@ -1,4 +1,4 @@
-xmake, A cross-platform build utility based on Lua
+xmake v#xmake-version#, A cross-platform build utility based on Lua
 Copyright (C) 2015-2019 Ruki Wang, tboox.org, xmake.io
 Copyright (C) 2005-2015 Mike Pall, luajit.org
                          _        
diff --git a/scripts/makeself/lsm b/scripts/makeself/lsm
index 88b322af2..012efa4a1 100644
--- a/scripts/makeself/lsm
+++ b/scripts/makeself/lsm
@@ -1,6 +1,6 @@
 Begin3
 Title:          xmake
-Version:        2.7.0
+Version:        #xmake-version#
 Description:    xmake is a cross-platform build utility based on lua. 
                 The project focuses on making development and building easier and 
                 provides many features (e.g package, install, plugin, macro, action, option, task ...),