mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: update Windows build script for smtk2ssrf to refer to 'main' branch

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-06-16 10:05:42 -07:00
parent aecfdbe66d
commit 2a8e2068bf
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
packaging/windows/smtk2ssrf-mxe-build.sh
View file

@ -35,13 +35,13 @@
# smtk2ssrf-mxe-build.sh -i
# should be used.
#
# smtk2ssrf-mxe-build.sh -i -t master
# smtk2ssrf-mxe-build.sh -i -t main
# This will build a release installer of smtk2ssrf placed in a directory under
# the win-build directory where it has been launched, named smtk-import. It will
# build git latest master regardless of subsurface's cross built version.
# build git latest from the default branch regardless of subsurface's cross built version.
#
# smtk2ssrf-mxe-build.sh -b debug
# This will build *just* a windows binary (no packing) of the latest master.
# This will build *just* a windows binary (no packing) of the latest default branch.
# Use with care, this flag *must* match subsurface's build one.
#
# smtk2ssrf-mxe-build.sh -i -t v4.6.4 -b relase -d /mnt/data
@ -172,10 +172,10 @@ make $JOBS >/dev/null && make install || \
#
if [ "$AUTO" = "false" ]; then
cd "$BASEDIR/subsurface"
git reset --hard master && echo -e "$BLUE---> Uncommited changes to Subsurface (if any) dropped$DEFAULT"
git checkout master
git reset --hard main && echo -e "$BLUE---> Uncommited changes to Subsurface (if any) dropped$DEFAULT"
git checkout main
if [ ! -z "$GITREPO" ]; then
git pull --rebase "$GITREPO" master || aborting "git pull failed, Subsurface not updated"
git pull --rebase "$GITREPO" main || aborting "git pull failed, Subsurface not updated"
else
git pull --rebase || aborting "git pull failed, Subsurface not updated"
fi