Merge branch 'master' into cooking

diff --git a/Makefile b/Makefile
index 20152c5bf3f6cfa361066c45a33cf097d3917a73..cd576ba1a88b284b557808a7576110910a5f963f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -100,6 +100,7 @@ GOURCEFLAGS=                  \
     --max-files 99999999999   \
     --max-file-lag 0.000001   \
     --bloom-multiplier 1.3    \
+    --logo doc/html/gmqcc.png \
     -1280x720
 
 #ffmpeg flags for gource
@@ -220,10 +221,10 @@ depend:
 install: install-gmqcc install-qcvm install-doc
 install-gmqcc: $(GMQCC)
        install -d -m755               $(DESTDIR)$(BINDIR)
-       install    -m755  $(GMQCC)     $(DESTDIR)$(BINDIR)/gmqcc
+       install    -m755  $(GMQCC)     $(DESTDIR)$(BINDIR)/$(GMQCC)
 install-qcvm: $(QCVM)
        install -d -m755               $(DESTDIR)$(BINDIR)
-       install    -m755  $(QCVM)      $(DESTDIR)$(BINDIR)/qcvm
+       install    -m755  $(QCVM)      $(DESTDIR)$(BINDIR)/$(QCVM)
 install-doc:
        install -d -m755               $(DESTDIR)$(MANDIR)/man1
        install    -m644  doc/gmqcc.1  $(DESTDIR)$(MANDIR)/man1/

diff --git a/distro/Makefile b/distro/Makefile
index d29cff8b2876e1f28d5023ed90ec223826b1c4d7..36fc942daca3fbd3553924e2d70d6c9761ab79d3 100644 (file)
--- a/distro/Makefile
+++ b/distro/Makefile
@@ -12,8 +12,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 +26,12 @@ 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
 
 clean:
        @rm -f *.deb
        @rm -f *.pkg.tar.xz
+       @rm -f *.zip
 
 all: base upload

diff --git a/distro/archlinux/git/PKGBUILD b/distro/archlinux/git/PKGBUILD
index 0ac2423a4828eef01a1b67ab0721df58ee3f912d..ac00fefcfcf9475539540c90cf2d216418e9728b 100644 (file)
--- a/distro/archlinux/git/PKGBUILD
+++ b/distro/archlinux/git/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: matthiaskrgr <matthiaskrgr _strange_curverd_character_ freedroid D0T org>
 
 pkgname=gmqcc-git
-pkgver=0.2.524.gc6bd5e6
+pkgver=0.2.612.g160e7cf
 pkgver(){
     cd gmqcc
     git describe --tags | sed -e 's/^gmqcc\-//' -e 's/-/./g'
@@ -38,5 +38,11 @@ package() {
        make install DESTDIR=$pkgdir PREFIX=/usr
        msg "Compiling done."
 
-       install -D LICENSE ${pkgdir}/usr/share/licenses/gmqcc/LICENSE
+       install -Dm644 syntax/geany/filetypes.qc    ${pkgdir}/usr/share/geany/filetypes.qc
+       install -Dm644 syntax/gtksourceview/qc.lang ${pkgdir}/usr/share/gtksourceview-3.0/language-specs/qc.lang
+       # jedit
+       install -Dm644 syntax/kate/qc.xml ${pkgdir}/usr/share/apps/katepart/syntax/qc.xml
+       install -Dm644 syntax/nano/qc.nanorc ${pkgdir}/usr/share/nano/qc.nanorc
+
+       install -Dm644 LICENSE                                   ${pkgdir}/usr/share/licenses/gmqcc/LICENSE
 }

diff --git a/distro/win32/Makefile b/distro/win32/Makefile
new file mode 100644 (file)
index 0000000..3a4ed24
--- /dev/null
+++ b/distro/win32/Makefile
@@ -0,0 +1,17 @@
+BASEDIR := ../..
+HEADER  := $(BASEDIR)/gmqcc.h
+MAJOR   := `sed -n -e '/GMQCC_VERSION_MAJOR/{s/.* .* //;p;q;}' $(HEADER)`
+MINOR   := `sed -n -e '/GMQCC_VERSION_MINOR/{s/.* .* //;p;q;}' $(HEADER)`
+PATCH   := `sed -n -e '/GMQCC_VERSION_PATCH/{s/.* .* //;p;q;}' $(HEADER)`
+BINDIR  := gmqcc-$(MAJOR).$(MINOR).$(PATCH)
+
+base:
+       $(MAKE) CC=i486-mingw32-gcc UNAME=MINGW32 -C $(BASEDIR) clean
+       $(MAKE) CC=i486-mingw32-gcc UNAME=MINGW32 -C $(BASEDIR) DESTDIR=distro/win32/$(BINDIR) PREFIX=/ install
+       @zip -r $(BINDIR)-win32.zip $(BINDIR)
+       @rm -rf $(BINDIR)
+clean:
+       $(MAKE) -C $(BASEDIR) clean
+       @rm -f *.zip
+
+all: base

diff --git a/doc/html/gmqcc.png b/doc/html/gmqcc.png
new file mode 100644 (file)
index 0000000..0d9b79f
Binary files /dev/null and b/doc/html/gmqcc.png differ