]> git.rm.cloudns.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a93a282)
Slackware support to website generation.
authorDale Weiler <killfieldengine@gmail.com>
Mon, 19 Aug 2013 23:15:41 +0000 (23:15 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Mon, 19 Aug 2013 23:15:41 +0000 (23:15 +0000)
distro/Makefile patch | blob | history
distro/slackware/this/Makefile patch | blob | history
doc/html/download.c patch | blob | history

diff --git a/distro/Makefile b/distro/Makefile
index 96ddce2946db1495998ddb3fc229a67b47f2cd30..49555b895f43ebf8b4f4b1f5367b5224bea420bb 100644 (file)
--- a/distro/Makefile
+++ b/distro/Makefile
@@ -15,9 +15,12 @@ base:
        $(MAKE) -C archlinux/this/
        $(MAKE) -C archlinux/this/ CARCH=i686
        $(MAKE) -C win32/
+       $(MAKE) -C slackware/this/
+       $(MAKE) -C slackware/this/ CARCH=i686
        @mv deb/*.deb ./
        @mv archlinux/this/*pkg.tar.xz ./
        @mv win32/*.zip ./
+       @mv slackware/this/*.txz ./
 
 upload:
        @echo "APPKEY:76vh3q42hnvmzm3" > dropbox_config
@@ -28,7 +31,7 @@ upload:
        @wget -q "http://raw.github.com/andreafabrizi/Dropbox-Uploader/master/dropbox_uploader.sh"
        @chmod +x dropbox_uploader.sh
        @sed -i -e "s/~\/.dropbox_uploader/.\/dropbox_config/g" $$(basename $(DROPBOX))
-       @find . -type f -regex ".*/.*\.\(xz\|deb\|zip\)" -exec ./$$(basename $(DROPBOX)) upload {} \;
+       @find . -type f -regex ".*/.*\.\(xz\|deb\|zip\|txz\)" -exec ./$$(basename $(DROPBOX)) upload {} \;
        @rm dropbox_config dropbox_uploader.sh
 
 website:
@@ -49,5 +52,6 @@ clean:
        @rm -f *.zip
        @rm -f *.gen
        @rm -f *.html
+       @rm -f *.txz
 
 all: base upload
diff --git a/distro/slackware/this/Makefile b/distro/slackware/this/Makefile
index 3f70b8bbdf0cf7e3a81b59421968b7bb6e529d40..294c396b976eb5dd5f040192d21b579abbe3b7d4 100644 (file)
--- a/distro/slackware/this/Makefile
+++ b/distro/slackware/this/Makefile
@@ -5,7 +5,7 @@ MAJOR   := $(shell sed -n -e '/GMQCC_VERSION_MAJOR/{s/.* .* //;p;q;}' $(HEADER))
 MINOR   := $(shell sed -n -e '/GMQCC_VERSION_MINOR/{s/.* .* //;p;q;}' $(HEADER))
 PATCH   := $(shell sed -n -e '/GMQCC_VERSION_PATCH/{s/.* .* //;p;q;}' $(HEADER))
 CARCH   := $(shell uname -m)
-PKGDIR  := gmqcc-$(MAJOR).$(MINOR).$(PATCH)-$(CARCH)-git
+PKGDIR  := gmqcc-$(MAJOR).$(MINOR).$(PATCH)-$(CARCH)
 PKG     := $(PKGDIR).txz
 PKGINFO := $(PKGDIR)/.PKGINFO
 DESTDIR := distro/slackware/this/$(PKGDIR)
diff --git a/doc/html/download.c b/doc/html/download.c
index cfcf6367e8a8d200e1e0957c188b482813d18cb0..0059c03c8afe51ac60e643395dca8fb94d42962a 100644 (file)
--- a/doc/html/download.c
+++ b/doc/html/download.c
@@ -74,6 +74,9 @@ int security_decode(unsigned char *dest, const unsigned char *src, int srclen) {
 #define DEBIAN_64_REF    "%sgmqcc-%c.%c.%c-x86_64.deb%s"
 #define WINDOWS_32_REF   "%sgmqcc-%c.%c.%c-win32.zip%s"
 #define WINDOWS_64_REF   "%sgmqcc-%c.%c.%c-win64.zip%s"
+#define SLACKWARE_32_REF "%sgmqcc-%c.%c.%c-i686.txz%s"
+#define SLACKWARE_64_REF "%sgmqcc-%c.%c.%c-x86_64.txz%s"
+
 
 #define HTML "\
 <!doctype html>\
@@ -121,6 +124,10 @@ int security_decode(unsigned char *dest, const unsigned char *src, int srclen) {
       <td><a href=\"%s\">Download</a></td>\
       <td><a href=\"%s\">Download</a></td>\
      </tr>\
+     <tr>\
+      <td>Slackware</td>\
+      <td><a href=\"%s\">Download</a></td>\
+      <td><a href=\"%s\">Download</a></td>\
      <tr>\
       <td>Windows</td>\
       <td><a href=\"%s\">Download</a></td>\
@@ -140,6 +147,7 @@ int security_decode(unsigned char *dest, const unsigned char *src, int srclen) {
 static char build_table[][4096] = {
     ARCHLINUX_32_REF, ARCHLINUX_64_REF,
     DEBIAN_32_REF,    DEBIAN_64_REF,
+    SLACKWARE_32_REF, SLACKWARE_64_REF,
     WINDOWS_32_REF,   WINDOWS_64_REF
 };
 /* </tag> */