Fix *nix tarballs to extract in a subfolder.

Also incorporate retry improvements by Stan

Reported by: madPilot
Differential Revision: https://code.wildfiregames.com/D3585
This was SVN commit r24944.
This commit is contained in:
wraitii 2021-02-27 10:19:31 +00:00
parent 0363ff112e
commit c6f50b253f
2 changed files with 18 additions and 3 deletions

View File

@ -30,9 +30,20 @@ pipeline {
}
stages {
stage("Checkout") {
stage ("Checkout") {
options {
retry(3)
}
steps {
svn "https://svn.wildfiregames.com/public/ps/trunk@${params.SVN_REV}"
script {
try {
svn "https://svn.wildfiregames.com/public/ps/trunk@${params.SVN_REV}"
} catch(e) {
sh "svn cleanup"
sleep 300
throw e
}
}
sh "svn cleanup"
sh "svn revert . -R"
sh "svn st --no-ignore | cut -c 9- | xargs rm -rfv"
@ -59,6 +70,8 @@ pipeline {
sh "svn st binaries/ --no-ignore | cut -c 9- | xargs rm -rf"
sh "svn st build/ --no-ignore | cut -c 9- | xargs rm -rf"
sh "svn st libraries/ --no-ignore | cut -c 9- | xargs rm -rf"
// The generated tests use hardcoded paths so they must be deleted as well.
sh 'python3 -c \"import glob; print(\\\" \\\".join(glob.glob(\\\"source/**/tests/**.cpp\\\", recursive=True)));\" | xargs rm -v'
sh "svn revert build/ -R"
// Then run the core object.

View File

@ -16,11 +16,13 @@ tar cf $PREFIX-unix-build.tar \
--exclude='libraries/source/fcollada/src/FCollada/FColladaTest' \
--exclude='libraries/source/spidermonkey/include-*' \
--exclude='libraries/source/spidermonkey/lib*' \
-s "|.|$PREFIX/~|" \
{source,build,libraries/source,binaries/system/readme.txt,binaries/data/l10n,binaries/data/tests,binaries/data/mods/_test.*,*.txt}
tar cf $PREFIX-unix-data.tar \
--exclude='binaries/data/config/dev.cfg' \
-s "|archives|binaries/data/mods|" \
-s "|archives|$PREFIX/binaries/data/mods|" \
-s "|binaries|$PREFIX/binaries|" \
binaries/data/{config,tools} archives/
# TODO: ought to include generated docs in here, perhaps?