subsurface.git/packaging/windows, branch v3.9

Create installer with qmake

2013-11-05T04:05:14Z

This is seriously flawed. makensis is run twice for some reason. I also noticed that the data and xslt directories under packaging/windows aren't created when running make install. Running make -f Makefile.Release install_marbledir install_deploy works, but obviously this should be taken care of by the dependency. The installed binary under Windows is not finding its icon, the translations are missing... lots of work left to do here. Signed-off-by: Dirk Hohndel

Get cross build to work again

2013-10-11T20:33:38Z

...and re-enable silent mode by default for cross builds Signed-off-by: Dirk Hohndel

Add information that goes into the Windows .exe file

2013-10-09T06:29:43Z

And drop the unnecessary .rc file. Signed-off-by: Thiago Macieira

Update installer so we can cross-build for Windows

2013-09-17T19:05:10Z

Marble doesn't work, yet (Google Maps aren't loaded), but at least Subsurface starts under Windows with the installer built. Signed-off-by: Dirk Hohndel

Merge branch 'Qt'

2013-05-18T05:01:41Z

After the 3.1 release it is time to shift the focus on the Qt effort - and the best way to do this is to merge the changes in the Qt branch into master. Linus was extremely nice and did a merge for me. I decided to do my own merge instead (which by accident actually based on a different version of the Qt branch) and then used his merge to double check what I was doing. I resolved a few things differently but overall what we did was very much the same (and I say this with pride since Linus is a professional git merger) Here's his merge commit message: This is a rough and tumble merge of the Qt branch into 'master', trying to sort out the conflicts as best as I could. There were two major kinds of conflicts: - the Makefile changes, in particular the split of the single Makefile into Rules.mk and Configure.mk, along with the obvious Qt build changes themselves. Those changes conflicted with some of the updates done in mainline wrt "release" targets and some helper macros ($(NAME) etc). Resolved by largely taking the Qt branch versions, and then editing in the most obvious parts of the Makefile updates from mainline. NOTE! The script/get_version shell script was made to just fail silently on not finding a git repository, which avoided having to take some particularly ugly Makefile changes. - Various random updates in mainline to support things like dive tags. The conflicts were mainly to the gtk GUI parts, which obviously looked different afterwards. I fixed things up to look like the newer code, but since the gtk files themselves are actually dead in the Qt branch, this is largely irrelevant. NOTE! This does *NOT* introduce the equivalent Qt functionality. The fields are there in the code now, but there's no Qt UI for the whole dive tag stuff etc. This seems to compile for me (although I have to force "QMAKE=qmake-qt4" on f19), and results in a Linux binary that seems to work, but it is otherwise largely untested. Signed-off-by: Linus Torvalds Signed-off-by: Dirk Hohndel

Windows installer: append the package version to registry

2013-05-15T21:35:52Z

On installation, set the "DisplayVersion" registry value to ${SUBSURFACE_VERSION}, so that a version is displayed when browsing the list of installed programs. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Dirk Hohndel

Windows installer: add an "Add/Remove Programs" entry

2013-05-14T17:32:06Z

The NSIS script on installation will write a key to the registry that will be shown to the user as a "Subsurface" entry (with icon) in the list of installed programs that can be uninstalled (e.g. in the Control Panel). On uninstall, said registry key will be removed. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Dirk Hohndel

Fix Windows cross build

2013-05-14T10:27:45Z

commit 59294029f3d1 ("Capitalize package name and add capitalized tar-ball prefix") had an unintended side effect: the cross build for Windows on Linux no longer worked (as it set NAME=subsurface.exe). Fixed this by introducing a TARGET variable that is derived from $(NAME). Signed-off-by: Dirk Hohndel

Try to add required dependencies to get https working on Windows

2013-05-12T04:54:04Z

This clearly isn't enough. But I simply can't seem to get this to work... Signed-off-by: Dirk Hohndel

Report error string for libsoup connection to divelogs.de

2013-05-12T04:53:29Z

Just reporting a default string that something went wrong is kind of pointless... Signed-off-by: Dirk Hohndel