6 # I use this in EVERY shell script ;)
11 while ! [ -f ./all ]; do
12 if [ x"`pwd`" = x"/" ]; then
13 echo "Cannot find myself."
14 echo "Please run this script with the working directory inside a Xonotic checkout."
22 # If we are on WINDOWS:
27 # Windows hates users. So this script has to copy itself elsewhere first...
28 cp "$SELF" ../all.xonotic.sh
29 export WE_HATE_OUR_USERS=1
30 exec ../all.xonotic.sh "$@"
38 echo >&2 "
\e[1m$*
\e[m"
41 self=`git hash-object "$SELF"`
44 self_new=`git hash-object "$SELF"`
45 if [ x"$self" != x"$self_new" ]; then
46 msg "./all has changed."
47 if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
48 msg "Rerunning the requested operation to make sure."
49 export XONOTIC_FORBID_RERUN_ALL=1
52 msg "Please try $SELF update, and then retry your requested operation."
69 echo "the root directory"
79 if git ls-files -u | grep ' 1 '; then
81 echo "MERGE CONFLICT."
82 echo "change into the \"$1\" project directory, and then:"
83 echo "- edit the files mentioned above with your favorite editor,"
84 echo " and fix the conflicts (marked with <<<<<<< blocks)"
85 echo "- for binary files, you can select the files using"
86 echo " git checkout --ours or git checkout --theirs"
87 echo "- when done with a file, 'git add' the file"
88 echo "- when done, 'git commit'"
97 while [ x"$yesno" != x"y" -a x"$yesno" != x"n" ]; do
108 check_mergeconflict "$1"
113 data/xonotic-data.pk3dir | | master |
114 data/xonotic-music.pk3dir | | master |
115 data/xonotic-nexcompat.pk3dir | | master | no
116 darkplaces | | div0-stable | svn
117 netradiant | | master |
118 div0-gittools | | master | no
119 data/xonotic-maps.pk3dir | | master |
120 mediasource | | master | no
121 fteqcc | http://github.com/Blub/qclib.git | master |
123 # todo: in darkplaces, change repobranch to div0-stable
125 repos=`echo "$repos_urls" | grep . | cut -d '|' -f 1 | tr -d ' '`
127 base=`git config remote.origin.url`
130 base=${base%xonotic.git}
133 echo "The main repo is not xonotic.git, what have you done?"
137 pushbase=`git config remote.origin.pushurl || true`
140 pushbase=${pushbase%xonotic.git}
145 echo "The main repo is not xonotic.git, what have you done?"
152 repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
153 if [ -n "$repo_t" ]; then
163 if [ x"$1" = x"." ]; then
164 echo "$base""xonotic.git"
166 echo "$base${1##*/}.git"
173 [ -n "$pushbase" ] || return 0
174 repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
175 if [ -n "$repo_t" ]; then
180 echo "$pushbase$repo_t"
184 if [ x"$1" = x"." ]; then
185 echo "$pushbase""xonotic.git"
187 echo "$pushbase${1##*/}.git"
194 repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
195 if [ -n "$repo_t" ]; then
204 echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' '
212 # if we have the dir, always keep it
214 msg "Repository $d enabled because it already exists"
218 # if .yes file exists, always keep it
219 if [ -f "$d.yes" ]; then
220 msg "Repository $d enabled by a .yes file"
224 # if we have .no file, skip
225 if [ -f "$d.no" ]; then
226 msg "Repository $d disabled by a .no file, delete $p.no to enable"
229 # if we have matching pk3, skip
230 if [ x"$p" != x"$d" ] && [ -f "$p" ]; then
231 msg "Repository $d disabled by matching .pk3 file, delete $p or create $d.yes to enable"
234 # if "no" flag is set, skip
237 msg "Repository $d disabled by default, create $d.yes to enable"
242 msg "Repository $d enabled by default"
249 if [ "$#" = 0 ]; then
255 fix_upstream_rebase()
257 if [ -z "$r_me" ] || [ -z "$r_other" ]; then
260 r_base=`git merge-base "$r_me" "$r_other"`
262 # no merge-base? upstream did filter-branch
263 if [ -n "$r_base" ]; then
264 # otherwise, check if the two histories are "similar"
265 r_l_me=`git log --pretty="format:%s" "$r_other".."$r_me" | grep -v "^Merge" | sort -u`
266 r_l_other=`git log --pretty="format:%s" "$r_me".."$r_other" | grep -v "^Merge" | sort -u`
268 # heuristics: upstream rebase/filter-branch if more than 50% of the commits of one of the sides are in the other too
269 r_lc_me=`echo "$r_l_me" | wc -l`
270 r_lc_other=`echo "$r_l_other" | wc -l`
271 r_lc_together=`{ echo "$r_l_me"; echo "$r_l_other"; } | sort -u | wc -l`
272 r_lc_same=$(($r_lc_me + $r_lc_other - $r_lc_together))
274 if [ $(( $r_lc_same * 2 )) -gt $(( $r_lc_me )) ] || [ $(( $r_lc_same * 2 )) -gt $(( $r_lc_other )) ]; then
275 if yesno "Probable upstream rebase detected, automatically fix?" 'git log --oneline --graph --date-order --left-right "$r_other"..."$r_me"'; then
276 git reset --hard "$r_me"
286 fix_upstream_rebase_mergeok()
288 r_me=`git rev-parse --revs-only HEAD^1 2>/dev/null || true`
289 r_other=`git rev-parse --revs-only HEAD^2 2>/dev/null || true`
293 fix_upstream_rebase_mergefail()
295 r_me=`git rev-parse --revs-only HEAD 2>/dev/null || true`
296 r_other=`git rev-parse --revs-only MERGE_HEAD 2>/dev/null || true`
302 verbose git config remote.origin.url "$1"
304 verbose git config remote.origin.pushurl "$2"
306 verbose git config --unset remote.origin.pushurl || true
308 verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
309 verbose git config core.autocrlf input
310 if [ -z "`git config push.default`" ]; then
311 verbose git config push.default current # or is tracking better?
320 find "$@" -xtype f \( -executable -or -type l \) -print > "$ziplist"
321 7za a -tzip -mx=9 -x@"$ziplist" "$archive" "$@" || true
322 zip -9y -@<"$ziplist" "$archive" || true
334 enter "$d0/$d" verbose
335 verbose fix_upstream_rebase_mergefail && verbose fix_upstream_rebase_mergeok
341 pushurl=`repopushurl "$d"`
342 branch=`repobranch "$d"`
343 if [ -d "$d0/$d" ]; then
345 fix_git_config "$url" "$pushurl"
352 if [ x"$1" = x"-N" ]; then
360 pushurl=`repopushurl "$d"`
361 branch=`repobranch "$d"`
362 if [ -d "$d0/$d" ]; then
364 enter "$d0/$d" verbose
365 r=`git symbolic-ref HEAD`
367 if git config branch.$r.remote >/dev/null 2>&1; then
368 if ! verbose git pull; then
369 fix_upstream_rebase_mergefail || true
370 check_mergeconflict "$d"
371 echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
374 fix_upstream_rebase_mergeok || true
379 checkself "$cmd" "$@"
381 verbose git remote prune origin
385 verbose git clone "$url" "$d0/$d"
386 enter "$d0/$d" verbose
387 fix_git_config "$url" "$pushurl"
388 if [ "$branch" != "master" ]; then
389 verbose git checkout --track -b "$branch" origin/"$branch"
396 misc/tools/xonotic-map-compiler-autobuild download
400 if [ x"$1" = x"-f" ]; then
406 if [ -z "$branch" ]; then
409 branch=${remote#origin/}
420 enter "$d0/$d" verbose
422 if [ -n "$b" ] && git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
424 verbose git checkout $checkoutflags "$b"
425 elif [ -n "$b" ] && git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
427 verbose git checkout $checkoutflags --track -b "$b" "$remote/$b"
430 if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
432 verbose git checkout $checkoutflags "$b"
433 elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
435 verbose git checkout $checkoutflags --track -b "$b" "$remote/$b"
437 echo "WTF? Not even branch $b doesn't exist in $d"
442 checkself "$cmd" "$@"
446 echo "The requested branch was not found in any repository."
454 if [ -z "$branch" ]; then
458 if [ -z "$branch" ]; then
461 r=`git symbolic-ref HEAD`
468 dv=`visible_repo_name "$d"`
469 enter "$d0/$d" verbose
470 if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
471 echo "Already having this branch in $dv."
473 if yesno "Branch in $dv?"; then
474 if [ -n "$srcbranch" ]; then
477 b=origin/"`repobranch "$d"`"
478 verbose git fetch origin || true
480 # TODO do this without pushing
481 verbose git checkout -b "$branch" "$b"
482 verbose git config "branch.$branch.remote" "$remote"
483 verbose git config "branch.$branch.merge" "refs/heads/$branch"
493 cd "$d0/$d" # am in a pipe, shouldn't use enter
494 git branch -r -v -v | cut -c 3- | sed "s/^(no branch)/(no_branch)/" | sed "s,^,$d ,"
499 while read -r d BRANCH REV TEXT; do
500 if [ x"$BRANCH" = x"`repobranch "$d"`" ]; then
503 if [ x"$REV" = x"->" ]; then
506 BRANCH=${BRANCH#remotes/}
507 ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
508 branches_list="$branches_list $BRANCH" # TEH SORT MAKEZ IT UNIEQ
509 eval "r=\$branches_repos_$ID"
511 eval "branches_repos_$ID=\$r"
513 echo -n "$branches_list" | xargs -n 1 echo | sort -u | while IFS= read -r BRANCH; do
514 ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
515 eval "r=\$branches_repos_$ID"
516 printf "%-60s %s\n" "$BRANCH" "$r"
523 dv=`visible_repo_name "$d"`
524 enter "$d0/$d" verbose
525 r=`git symbolic-ref HEAD`
527 if git log HEAD..origin/"`repobranch "$d"`" | grep .; then
528 # we have uncommitted changes
529 if yesno "Could merge from \"`repobranch "$d"`\" into \"$r\" in $dv. Do it?"; then
530 if ! verbose git merge origin/"`repobranch "$d"`"; then
531 check_mergeconflict "$d"
532 exit 1 # this should ALWAYS be fatal
542 dv=`visible_repo_name "$d"`
543 enter "$d0/$d" verbose
544 r=`git symbolic-ref HEAD`
546 diffdata=`git diff --color HEAD`
547 if [ -n "$diffdata" ]; then
548 # we have uncommitted changes
549 if yesno "Uncommitted changes in \"$r\" in $dv. Commit?" 'echo "$diffdata" | less -r'; then
550 verbose git commit -a
553 rem=`git config "branch.$r.remote" || echo origin`
554 bra=`git config "branch.$r.merge" || echo "$r"`
555 upstream="$rem/${bra#refs/heads/}"
556 if ! git rev-parse "$upstream" >/dev/null 2>&1; then
557 upstream="origin/`repobranch "$d"`"
559 logdata=`git log --color "$upstream".."$r"`
560 if [ -n "$logdata" ]; then
561 if yesno "Push \"$r\" in $dv?" 'echo "$logdata" | less -r'; then
562 verbose git push "$rem" HEAD
565 if [ x"$submit" = x"-s" ]; then
568 verbose git push "$rem" HEAD:"${bra%%/*}/finished/${bra#*/}"
580 if [ -z "$CC" ]; then
581 export CC="gcc -DSUPPORTIPV6"
593 export CC="$CC -mtune=native -march=native"
601 if [ -n "$WE_HATE_OUR_USERS" ]; then
602 TARGETS="sv-$debug cl-$debug"
603 elif [ x"`uname`" = x"Darwin" ]; then
606 TARGETS="sv-$debug cl-$debug sdl-$debug"
609 # AGL cannot be compiled on systems with a kernel > 10.x (Snow Leopard)
610 TARGETS="sv-$debug sdl-$debug"
613 export CC="$CC -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
615 TARGETS="sv-$debug cl-$debug sdl-$debug"
617 if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
618 # if we give the command make the arg "", it will surely fail (invalid filename),
619 # so better handle it as an empty client option
622 elif [ -n "$1" ]; then
624 TARGETS_SAVE=$TARGETS
629 TARGETS="$TARGETS sdl-debug"
632 TARGETS="$TARGETS cl-debug"
635 TARGETS="$TARGETS sv-debug"
638 BAD_TARGETS="$BAD_TARGETS $X"
642 if [ -n "$TARGETS" ]; then # at least a valid client
644 else # no valid client, let's assume this option is not meant to be a client then
645 TARGETS=$TARGETS_SAVE
649 if [ -z "$MAKEFLAGS" ]; then
650 if [ -f /proc/cpuinfo ]; then
651 ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0))
652 if [ $ncpus -gt 1 ]; then
656 if [ -n "$WE_HATE_OUR_USERS" ]; then
657 MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw LIB_JPEG= CFLAGS_LIBJPEG="
661 enter "$d0/fteqcc" verbose
663 verbose make $MAKEFLAGS clean
665 verbose make $MAKEFLAGS
667 enter "$d0/data/xonotic-data.pk3dir" verbose
669 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
671 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
673 enter "$d0/darkplaces" verbose
674 if [ x"$BAD_TARGETS" = x" " ]; then
675 echo "Warning: invalid empty client, default clients will be used."
678 verbose make $MAKEFLAGS clean
680 for T in $TARGETS; do
681 verbose make $MAKEFLAGS "$@" "$T"
683 for T in $BAD_TARGETS; do
684 echo "Warning: discarded invalid client $T."
687 verbose "$SELF" update-maps
690 if [ -n "$WE_HATE_OUR_USERS" ]; then
692 export PATH="$d0/misc/buildfiles/win32:$PATH"
693 elif [ x"`uname`" = x"Darwin" ]; then
694 export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
695 export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
701 sdl|glx|agl|dedicated)
710 if ! [ -x "darkplaces/darkplaces$client" ]; then
711 if [ -x "darkplaces/darkplaces$client.exe" ]; then
714 echo "Client darkplaces/darkplaces$client not found, aborting"
718 set -- "darkplaces/darkplaces$client" -xonotic -mygames "$@"
720 # if pulseaudio is running: USE IT
721 if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
722 if ps -C pulseaudio >/dev/null; then
723 if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
724 export SDL_AUDIODRIVER=pulse
731 if [ -n "$USE_GDB" ]; then
732 set -- gdb --args "$@"
733 elif which gdb >/dev/null 2>&1; then
734 set -- gdb --batch -x savecore.gdb --args "$@"
735 elif which catchsegv >/dev/null 2>&1; then
736 set -- catchsegv "$@"
740 if [ -f xonotic.core ]; then
741 if yesno "The program has CRASHED. Do you want to examine the core dump?"; then
742 gdb "$binary" xonotic.core
743 #elif yesno "You did not want to examine the core dump. Do you want to provide it - including your DarkPlaces checkout - to the Xonotic developers?"; then
744 # tar cvzf xonotic.core.tar.gz xonotic.core darkplaces/*.c darkplaces/*.h
746 # rm -f xonotic.core.tar.gz
748 echo "The core dump can be examined later by"
749 echo " gdb $binary xonotic.core"
755 if [ x"$1" = x"-k" ]; then
760 if verbose cd "$d0/$d"; then
772 patchdir=`mktemp -d -t save-patches.XXXXXX`
774 enter "$d0/$d" verbose
775 git branch -v -v | cut -c 3- | {
777 while read -r BRANCH REV UPSTREAM TEXT; do
780 UPSTREAM=${UPSTREAM#\[}
781 UPSTREAM=${UPSTREAM%\]}
782 UPSTREAM=${UPSTREAM%:*}
786 UPSTREAM=origin/"`repobranch "$d"`"
790 if [ x"$REV" = x"->" ]; then
793 if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH"; then
794 echo "$d" > "$patchdir/$i/info.txt"
795 echo "$BRANCH" >> "$patchdir/$i/info.txt"
796 echo "$UPSTREAM" >> "$patchdir/$i/info.txt"
797 echo "$TRACK" >> "$patchdir/$i/info.txt"
800 rm -rf "$patchdir/$i"
805 ( cd "$patchdir" && tar cvzf - . ) > "$outfile"
810 patchdir=`mktemp -d -t restore-patches.XXXXXX`
811 ( cd "$patchdir" && tar xvzf - ) < "$infile"
813 for P in "$patchdir"/*/info.txt; do
820 verbose git checkout HEAD^0
821 verbose git branch -D "$BRANCH"
822 if [ x"$TRACK" = x"true" ]; then
823 verbose git checkout --track -b "$BRANCH" "$UPSTREAM"
825 verbose git branch -b "$BRANCH" "$UPSTREAM"
837 report=$report"$*$LF"
842 report=$report" $*$LF"
847 o=`"$@" | sed 's/^/ /' || true`
851 enter "$d0/$d" verbose
852 base="`repobranch "$d"`"
854 for ref in `git for-each-ref --format='%(refname)' refs/remotes/origin/`; do
855 case "${ref#refs/remotes/origin/}" in
868 if [ -n "$branch" ]; then
869 if [ x"$branch" != x"${ref#refs/remotes/origin/}" ]; then
878 l0=`git rev-list "$base".."$ref" | wc -l`
879 l1=`git rev-list master.."$ref" | wc -l`
880 if [ $l0 -gt $l1 ]; then
887 reportecho " Branch $ref:"
888 note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
889 logdata=`git log --color "$realbase".."$ref"`
890 if [ -z "$logdata" ]; then
891 reportecho4 "--> not merging, no changes vs master"
892 if yesno "Branch \"$ref\" probably should get deleted. Do it?" ''; then
893 git push origin :"${ref#refs/remotes/origin/}"
894 reportecho4 "--> branch deleted"
897 diffdata=`git diff --color --find-copies-harder --ignore-space-change "$realbase"..."$ref"`
898 if [ -z "$diffdata" ]; then
899 reportecho4 "--> not merging, no changes vs master, branch contains redundant history"
900 if yesno "Branch \"$ref\" probably should get deleted. Do it?" '{ echo "$logdata"; } | less -r'; then
901 git push origin :"${ref#refs/remotes/origin/}"
902 reportecho4 "--> branch deleted"
904 elif [ -z "$branch" ] && [ -n "$note" ]; then
905 reportdo4 echo "$note"
906 reportecho4 "--> not merging, already had this one rejected before"
907 elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then
908 git checkout "$realbase"
909 org=`git rev-parse HEAD`
910 if ! git merge --no-ff "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1 ' >/dev/null; }; then
911 git reset --hard "$org"
912 GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
914 reportecho4 "--> merge failed"
915 elif ! "$SELF" compile 2>&1 | tee "$t"; then
916 git reset --hard "$org"
917 GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Compile failed:$LF`cat "$t"`" "$ref"
919 reportecho4 "--> compile failed"
920 elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
921 git reset --hard "$org"
922 GIT_NOTES_REF=refs/notes/admin-merge git notes edit "$ref"
923 note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
924 if [ x"$note" = x"del" ]; then
925 git push origin :"${ref#refs/remotes/origin/}"
926 reportecho4 "--> test failed, branch deleted"
927 elif [ -n "$note" ]; then
928 reportdo4 echo "$note"
929 reportecho4 "--> test failed"
931 reportecho4 "--> test failed, postponed"
935 case ",`repoflags "$d"`," in
937 # we do quite a mess here... luckily we know $org
938 git fetch # svn needs to be current
939 git rebase -i --onto origin/master "$org"
940 git svn dcommit --add-author-from
941 git reset --hard "$org"
947 reportecho4 "--> MERGED"
948 if yesno "Delete original branch \"$ref\"?"; then
949 git push origin :"${ref#refs/remotes/origin/}"
950 reportecho4 "--> branch deleted"
954 GIT_NOTES_REF=refs/notes/admin-merge git notes edit "$ref"
955 note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
956 if [ x"$note" = x"del" ]; then
957 git push origin :"${ref#refs/remotes/origin/}"
958 reportecho4 "--> branch deleted"
959 elif [ -n "$note" ]; then
960 reportdo4 echo "$note"
961 reportecho4 "--> rejected"
963 reportecho4 "--> postponed"
972 echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
984 # ./all clean [-m] [-f | -fu | -fU] [-r] [-D]
985 # ./all clean --reclone
988 if [ x"$1" = x"--reclone" ]; then
995 elif [ x"$1" = x"-f" ]; then
997 elif [ x"$1" = x"-u" ]; then
999 elif [ x"$1" = x"-U" ]; then
1002 elif [ x"$1" = x"-fu" ]; then
1005 elif [ x"$1" = x"-fU" ]; then
1009 elif [ x"$1" = x"-m" ]; then
1011 elif [ x"$1" = x"-r" ]; then
1013 elif [ x"$1" = x"-D" ]; then
1026 if $gotoupstream; then
1028 msg "Must also use -f (delete local changes) when using -u"
1031 if $gotomaster; then
1032 if $fetchupstream; then
1033 verbose git fetch origin
1034 verbose git remote prune origin
1036 verbose git checkout -f "`repobranch "$d"`"
1037 verbose git reset --hard origin/"`repobranch "$d"`"
1039 r=`git symbolic-ref HEAD`
1041 rem=`git config "branch.$r.remote" || echo origin`
1042 bra=`git config "branch.$r.merge" || echo "$r"`
1043 upstream="$rem/${bra#refs/heads/}"
1044 if $fetchupstream; then
1045 verbose git fetch "$rem"
1046 verbose git remote prune "$rem"
1048 if ! git rev-parse "$upstream" >/dev/null 2>&1; then
1049 upstream="origin/`repobranch "$d"`"
1051 verbose git reset --hard "$upstream"
1053 elif $gotomaster; then
1055 verbose git checkout -f "`repobranch "$d"`"
1056 verbose git reset --hard
1058 verbose git checkout "`repobranch "$d"`"
1061 verbose git reset --hard
1063 if $rmuntracked; then
1066 verbose git clean -df
1069 verbose git clean -xdf
1073 if $killbranches; then
1074 git for-each-ref --format='%(refname)' refs/heads/ | while IFS= read -r B; do
1075 if [ x"$B" != x"`git symbolic-ref HEAD`" ]; then
1076 verbose git branch -D "${B#refs/heads/}"
1079 git rev-parse refs/heads/master >/dev/null 2>&1 || verbose git branch -t master origin/master || true
1080 git rev-parse "refs/heads/`repobranch "$d"`" >/dev/null 2>&1 || verbose git branch -t "`repobranch "$d"`" origin/"`repobranch "$d"`" || true
1085 # release building goes here
1087 #"$SELF" each git clean -fxd
1088 case "$RELEASETYPE" in
1090 msg "Building a BETA"
1093 msg "Building a RELEASE"
1096 msg "Must either set RELEASETYPE=beta or RELEASETYPE=release"
1100 verbose rm -rf Xonotic Xonotic*.zip
1101 verbose mkdir -p Xonotic
1102 if [ -n "$RELEASEDATE" ]; then
1103 verbose echo "$RELEASEDATE" > Xonotic/stamp.txt
1105 verbose date +%Y%m%d > Xonotic/stamp.txt
1107 verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
1109 verbose mkdir data fteqcc source source/darkplaces source/fteqcc
1111 verbose rm -rf misc/builddeps
1112 verbose mv misc/buildfiles/win32/* . || true
1113 verbose mv misc/buildfiles/win64 bin64 || true
1114 verbose mv misc/buildfiles/osx/* . || true
1115 verbose rm -rf misc/buildfiles
1118 verbose cd darkplaces
1119 verbose git archive --format=tar HEAD
1121 verbose cd Xonotic/source/darkplaces
1126 verbose git archive --format=tar HEAD
1128 verbose cd Xonotic/source/fteqcc
1132 verbose cd data/xonotic-data.pk3dir
1133 verbose git archive --format=tar HEAD -- qcsrc Makefile
1135 verbose cd Xonotic/source
1139 release-compile-run)
1148 if [ -n "$targetfiles" ]; then
1149 case " $HOSTS_THAT_ARE_DISABLED " in
1154 case " $HOSTS_THAT_ARE_MYSELF " in
1156 verbose rsync --delete -zLvaSHP "$srcdir"/ "$buildpath/"
1157 verbose rsync --delete -zLvaSHP "$depsdir"/ "$buildpath.deps/"
1158 verbose ln -snf "$buildpath.deps" "$buildpath/.deps"
1159 verbose eval make -C "$buildpath" clean $maketargets $makeflags
1160 for f in $targetfiles; do
1161 verbose mv "$buildpath/${f%:*}" "${f##*:}" || true
1165 verbose rsync --delete -zLvaSHP "$srcdir"/ "$host:$buildpath/"
1166 verbose rsync --delete -zLvaSHP "$depsdir"/ "$host:$buildpath.deps/"
1167 verbose ssh "$host" "ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && nice -`nice` make clean $maketargets $makeflags"
1168 for f in $targetfiles; do
1169 verbose rsync -zvaSHP "$host:$buildpath/${f%:*}" "${f##*:}" || true
1173 # now rebrand the binaries...
1174 for f in $targetfiles; do
1175 #verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
1178 verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "$f"
1180 d=`mktemp -d -t rebrand.XXXXXX`
1182 echo "-mygames" > darkplaces.opt
1183 zip -9r darkplaces.zip darkplaces.opt
1196 fteqcc_maketargets=$3
1198 darkplaces_maketargets=$5
1200 host=xonotic-build-$suffix
1201 verbose "$SELF" release-compile-run "$host" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "Xonotic/source/fteqcc" "$d0/misc/builddeps/dp.$suffix" "$fteqcc_files"
1202 verbose "$SELF" release-compile-run "$host" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "Xonotic/source/darkplaces" "$d0/misc/builddeps/dp.$suffix" "$darkplaces_files"
1204 release-engine-win32)
1205 verbose "$SELF" release-compile win32 \
1206 'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -march=i686 -mtune=generic -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=0' \
1207 win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
1209 verbose "$SELF" release-compile win32 \
1210 'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=0' \
1212 release 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe'
1214 release-engine-win64)
1215 verbose "$SELF" release-compile win64 \
1216 'STRIP=: DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DSUPPORTIPV6" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=0' \
1217 win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-x64.exe' \
1218 'sv-release sdl-release' 'darkplaces-sdl.exe:Xonotic/xonotic-x64-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-x64-dedicated.exe'
1219 verbose "$SELF" release-compile win64 \
1220 'STRIP=: DP_MAKE_TARGET=mingw CC="x86_64-w64-mingw32-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DSUPPORTIPV6" WINDRES="x86_64-w64-mingw32-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=0' \
1222 cl-release 'darkplaces.exe:Xonotic/xonotic-x64.exe'
1225 # gcc on OSX is buggy, needs -fno-reorder-blocks for a release build to succeed
1226 verbose "$SELF" release-compile osx \
1227 'STRIP=: CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I.deps/include -L.deps/lib -fno-reorder-blocks -DSUPPORTIPV6"' \
1228 all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \
1229 'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated'
1230 verbose "$SELF" release-compile osx \
1231 'STRIP=: CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I.deps/include -L.deps/lib -fno-reorder-blocks -DSUPPORTIPV6"' \
1233 'cl-release' 'darkplaces-agl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
1235 release-engine-linux32)
1236 verbose "$SELF" release-compile linux32 \
1237 'STRIP=: CC="gcc -m32 -march=i686 -mtune=generic -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
1238 all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
1239 release 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated'
1241 release-engine-linux64)
1242 verbose "$SELF" release-compile linux64 \
1243 'STRIP=: CC="gcc -m64 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
1244 all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \
1245 release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
1248 verbose "$SELF" release-engine-linux32 &
1249 verbose "$SELF" release-engine-linux64 &
1250 verbose "$SELF" release-engine-win32 &
1251 verbose "$SELF" release-engine-win64 &
1252 verbose "$SELF" release-engine-osx &
1261 verbose "$SELF" update-maps
1264 case "$RELEASETYPE" in
1266 verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
1269 verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 FTEQCCFLAGS_WATERMARK= clean all
1272 verbose rm -f Xonotic/source/*/fteqcc.log
1274 release-buildpk3-transform-raw)
1277 release-buildpk3-transform-normal)
1280 # texture: convert to jpeg and dds
1281 verbose export do_jpeg=true
1282 verbose export jpeg_qual_rgb=95
1283 verbose export jpeg_qual_a=99
1284 verbose export do_dds=true
1285 verbose export dds_flags=
1286 verbose export do_ogg=false
1287 verbose export del_src=true
1288 find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
1290 release-buildpk3-transform-low)
1293 # texture: convert to jpeg and dds
1294 # music: reduce bitrate
1295 verbose export do_jpeg=true
1296 verbose export jpeg_qual_rgb=80
1297 verbose export jpeg_qual_a=95
1298 verbose export do_dds=false
1299 verbose export do_ogg=true
1300 verbose export ogg_qual=1
1301 verbose export del_src=true
1302 find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
1304 release-buildpk3-transform-lowdds)
1307 # texture: convert to jpeg and dds
1308 # music: reduce bitrate
1309 verbose export do_jpeg=false
1310 verbose export do_jpeg_if_not_dds=true
1311 verbose export jpeg_qual_rgb=80
1312 verbose export jpeg_qual_a=95
1313 verbose export do_dds=true
1314 verbose export dds_flags=
1315 verbose export do_ogg=true
1316 verbose export ogg_qual=1
1317 verbose export del_src=true
1318 find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
1331 verbose rm -rf Xonotic/temp
1332 verbose mkdir -p Xonotic/temp
1335 verbose git archive --format=tar HEAD
1337 verbose cd Xonotic/temp
1340 verbose cd Xonotic/temp
1341 if [ x"$src" = x"data/xonotic-data.pk3dir" ]; then
1342 verbose cp ../source/progs.dat .
1343 verbose cp ../source/csprogs.dat .
1344 verbose cp ../source/menu.dat .
1345 verbose rm -rf qcsrc
1346 gv=`grep "^gameversion " "defaultXonotic.cfg" | awk '{ print $2 }'`
1347 major=$(($gv / 10000))
1348 minor=$(($gv / 100 - $major * 100))
1349 patch=$(($gv - $major * 10000 - $minor * 100))
1350 versionstr="$major.$minor.$patch"
1351 case "$RELEASETYPE" in
1353 versionstr="$versionstr""beta"
1357 s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
1358 s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
1359 s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
1360 " defaultXonotic.cfg
1362 verbose cd gfx/menu/luminos
1363 verbose cp "$d0"/mediasource/gfx/menu/luminos_versionbuilder/background_l2.svg .
1364 verbose "$d0"/mediasource/gfx/menu/luminos_versionbuilder/versionbuilder "$versionstr"
1365 verbose rm background_l2.svg
1368 if [ x"$src" = x"data/xonotic-maps.pk3dir" ]; then
1369 for X in ../../data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
1370 if [ -f "$X" ]; then
1372 verbose rm -f maps/*.log maps/*.irc maps/*.lin
1376 verbose export git_src_repo="$d0/$src" # skip hash-object
1377 verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
1378 verbose mkzip "../../$dst" *
1380 verbose rm -rf Xonotic/temp
1383 stamp=`cat Xonotic/stamp.txt`
1389 dst="data/xonotic-$stamp-${dst#data/xonotic-}"
1395 while [ "$#" -gt 1 ]; do
1396 verbose "$SELF" release-buildpk3 "$src" "Xonotic/$dst$2.pk3" "$1"
1402 verbose "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir raw ''
1403 verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '' raw '-raw' low '-low' lowdds '-lowdds'
1404 verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '' raw '-raw' low '-low' lowdds '-lowdds'
1405 verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir raw '' low '-low'
1406 verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir low ''
1408 release-pack-needsx11)
1411 verbose startx "$SELF" release-pack -- /usr/bin/Xvfb :7
1414 verbose "$SELF" release-pack
1419 stamp=`cat Xonotic/stamp.txt`
1420 # exe and dll files do not need +x, so this makes them eligible for 7zip compression too
1421 chmod a-x Xonotic/*.exe Xonotic/*.dll || true
1422 # need to use infozip for these (+x bits)
1423 verbose mkzip Xonotic-$stamp-engine.zip \
1425 Xonotic/bin64/*.dll \
1428 Xonotic/xonotic.exe \
1429 Xonotic/source/darkplaces/
1430 verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip
1431 verbose mkzip Xonotic-$stamp-common.zip \
1432 Xonotic/source/fteqcc/ \
1433 Xonotic/source/qcsrc/ \
1438 Xonotic/data/font-nimbussansl-$stamp.pk3
1439 verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
1440 verbose mkzip0 Xonotic-$stamp.zip \
1441 Xonotic/data/xonotic-$stamp-data.pk3 \
1442 Xonotic/data/xonotic-$stamp-maps.pk3 \
1443 Xonotic/data/xonotic-$stamp-music.pk3 \
1444 Xonotic/data/xonotic-$stamp-nexcompat.pk3
1445 verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp-low.zip
1446 verbose mkzip0 Xonotic-$stamp-low.zip \
1447 Xonotic/data/xonotic-$stamp-data-low.pk3 \
1448 Xonotic/data/xonotic-$stamp-maps-low.pk3 \
1449 Xonotic/data/xonotic-$stamp-music-low.pk3
1450 verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp-lowdds.zip
1451 verbose mkzip0 Xonotic-$stamp-lowdds.zip \
1452 Xonotic/data/xonotic-$stamp-data-lowdds.pk3 \
1453 Xonotic/data/xonotic-$stamp-maps-lowdds.pk3 \
1454 Xonotic/data/xonotic-$stamp-music-low.pk3
1455 verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip
1456 verbose mkzip0 Xonotic-$stamp-high.zip \
1457 Xonotic/data/xonotic-$stamp-data-raw.pk3 \
1458 Xonotic/data/xonotic-$stamp-maps-raw.pk3 \
1459 Xonotic/data/xonotic-$stamp-music.pk3 \
1460 Xonotic/data/xonotic-$stamp-nexcompat.pk3
1463 verbose "$SELF" release-prepare
1464 verbose "$SELF" release-maps
1465 verbose "$SELF" release-engine
1466 verbose "$SELF" release-qc
1467 verbose "$SELF" release-pack-needsx11
1468 verbose "$SELF" release-zip
1473 echo " $SELF admin-merge [<branch>]"
1474 echo " $SELF branch <branch>"
1475 echo " $SELF branch <remote> <branch> [<srcbranch>]"
1476 echo " $SELF branches"
1477 echo " $SELF checkout|switch <branch>"
1478 echo " $SELF checkout|switch <remote>/<branch>"
1479 echo " $SELF clean [-m] [-f | -fu | -fU] [-r] [-D]"
1480 echo " $SELF clean --reclone"
1481 echo " $SELF compile [-c]"
1482 echo " $SELF each|foreach [-k] command..."
1483 echo " $SELF fix_upstream_rebase"
1485 echo " $SELF push|commit [-s]"
1486 echo " $SELF release"
1487 echo " $SELF restore-patches"
1488 echo " $SELF run [sdl|glx|wgl|agl|dedicated] options..."
1489 echo " $SELF save-patches"
1490 echo " $SELF update-maps"
1491 echo " $SELF update|pull [-N]"