disable div0-gittools, mediasource, data/xonotic-nexcompat.pk3 repository download...

[xonotic/xonotic.git] / all

diff --git a/all b/all
index d5757dd249f1acdf7bb1111c2efa608172fb1c91..03c5f9e36c6d4d1e974221e44a7291cc4bfc3df5 100755 (executable)
--- a/all
+++ b/all
@@ -113,11 +113,11 @@ repos_urls="
 data/xonotic-data.pk3dir      |                                                   | master      |
 data/xonotic-maps.pk3dir      |                                                   | master      |
 data/xonotic-music.pk3dir     |                                                   | master      |
-data/xonotic-nexcompat.pk3dir |                                                   | master      |
-mediasource                   |                                                   | master      |
+data/xonotic-nexcompat.pk3dir |                                                   | master      | no
+mediasource                   |                                                   | master      | no
 darkplaces                    |                                                   | div0-stable | svn
 fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
-div0-gittools                 |                                                   | master      |
+div0-gittools                 |                                                   | master      | no
 netradiant                    |                                                   | master      |
 "
 # todo: in darkplaces, change repobranch to div0-stable
@@ -171,12 +171,44 @@ repoflags()
        echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' '
 }
 
-repos=`for d in $repos; do
-       p="${d%dir}"
-       if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! { [ -f "$d.no" ] || [ -f "$p" ]; }; then
-               echo "$d"
-       fi
-done`
+listrepos()
+{
+       for d in $repos; do
+               p="${d%dir}"
+               f="`repoflags "$d"`"
+               # if we have the dir, always keep it
+               if [ -d "$d" ]; then
+                       msg "Repository $d enabled because it already exists"
+                       echo "$d"
+                       continue
+               fi
+               # if .yes file exists, always keep it
+               if [ -f "$d.yes" ]; then
+                       msg "Repository $d enabled by a .yes file"
+                       echo "$d"
+                       continue
+               fi
+               # if we have .no file, skip
+               if [ -f "$d.no" ]; then
+                       msg "Repository $d disabled by a .no file, delete $p.no to enable"
+                       continue
+               fi
+               # if we have matching pk3, skip
+               if [ x"$p" != x"$d" ] && [ -f "$p" ]; then
+                       msg "Repository $d disabled by matching .pk3 file, delete $p or create $d.yes to enable"
+                       continue
+               fi
+               # if "no" flag is set, skip
+               case ",$f," in
+                       *,no,*)
+                               msg "Repository $d disabled by default, create $d.yes to enable"
+                               continue
+                               ;;
+               esac
+       done
+}
+
+repos=`listrepos`
 
 if [ "$#" = 0 ]; then
        set -- help
@@ -953,7 +985,7 @@ case "$cmd" in
                        esac
                        # now rebrand the binaries...
                        for f in $targetfiles; do
-                               verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "$d0/misc/tools/xonotic.brand" "${f##*:}" || true
+                               verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
                        done
                fi
                ;;
@@ -985,7 +1017,7 @@ case "$cmd" in
                verbose "$SELF" release-compile osx \
                        'STRIP=: CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \
                        all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \
-                       'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:xonotic-osx-dedicated'
+                       'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated'
                ;;
        release-engine-osx-agl)
                # gcc on OSX is buggy, needs -fno-reorder-blocks for a release build to succeed