From: Mario <mario.mario@y7mail.com>
Date: Sun, 18 Oct 2020 01:59:37 +0000 (+0000)
Subject: Merge branch 'bones_was_here/csprogs' into 'master'
X-Git-Tag: xonotic-v0.8.5~729
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=35a8077bd0f39b3978210196c01a1c8828c6a2c3;hp=62308e453f03857e57edc80a8cd57e94992e6ec1

Merge branch 'bones_was_here/csprogs' into 'master'

Server build and csprogs pk3 stuff

See merge request xonotic/xonotic-data.pk3dir!850
---

diff --git a/Makefile b/Makefile
index 7507a223c..ab7fa6c1b 100644
--- a/Makefile
+++ b/Makefile
@@ -29,3 +29,11 @@ clean:
 
 gfx/menu/default/skinvalues.txt: qcsrc/menu/skin-customizables.inc
 	$(PERL) qcsrc/menu/skin-customizables.inc > gfx/menu/default/skinvalues.txt
+
+.PHONY: sv
+sv:
+	$(MAKE) -C qcsrc sv
+
+.PHONY: pk3
+pk3:
+	$(MAKE) -C qcsrc pk3
diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index 1edb96fa2..f562bd4f6 100644
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -15,13 +15,13 @@ BUILD_MOD ?=
 
 ifndef ZIP
 	ifneq ($(shell which zip 2>/dev/null),)
-		ZIP := zip -9
+		ZIP := zip -9mD
 	endif
 	ifneq ($(shell which 7z 2>/dev/null),)
-		ZIP := 7z a -tzip -mx=9
+		ZIP := 7z a -tzip -mx=9 -sdel
 	endif
 	ifneq ($(shell which 7za 2>/dev/null),)
-		ZIP := 7za a -tzip -mx=9
+		ZIP := 7za a -tzip -mx=9 -sdel
 	endif
     ifndef ZIP
         $(warning "No zip / 7z / 7za in ($(PATH))")
@@ -79,11 +79,16 @@ clean: | $(WORKDIR)
 	$(RM) $(WORKDIR)/*.qc
 	$(RM) $(WORKDIR)/*.txt
 	$(RM) $(WORKDIR)/qccversion.*
+	$(RM) $(WORKDIR)/csprogs-*
+	$(RM) $(WORKDIR)/autoexec/csprogs-*.cfg
 	$(RM) csprogs-*.pk3
 
 .PHONY: qc
 qc: $(PROGS_OUT)/csprogs.dat $(PROGS_OUT)/menu.dat $(PROGS_OUT)/progs.dat
 
+.PHONY: sv
+sv: $(PROGS_OUT)/csprogs.dat $(PROGS_OUT)/progs.dat
+
 .PHONY: pk3
 pk3: csprogs-$(VER).pk3
 
@@ -94,15 +99,16 @@ pk3: csprogs-$(VER).pk3
 %-$(VER).pk3: $(PROGS_OUT)/%.dat
 	$(eval PROG=$*)
 	$(eval PK3=$(PROG)-$(VER).pk3)
-	$(eval TXT=$(PROG)-$(VER).txt)
+	$(eval CFG=autoexec/$(PROG)-$(VER).cfg)
 	$(eval DAT=$(PROG)-$(VER).dat)
 	$(eval LNO=$(PROG)-$(VER).lno)
-	@ echo "http://xonotic.org" > $(TXT)
-	@ cp -f $(PROGS_OUT)/$(PROG).dat $(DAT)
-	@ cp -f $(PROGS_OUT)/$(PROG).lno $(LNO)
-	@ $(RM) csprogs-*.pk3
-	$(ZIP) $(PK3) $(TXT) $(DAT) $(LNO)
-	@ $(RM) $(TXT) $(DAT) $(LNO)
+	@ mkdir -p $(WORKDIR)/autoexec
+	@ echo "// http://xonotic.org" > $(WORKDIR)/$(CFG)
+	@ echo "set csqc_progname $(DAT)" >> $(WORKDIR)/$(CFG)
+	@ cp -f $(PROGS_OUT)/$(PROG).dat $(WORKDIR)/$(DAT)
+	@ cp -f $(PROGS_OUT)/$(PROG).lno $(WORKDIR)/$(LNO)
+	@ $(RM) $(PROG)-*.pk3
+	cd $(WORKDIR) && $(ZIP) $(CURDIR)/$(PK3) $(CFG) $(DAT) $(LNO)
 
 QCCVERSION := $(shell cd lib && $(QCC) --version)
 QCCVERSIONFILE := $(WORKDIR)/qccversion.$(shell echo ${QCCVERSION} | git hash-object --stdin)
diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc
index 01b2763c2..24f725bd2 100644
--- a/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@ -964,7 +964,7 @@ spawnfunc(worldspawn)
 	// fill sv_curl_serverpackages from .serverpackage files
 	if (autocvar_sv_curl_serverpackages_auto)
 	{
-		string s = "csprogs-" WATERMARK ".txt";
+		string s = "csprogs-" WATERMARK ".dat";
 		// remove automatically managed files from the list to prevent duplicates
 		for (int i = 0, n = tokenize_console(cvar_string("sv_curl_serverpackages")); i < n; ++i)
 		{