summaryrefslogtreecommitdiffstats
path: root/packaging/windows
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-01-24 15:58:35 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-01-24 15:58:35 -0800
commit002fe45dfd4776bb44a9e786625421a67558d60c (patch)
tree94a238d5a94e40aef7ae6a96bae6a71a6402954e /packaging/windows
parent87798b328ee3e543a57b25b56619ad113c433a4f (diff)
downloadsubsurface-002fe45dfd4776bb44a9e786625421a67558d60c.tar.gz
Try to automate the version number used in the windows installer
This adds a Makefile target to create the .nsi file from a template and to hopefully create the right strings to magically get the correct version strings in the Windows installer Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/windows')
-rwxr-xr-xpackaging/windows/mingw-make.sh2
-rw-r--r--packaging/windows/subsurface.nsi.in (renamed from packaging/windows/subsurface.nsi)4
2 files changed, 3 insertions, 3 deletions
diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh
index ccd418c6f..7416d1d59 100755
--- a/packaging/windows/mingw-make.sh
+++ b/packaging/windows/mingw-make.sh
@@ -12,4 +12,4 @@ make CC=i686-w64-mingw32-gcc \
PKG_CONFIG_PATH=/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/ \
CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw/ \
XSLTCONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xslt-config \
- XML2CONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xml2-config NAME=subsurface.exe install-cross-windows
+ XML2CONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xml2-config NAME=subsurface.exe install-cross-windows $@
diff --git a/packaging/windows/subsurface.nsi b/packaging/windows/subsurface.nsi.in
index 0dcf18939..5fdad4fff 100644
--- a/packaging/windows/subsurface.nsi
+++ b/packaging/windows/subsurface.nsi.in
@@ -18,10 +18,10 @@
# General
# Program version
- !define SUBSURFACE_VERSION "2.1"
+ !define SUBSURFACE_VERSION "VERSIONTOKEN"
# VIProductVersion requires version in x.x.x.x format
- !define SUBSURFACE_VIPRODUCTVERSION "2.1.0.0"
+ !define SUBSURFACE_VIPRODUCTVERSION "PRODVTOKEN"
# Installer name and filename
Name "Subsurface"