diff options
| -rw-r--r-- | core/xpack.lua | 1 | ||||
| -rwxr-xr-x | scripts/makeppa | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/core/xpack.lua b/core/xpack.lua index fb9c50264..07e77c1ca 100644 --- a/core/xpack.lua +++ b/core/xpack.lua @@ -89,6 +89,7 @@ xpack("xmakesrc") local srcdir = path.join(package:rootdir(), "xmakesrc") local topdir = path.join(srcdir, "xmake-" .. package:version()) os.tryrm(repodir) + os.tryrm(topdir) os.cp(path.directory(path.absolute(os.projectdir())), repodir) git.clean({repodir = repodir, force = true, all = true}) git.reset({repodir = repodir, hard = true}) diff --git a/scripts/makeppa b/scripts/makeppa index b3c5217a2..652cd44c5 100755 --- a/scripts/makeppa +++ b/scripts/makeppa @@ -32,13 +32,16 @@ basename=xmake-$version+$patch$serie tarball=$workdir/$basename.tar.gz if [ ! -f $tarball ]; then cd core - xmake pack --autobuild=n --formats=src_zip,src_targz --basename=xmake -o ../artifacts + xmake pack -vD --autobuild=n --formats=src_targz --basename=xmake -o ../artifacts cd .. cp ./artifacts/xmake.tar.gz $tarball fi # extract tarball cd $workdir +if [ -d xmakesrc ]; then + rm -rf xmakesrc +fi if [ ! -d $basename ]; then mkdir xmakesrc tar -xvf $basename.tar.gz -C xmakesrc |