Update version to 4.2.1

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Minor changes to Windows build and packaging
2014-11-13 10:25:56 -08:00 · 2014-11-13 10:13:58 -08:00 · 2014-11-13 10:12:42 -08:00 · 2014-11-13 10:12:31 -08:00 · 2014-11-13 10:12:03 -08:00 · 2014-11-10 12:14:05 -08:00
5 changed files with 32 additions and 5 deletions
--- a/packaging/windows/mingw-make.sh
+++ b/packaging/windows/mingw-make.sh
@ -29,10 +29,11 @@ if [[ $1 == "Qt5-64" ]] ; then
 		QMAKE_MOC=/usr/x86_64-w64-mingw32/bin/qt5/moc \
 		QMAKE_UIC=/usr/x86_64-w64-mingw32/bin/qt5/uic \
 		QMAKE_RCC=/usr/x86_64-w64-mingw32/bin/qt5/rcc \
-		LIBDCDEVEL=../libdivecomputer \
 		LIBMARBLEDEVEL=../marble \
 		LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \
 		QMAKE_LIBDIR+=../openssl \
+		CONFIG+=win64target \
+		CONFIG+=brokenQt532win \
 		$BASEDIR/../../subsurface.pro

 elif [[ $1 == "Qt5" ]] ; then
@ -68,7 +69,6 @@ else

 	mingw32-qmake-qt4 \
 		CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw \
-		LIBDCDEVEL=../libdivecomputer \
 		LIBMARBLEDEVEL=../marble \
 		LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \
 		$BASEDIR/../../subsurface.pro
--- a/packaging/windows/subsurface.nsi.in
+++ b/packaging/windows/subsurface.nsi.in
@ -83,6 +83,22 @@
 #--------------------------------
 # Default installer section

+Function .onInit
+    !include x64.nsh
+    ${If} 64BITBUILDTOKEN
+        ${IfNot} ${RunningX64}
+            MessageBox MB_OK "You cannot install the 64bit version of Subsurface on a 32bit version of Windows"
+                Abort "Please download the 32bit version of the Subsurface installer"
+        ${EndIf}
+    ${Else}
+        ${If} ${RunningX64}
+            MessageBox MB_YESNO "Do you really want to install the 32bit version of Subsurface on your 64bit version of Windows?" IDYES goforit
+                Abort "Please download the 64bit version of the Subsurface installer"
+            goforit:
+        ${EndIf}
+    ${Endif}
+FunctionEnd
+
 Section
    SetShellVarContext all

--- a/scripts/win-ldd.pl
+++ b/scripts/win-ldd.pl
@ -51,7 +51,7 @@ for (@ARGV) {
 	next if /^-/;
 	if (-d $_) {
 		push @searchdirs, $_;
-	} elsif (-f $_) {
+	} elsif (-f $_ && ! /\.a$/) {
 		# Add $_'s path to the search list too
 		my $dirname = $_;
 		$dirname =~ s,/[^/]+$,,;
--- a/subsurface-install.pri
+++ b/subsurface-install.pri
@ -118,9 +118,19 @@ mac {
 		dlls.depends += $(DESTDIR_TARGET)

 		nsis.commands += $(CHK_DIR_EXISTS) $$WINDOWSSTAGING;
-		nsis.commands += cat $$NSIINPUTFILE | sed -e \'s/VERSIONTOKEN/$$VERSION_STRING/;s/PRODVTOKEN/$${PRODVERSION_STRING}/\' > $$NSIFILE
+		win64target {
+			nsis.commands += cat $$NSIINPUTFILE | sed -e \'s/VERSIONTOKEN/$$VERSION_STRING/;s/PRODVTOKEN/$${PRODVERSION_STRING}/;s/64BITBUILDTOKEN/1 == 1/\' > $$NSIFILE
+		} else {
+			nsis.commands += cat $$NSIINPUTFILE | sed -e \'s/VERSIONTOKEN/$$VERSION_STRING/;s/PRODVTOKEN/$${PRODVERSION_STRING}/;s/64BITBUILDTOKEN/1 == 0/\' > $$NSIFILE
+		}
 		nsis.depends += $$NSIINPUTFILE
 		nsis.target = $$NSISFILE
+		#
+		# FIXME HACK HACK FIXME  -- this is needed to create working daily builds...
+		#
+		brokenQt532win {
+			installer.commands += cp Qt531/*.dll staging;
+		}
 		installer.commands += $$MAKENSIS $$NSIFILE
 		installer.target = installer
 		installer.depends = nsis install
--- a/subsurface.pro
+++ b/subsurface.pro
@ -6,6 +6,7 @@ QT = core gui network svg concurrent
 lessThan(QT_MAJOR_VERSION, 5) {
 	QT += webkit
 } else {
+	QT += printsupport concurrent
 	!android: QT += webkitwidgets webkit
 	android: QT += androidextras
 }
@ -15,7 +16,7 @@ DEPENDPATH += qt-ui
 mac: TARGET = Subsurface
 else: TARGET = subsurface

-VERSION = 4.2
+VERSION = 4.2.1

 HEADERS = \
 	color.h \
Author	SHA1	Message	Date
Dirk Hohndel	df401bc87e	Update version to 4.2.1 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>	2014-11-13 10:25:56 -08:00
Dirk Hohndel	ec7bb26873	Minor changes to Windows build and packaging With these changes we link statically against libusb and libdivecomputer but don't add the .a files to our installers. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>	2014-11-13 10:13:58 -08:00
Dirk Hohndel	e10284d2cf	Windows installer: move the 32/64 bit check earlier It makes more sense to do this on init and not have the user go through any other screens in case this is the wrong binary. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>	2014-11-13 10:12:42 -08:00
Dirk Hohndel	fbb3d16f51	Ugly hack to work around broken Qt5.3.2 for Windows cross builds Checking this in to make sure I don't end up creating broken installers again. I doubt that this is useful for anyone but me - but then, I don't think anyone but me creates Windows installers. Background - when Fedora 20 updated the cross-built version of Qt for Win64 something broke. Subsurfae installed with those DLLs will crash. Replacing the older 5.3.1 DLLs fixes this for now, so I have a directory with just those DLLs and simply replace them in the staging directory before calling makensis. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>	2014-11-13 10:12:31 -08:00
Dirk Hohndel	90224c273b	Don't install Windows 64bit binaries on 32bit system Also warn people installing 32bit binaries on a 64bit system Signed-off-by: Dirk Hohndel <dirk@hohndel.org>	2014-11-13 10:12:03 -08:00
Dirk Hohndel	a5c282f939	Make things compile Signed-off-by: Dirk Hohndel <dirk@hohndel.org>	2014-11-10 12:14:05 -08:00