X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=distro%2FMakefile;h=96ddce2946db1495998ddb3fc229a67b47f2cd30;hb=a9ab865add301e49390d1ebeabe350a6c9c4205c;hp=d29cff8b2876e1f28d5023ed90ec223826b1c4d7;hpb=462c06d56bfab0e0c430e3910d9fcba88cca19da;p=xonotic%2Fgmqcc.git diff --git a/distro/Makefile b/distro/Makefile index d29cff8..96ddce2 100644 --- a/distro/Makefile +++ b/distro/Makefile @@ -1,5 +1,7 @@ DROPBOX := dropbox_uploader.sh UNAME := $(shell uname -m) +DOWNLOAD:= ../doc/html/download.c +BRANCH := $(shell git branch | sed -n -e 's/^\* \(.*\)/\1/p') ifneq ($(shell uname -m), x86_64) $(error Cannot build packages without an x86_64 capable CPU) endif @@ -12,8 +14,10 @@ base: $(MAKE) -C deb/ CARCH=i686 $(MAKE) -C archlinux/this/ $(MAKE) -C archlinux/this/ CARCH=i686 + $(MAKE) -C win32/ @mv deb/*.deb ./ @mv archlinux/this/*pkg.tar.xz ./ + @mv win32/*.zip ./ upload: @echo "APPKEY:76vh3q42hnvmzm3" > dropbox_config @@ -24,11 +28,26 @@ 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\)" -exec ./$$(basename $(DROPBOX)) upload {} \; + @find . -type f -regex ".*/.*\.\(xz\|deb\|zip\)" -exec ./$$(basename $(DROPBOX)) upload {} \; @rm dropbox_config dropbox_uploader.sh +website: + $(CC) $(DOWNLOAD) -o html.gen + @./html.gen ../ + @rm html.gen + @git stash + @git checkout gh-pages + @rm -f ../download.html + @mv -f download.html ../download.html + @cd ..; git add download.html; git commit -m 'update download page'; git push origin gh-pages; + @git checkout $(BRANCH) + @git stash apply + clean: @rm -f *.deb @rm -f *.pkg.tar.xz + @rm -f *.zip + @rm -f *.gen + @rm -f *.html all: base upload