From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 6 Mar 2016 08:46:36 +0000 (+1100)
Subject: Make csprogs pk3
X-Git-Tag: xonotic-v0.8.2~1152
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=84bb78f33665cc1640776f06e0a47d5c13e3e8a1;p=xonotic%2Fxonotic-data.pk3dir.git

Make csprogs pk3
---

diff --git a/.gitignore b/.gitignore
index 6ecb3d2eb..f4611af93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
-csprogs.dat
-menu.dat
-progs.dat
-*.lno
+/*.dat
+/*.lno
+
 .DS_Store
 .idea/
diff --git a/qcsrc/.gitignore b/qcsrc/.gitignore
index 79fce6a59..07a5db11e 100644
--- a/qcsrc/.gitignore
+++ b/qcsrc/.gitignore
@@ -1,3 +1,3 @@
-html/
-qccversion*
-*.d
+/html/
+/qccversion*
+/*.pk3
diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index f6c67bbeb..64f712f5d 100644
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -1,6 +1,4 @@
-SCM := $(shell if [ -d .svn ]; then echo svn; elif [ -d ../.git ]; then echo git; fi)
-PERL ?= perl
-QCCFLAGS_WATERMARK ?= $(shell git describe)
+QCCFLAGS_WATERMARK ?= $(shell git describe --tags --dirty=*)
 CPP := cc -xc -E
 QCC ?= gmqcc
 NDEBUG ?= 1
@@ -34,11 +32,26 @@ QCCFLAGS ?= \
 XON_BUILDSYSTEM =
 
 .PHONY: all
-all: qc
+all: qc pk3
 
 .PHONY: qc
 qc: $(PROGS_OUT)/menu.dat $(PROGS_OUT)/progs.dat $(PROGS_OUT)/csprogs.dat
 
+.PHONY: pk3
+pk3: qc
+	$(eval PROG=csprogs)
+	$(eval VER=${QCCFLAGS_WATERMARK})
+	$(eval PK3=${PROG}-${VER}.pk3)
+	$(eval TXT=${PROG}-${VER}.txt)
+	$(eval DAT=${PROG}-${VER}.dat)
+	$(eval LNO=${PROG}-${VER}.lno)
+	@ echo "http://xonotic.org" > ${TXT}
+	@ ln -f $(PROGS_OUT)/${PROG}.dat ${DAT}
+	@ ln -f $(PROGS_OUT)/${PROG}.lno ${LNO}
+	@ rm *.pk3
+	zip -9 ${PK3} ${TXT} ${DAT} ${LNO}
+	@ rm ${TXT} ${DAT} ${LNO}
+
 .PHONY: clean
 clean:
 	rm -f $(PROGS_OUT)/csprogs.dat