Make csprogs pk3

diff --git a/.gitignore b/.gitignore
index 6ecb3d2eb62e1c68d9602b7391a23ec2a6aa44e2..f4611af9310bd9c5c7ab12a06bf04387fd72d086 100644 (file)
--- 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 79fce6a59259d580292e269c2db59394f44f8b34..07a5db11e1d70122281df3c605ad7e7790d5cd06 100644 (file)
--- 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 f6c67bbebcd708c9546928c01ca83f1c8612a202..64f712f5d49d80b6887331bfdcad712738a7b674 100644 (file)
--- 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