More improvements to the build script

This commit is contained in:
RichardG867
2021-11-17 18:01:15 -03:00
parent fbb7cecce0
commit daa8f6731c
2 changed files with 10 additions and 7 deletions

View File

@@ -159,7 +159,10 @@ then
fi fi
# Switch to the correct directory. # Switch to the correct directory.
[ -e "build.sh" ] && cd .. while [ ! -e ".ci/build.sh" ]
do
cd ..
done
# Make source tarball if requested. # Make source tarball if requested.
if [ ! -z "$tarball_name" ] if [ ! -z "$tarball_name" ]
@@ -173,7 +176,7 @@ then
git log --stat -1 > VERSION || rm -f VERSION git log --stat -1 > VERSION || rm -f VERSION
# Archive source. # Archive source.
make_tar $tarball_name.tar make_tar "$cwd/$tarball_name.tar"
status=$? status=$?
# Check if the archival succeeded. # Check if the archival succeeded.
@@ -397,7 +400,7 @@ cd archive_tmp
if is_windows if is_windows
then then
# Create zip. # Create zip.
"$sevenzip" a -y -mx9 "..\\$package_name.zip" * "$sevenzip" a -y -mx9 "$(cygpath -w "$cwd")\\$package_name.zip" *
status=$? status=$?
elif is_mac elif is_mac
then then
@@ -405,7 +408,7 @@ then
: :
else else
# Create binary tarball. # Create binary tarball.
VERBOSE=1 make_tar ../$package_name.tar VERBOSE=1 make_tar "$cwd/$package_name.tar"
status=$? status=$?
fi fi
cd .. cd ..

6
.gitignore vendored
View File

@@ -29,11 +29,11 @@ Makefile
# Build scripts # Build scripts
/archive_tmp /archive_tmp
/static2dll.* /static2dll.*
/*.zip
/*.tar
/*.tar.*
/VERSION /VERSION
/target /target
*.zip
*.tar
*.tar.*
# Visual Studio Code # Visual Studio Code
/.vs /.vs