Merge branch 'gamepacks' into 'master'

Update game packs, fix some bugs to make them properly installed

See merge request xonotic/netradiant!77

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00e9814594206f19a44cec94df9d951c0069cb7d..6fb9b8e9b0283431508357b954bcc21fb1c144fc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -249,13 +249,18 @@ endif ()
 #-----------------------------------------------------------------------
 
 option(DOWNLOAD_GAMEPACKS "Download game packs" ON)
-add_custom_target(game_packs
-        COMMAND ${CMAKE_COMMAND} -E make_directory games
-        COMMAND DOWNLOAD_GAMEPACKS=yes SOURCE_DIR="${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/install-gamepacks.sh" "${PROJECT_BINARY_DIR}"
-        COMMENT "Downloading game packs"
-        )
 if (DOWNLOAD_GAMEPACKS)
-    add_custom_target(game_packs_all ALL DEPENDS game_packs)
+    add_custom_target(game_packs
+            COMMAND ${CMAKE_COMMAND} -E make_directory games
+            COMMAND DOWNLOAD_GAMEPACKS=yes SOURCE_DIR="${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/install-gamepacks.sh" "${PROJECT_BINARY_DIR}"
+            COMMENT "Downloading free game packs"
+            )
+
+    add_custom_target(game_packs_all
+            COMMAND ${CMAKE_COMMAND} -E make_directory games
+            COMMAND DOWNLOAD_GAMEPACKS=all SOURCE_DIR="${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/install-gamepacks.sh" "${PROJECT_BINARY_DIR}"
+            COMMENT "Downloading all game packs"
+            )
 endif ()
 
 #-----------------------------------------------------------------------

diff --git a/download-gamepacks.sh b/download-gamepacks.sh
index 32586dad924292186e54c428726ec790e86d879b..75c1c3dcf6f92e661b204b1c55529adc4353ae2d 100755 (executable)
--- a/download-gamepacks.sh
+++ b/download-gamepacks.sh
@@ -149,17 +149,31 @@ pack()
 
 mkdir -p games
 pack DarkPlacesPack    GPL         svn    svn://svn.icculus.org/gtkradiant-gamepacks/DarkPlacesPack/branches/1.5/
+pack Doom3Pack         proprietary svn    svn://svn.icculus.org/gtkradiant-gamepacks/Doom3Pack/branches/1.5/
+pack ETPack            proprietary svn    svn://svn.icculus.org/gtkradiant-gamepacks/ETPack/branches/1.5/
+pack Heretic2Pack      proprietary svn    svn://svn.icculus.org/gtkradiant-gamepacks/Her2Pack/branches/1.5/
+pack JediAcademyPack   proprietary svn    svn://svn.icculus.org/gtkradiant-gamepacks/JAPack/branches/1.5/
+pack NeverballPack     proprietary zip1   http://ingar.intranifty.net/files/netradiant/gamepacks/NeverballPack.zip
 pack NexuizPack        GPL         gitdir git://git.icculus.org/divverent/nexuiz.git misc/netradiant-NexuizPack master
-pack OpenArenaPack     unknown     zip1   http://ingar.satgnu.net/files/netradiant/gamepacks/OpenArenaPack.zip
-pack OsirionPack       GPL         zip1   http://ingar.satgnu.net/files/netradiant/gamepacks/OsirionPack.zip
+#pack OpenArenaPack    unknown     zip1   http://ingar.satgnu.net/files/netradiant/gamepacks/OpenArenaPack.zip
+pack OpenArenaPack     GPL         git    https://github.com/NeonKnightOA/oagamepack.git
+pack OsirionPack       GPL         zip1   http://ingar.intranifty.net/files/netradiant/gamepacks/OsirionPack.zip
+pack PreyPack          proprietary svn    svn://svn.icculus.org/gtkradiant-gamepacks/PreyPack/trunk/
 pack Q3Pack            proprietary svn    svn://svn.icculus.org/gtkradiant-gamepacks/Q3Pack/trunk/ -r29
-pack Quake2Pack        proprietary zip1   http://ingar.satgnu.net/files/netradiant/gamepacks/Quake2Pack.zip
-pack QuakePack         GPL         zip1   http://ingar.satgnu.net/files/netradiant/gamepacks/Quake1Pack.zip
+pack Quake2Pack        proprietary svn    svn://svn.icculus.org/gtkradiant-gamepacks/Q2Pack/branches/1.5/
+pack Quake4Pack        proprietary svn    svn://svn.icculus.org/gtkradiant-gamepacks/Q4Pack/branches/1.5/
+#pack QuakePack        proprietary zip1   http://ingar.intranifty.net/files/netradiant/gamepacks/QuakePack.zip
+pack QuakePack         GPL         zip1   http://ingar.intranifty.net/files/netradiant/gamepacks/Quake1Pack.zip
+#pack Quake2WorldPack  GPL         svn    svn://jdolan.dyndns.org/quake2world/trunk/gtkradiant
 pack QuetooPack        GPL         svn    svn://svn.icculus.org/gtkradiant-gamepacks/QuetooPack/branches/1.5/
-pack TremulousPack     proprietary zip1   http://ingar.satgnu.net/files/netradiant/gamepacks/TremulousPack.zip
+#pack TremulousPack    proprietary svn    svn://svn.icculus.org/gtkradiant-gamepacks/TremulousPack/branches/1.5/
+pack TremulousPack     proprietary zip1   http://ingar.intranifty.net/files/netradiant/gamepacks/TremulousPack.zip
+pack TurtleArenaPack   proprietary git    https://github.com/Turtle-Arena/turtle-arena-radiant-pack.git
 pack UFOAIPack         proprietary svn    svn://svn.icculus.org/gtkradiant-gamepacks/UFOAIPack/branches/1.5/
+#pack UnvanquishedPack unknown     zip1   http://ingar.intranifty.net/gtkradiant/files/gamepacks/UnvanquishedPack.zip
+pack UnvanquishedPack  BSD         svn    https://github.com/Unvanquished/unvanquished-mapeditor-support.git/trunk/build/netradiant
 #pack WarsowPack       GPL         svn    https://svn.bountysource.com/wswpack/trunk/netradiant/games/WarsowPack/
-#pack WarsowPack       GPL         zip1   http://ingar.satgnu.net/files/netradiant/gamepacks/WarsowPack.zip
+#pack WarsowPack       GPL         zip1   http://ingar.intranifty.net/files/netradiant/gamepacks/WarsowPack.zip
 pack WarsowPack        GPL         git    https://github.com/Warsow/NetRadiantPack.git
+pack WolfPack          proprietary svn    svn://svn.icculus.org/gtkradiant-gamepacks/WolfPack/branches/1.5/
 pack XonoticPack       GPL         git    https://gitlab.com/xonotic/netradiant-xonoticpack.git
-pack UnvanquishedPack  BSD         svn    https://github.com/Unvanquished/unvanquished-mapeditor-support.git/trunk/build/netradiant

diff --git a/install-gamepack.sh b/install-gamepack.sh
index 3a36c200ecdd6a6c3e1f788903d249ad25f877b7..9d222c74d4f4873af1fc0365613d00fb1742790f 100755 (executable)
--- a/install-gamepack.sh
+++ b/install-gamepack.sh
@@ -12,9 +12,19 @@ set -ex
 pack=$1
 dest=$2
 
-if [ -d "$pack/tools" ]; then
-       pack="$pack/tools"
-fi
+# Some per-game workaround for malformed gamepack
+case $pack in
+       */JediAcademyPack)
+               pack="$pack/Tools"
+       ;;
+       */PreyPack|*/Q3Pack)
+               pack="$pack/tools"
+       ;;
+       */WolfPack)
+               pack="$pack/bin"
+       ;;
+esac
+
 for GAMEFILE in "$pack/games"/*.game; do
        if [ x"$GAMEFILE" != x"$pack/games/*.game" ]; then
                $CP "$GAMEFILE" "$dest/games/"

diff --git a/install-gamepacks.sh b/install-gamepacks.sh
index b42c59cbe30166cbfe7c0edbb4fe079fe454404b..bc49364b9bdac1b2d230e2947089781e41fcecb6 100755 (executable)
--- a/install-gamepacks.sh
+++ b/install-gamepacks.sh
@@ -20,8 +20,8 @@ case "$DOWNLOAD_GAMEPACKS" in
 esac
 
 set -e
-for GAME in games/*; do
-       if [ "$GAME" = "games/*" ]; then
+for GAME in games/*Pack; do
+       if [ "$GAME" = "games/*Pack" ]; then
                $ECHO "Game packs not found, please run"
                $ECHO "  $SOURCE_DIR/download-gamepacks.sh"
                $ECHO "and then try again!"