download all-in-one gamepacks archive during build by default

fixes #191
This commit is contained in:
Garux 2024-05-27 11:36:51 +05:00
parent 648a836c5c
commit 8f1beb7d7f
4 changed files with 14 additions and 8 deletions

View File

@ -39,9 +39,7 @@ jobs:
- name: Build - name: Build
run: | run: |
make DOWNLOAD_GAMEPACKS=no MAKEFILE_CONF=msys2-Makefile.conf BUILD=release -j4 make MAKEFILE_CONF=msys2-Makefile.conf -j4
wget https://www.dropbox.com/s/b1xpajzfa6yjlzf/netradiant-custom-extra-gamepacks.zip
unzip -o netradiant-custom-extra-gamepacks.zip -d "install"
mkdir -p install/settings mkdir -p install/settings
echo > install/settings/DUMMMY echo > install/settings/DUMMMY
@ -70,9 +68,7 @@ jobs:
- name: Build - name: Build
run: | run: |
make DOWNLOAD_GAMEPACKS=no CXXFLAGS="-Wno-deprecated-copy" -j4 make CXXFLAGS="-Wno-deprecated-copy" -j4
wget https://www.dropbox.com/s/b1xpajzfa6yjlzf/netradiant-custom-extra-gamepacks.zip
unzip -o netradiant-custom-extra-gamepacks.zip -d "install"
7z a Linux-${{ matrix.arch }}.7z ./install/* 7z a Linux-${{ matrix.arch }}.7z ./install/*
# 7z to preserve file permissions # 7z to preserve file permissions

View File

@ -91,9 +91,9 @@ LIBS_ZLIB ?= -lz
CPPFLAGS_JPEG ?= CPPFLAGS_JPEG ?=
LIBS_JPEG ?= -ljpeg LIBS_JPEG ?= -ljpeg
DEPEND_ON_MAKEFILE ?= yes DEPEND_ON_MAKEFILE ?= yes
DOWNLOAD_GAMEPACKS ?= yes # yes = download; all = even download undistributable gamepacks; no = disable; allinone = dl all-in-one compact fixed archive
DOWNLOAD_GAMEPACKS ?= allinone
INSTALL_DLLS ?= yes INSTALL_DLLS ?= yes
# set to no to disable gamepack, set to all to even download undistributable gamepacks
# Support CHECK_DEPENDENCIES with DOWNLOAD_GAMEPACKS semantics # Support CHECK_DEPENDENCIES with DOWNLOAD_GAMEPACKS semantics
ifneq ($(CHECK_DEPENDENCIES),) ifneq ($(CHECK_DEPENDENCIES),)

View File

@ -82,6 +82,11 @@ pack()
esac esac
case " $LICENSEFILTER " in case " $LICENSEFILTER " in
" ") " ")
if [ "$license" == "allinone" ]; then
$ECHO "All-in-one pack skipped: only downloading it alone without other packs."
$ECHO
return
fi
;; ;;
*" $license "*) *" $license "*)
;; ;;
@ -195,3 +200,5 @@ pack WolfPack proprietary svn svn://svn.icculus.org/gtkradiant-gamep
pack WoPPack proprietary git https://github.com/PadWorld-Entertainment/wop-mapeditor-support.git pack WoPPack proprietary git https://github.com/PadWorld-Entertainment/wop-mapeditor-support.git
pack XonoticPack GPL git https://gitlab.com/xonotic/netradiant-xonoticpack.git pack XonoticPack GPL git https://gitlab.com/xonotic/netradiant-xonoticpack.git
pack ZEQ2LitePack unknown git https://gitlab.com/netradiant/gamepacks/zeq2lite-mapeditor-support.git pack ZEQ2LitePack unknown git https://gitlab.com/netradiant/gamepacks/zeq2lite-mapeditor-support.git
pack NRCPack allinone zip1 https://www.dropbox.com/s/b1xpajzfa6yjlzf/netradiant-custom-extra-gamepacks.zip

View File

@ -11,6 +11,9 @@ case "$DOWNLOAD_GAMEPACKS" in
yes) yes)
LICENSEFILTER=GPL BATCH=1 $SH download-gamepacks.sh LICENSEFILTER=GPL BATCH=1 $SH download-gamepacks.sh
;; ;;
allinone)
LICENSEFILTER=allinone BATCH=1 $SH download-gamepacks.sh
;;
all) all)
BATCH=1 $SH download-gamepacks.sh BATCH=1 $SH download-gamepacks.sh
;; ;;