mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-29 13:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/Makefile

292 lines
11 KiB
Makefile
Raw Normal View History

Bump version to 2.1 Getting ready for the release Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-23 03:57:57 +00:00
VERSION=2.1
Add the version to the Makefile Not quite the same format as for the kernel, but I want to do the normal "edit the makefile before making a release" model that I'm used to. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-26 18:04:50 +00:00
Fix stupid mis-initialization of current sample .. nice compiler warning hidden by the crazy gcc pointer sign warnings that nobody wants to see (yes, we really do want to do 'strlen()' even on unsigned strings, don't complain, crazy bitch compiler). So this also makes our CFLAGS set -Wno-pointer-sign. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-08-30 21:36:34 +00:00
CC=gcc
Make it easier to pass macro definitions from make This small change to the Makefile allows you to call make CLCFLAGS=-DDEBUG or some other define directly from the command line. It gets added to the CFLAGS without overwriting the CFLAGS. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-05 17:30:29 +00:00
CFLAGS=-Wall -Wno-pointer-sign -g $(CLCFLAGS)
Add cheesy "install" target It just puts the subsurface binary in $(HOME)/bin. .. and then the binary won't find the icon file, so this is really not enough of an install to get it really working, but whatever. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-23 03:59:10 +00:00
INSTALL=install
Cleanup Makefile and make it work for cross compiling with MinGW Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-27 16:04:29 +00:00
PKGCONFIG=pkg-config
XML2CONFIG=xml2-config
Use XSLT file to open JDiveLog logs Open JDiveLog files by translating them to subsurface format using XSLT. These files are identified by the name of the first element (JDiveLog) and transform is applied to only these. The XSLT feature is compiled in only if libxslt is installed. The transformation files are installed globally in Linux under /usr/share/subsurface/xslt. Windows and OSX still need appropriate Makefile changes and testing. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-05 10:39:17 +00:00
XSLCONFIG=xslt-config
Add cheesy "install" target It just puts the subsurface binary in $(HOME)/bin. .. and then the binary won't find the icon file, so this is really not enough of an install to get it really working, but whatever. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-23 03:59:10 +00:00
Have "make install" act more as expected for a desktop application I'm trying to get subsurface to get closer to becoming a "regular desktop application"; so far this is based on the recommendations and guidelines on OpenSUSE and Fedora. The icon is now named subsurface.svg and make install installs it in the correct location. At runtime subsurface first checks if an icon is installed and if it is it uses that - otherwise it falls back to the old code that tries to read the svg file from the current directory. We also install a subsurface.desktop file Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-11 22:58:38 +00:00
# these locations seem to work for SuSE and Fedora
# prefix = $(HOME)
use DESTDIR according to my understanding of GNU standards make DESRDIR a prefix of everything according my understanding of the GNU standards. This is also useful(/needed) for installing in Gentoo. Declare BINDIR for bin/program directory. Signed-off-by: Martin Gysel <me@bearsh.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-10-17 13:53:59 +00:00
prefix = $(DESTDIR)/usr
BINDIR = $(prefix)/bin
Install manpage (and fix two white space issues) Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-12 20:30:08 +00:00
DATADIR = $(prefix)/share
DESKTOPDIR = $(DATADIR)/applications
ICONPATH = $(DATADIR)/icons/hicolor
Have "make install" act more as expected for a desktop application I'm trying to get subsurface to get closer to becoming a "regular desktop application"; so far this is based on the recommendations and guidelines on OpenSUSE and Fedora. The icon is now named subsurface.svg and make install installs it in the correct location. At runtime subsurface first checks if an icon is installed and if it is it uses that - otherwise it falls back to the old code that tries to read the svg file from the current directory. We also install a subsurface.desktop file Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-11 22:58:38 +00:00
ICONDIR = $(ICONPATH)/scalable/apps
Install manpage (and fix two white space issues) Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-12 20:30:08 +00:00
MANDIR = $(DATADIR)/man/man1
Use XSLT file to open JDiveLog logs Open JDiveLog files by translating them to subsurface format using XSLT. These files are identified by the name of the first element (JDiveLog) and transform is applied to only these. The XSLT feature is compiled in only if libxslt is installed. The transformation files are installed globally in Linux under /usr/share/subsurface/xslt. Windows and OSX still need appropriate Makefile changes and testing. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-05 10:39:17 +00:00
XSLTDIR = $(DATADIR)/subsurface/xslt
Have "make install" act more as expected for a desktop application I'm trying to get subsurface to get closer to becoming a "regular desktop application"; so far this is based on the recommendations and guidelines on OpenSUSE and Fedora. The icon is now named subsurface.svg and make install installs it in the correct location. At runtime subsurface first checks if an icon is installed and if it is it uses that - otherwise it falls back to the old code that tries to read the svg file from the current directory. We also install a subsurface.desktop file Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-11 22:58:38 +00:00
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(ICONPATH)
A Makefile 'clean' target is quite standard. Signed-off-by: Cristian Ionescu-Idbohrn <cii@axis.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-27 16:43:53 +00:00
NAME = subsurface
Have "make install" act more as expected for a desktop application I'm trying to get subsurface to get closer to becoming a "regular desktop application"; so far this is based on the recommendations and guidelines on OpenSUSE and Fedora. The icon is now named subsurface.svg and make install installs it in the correct location. At runtime subsurface first checks if an icon is installed and if it is it uses that - otherwise it falls back to the old code that tries to read the svg file from the current directory. We also install a subsurface.desktop file Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-11 22:58:38 +00:00
ICONFILE = $(NAME).svg
DESKTOPFILE = $(NAME).desktop
Install manpage (and fix two white space issues) Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-12 20:30:08 +00:00
MANFILES = $(NAME).1
Use XSLT file to open JDiveLog logs Open JDiveLog files by translating them to subsurface format using XSLT. These files are identified by the name of the first element (JDiveLog) and transform is applied to only these. The XSLT feature is compiled in only if libxslt is installed. The transformation files are installed globally in Linux under /usr/share/subsurface/xslt. Windows and OSX still need appropriate Makefile changes and testing. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-05 10:39:17 +00:00
XSLTFILES = xslt/*.xslt
Fix stupid mis-initialization of current sample .. nice compiler warning hidden by the crazy gcc pointer sign warnings that nobody wants to see (yes, we really do want to do 'strlen()' even on unsigned strings, don't complain, crazy bitch compiler). So this also makes our CFLAGS set -Wno-pointer-sign. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-08-30 21:36:34 +00:00
Improve Makefile for MacOS Some macs appear to need "-framework CoreFoundation" added to the linking step, others (which appear to have the exact same OS and tools installed), don't. But as it doesn't appeart to hurt, I unconditionally add this. Switched to using pkgconfig to find libdivecomputer on the Mac. Tried to clean up the Makefile a bit Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Acked-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
2011-12-14 19:22:12 +00:00
UNAME := $(shell $(CC) -dumpmachine 2>&1 | grep -E -o "linux|darwin|win")
Add basic MacOSX app bundle install target Native MacOSX app bundles are installed in /Applications. We want a separate install target for this, since some would probably prefer the regular unixy way. Signed-Off-By: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
2011-10-16 21:16:36 +00:00
Cleanup Makefile and make it work for cross compiling with MinGW Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-27 16:04:29 +00:00
# find libdivecomputer
Improve Makefile for MacOS Some macs appear to need "-framework CoreFoundation" added to the linking step, others (which appear to have the exact same OS and tools installed), don't. But as it doesn't appeart to hurt, I unconditionally add this. Switched to using pkgconfig to find libdivecomputer on the Mac. Tried to clean up the Makefile a bit Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Acked-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
2011-12-14 19:22:12 +00:00
# First deal with the cross compile environment and with Mac.
Cleanup Makefile and make it work for cross compiling with MinGW Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-27 16:04:29 +00:00
# For the native case, Linus doesn't want to trust pkg-config given
# how young libdivecomputer still is - so we check the typical
# subdirectories of /usr/local and /usr and then we give up. You can
# override by simply setting it here
Since we don't want configure, use gnumake to find libdivecomputer Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-11 00:53:59 +00:00
#
Cleanup Makefile and make it work for cross compiling with MinGW Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-27 16:04:29 +00:00
ifeq ($(CC), i686-w64-mingw32-gcc)
# ok, we are cross building for Windows
More Mac improvements The startup shell script workaround isn't needed anymore. The preferences hotkey didn't work. Remove left-over menu separators. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
2012-01-03 19:18:04 +00:00
LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer)
LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer)
Get icons working correctly under Windows With this we are able to include both a separate .ico file that the program can load at runtime and a .res file (that is created from the .rc file, both in the packaging/windows directory) that is linked into the executable and makes the Windows Explorer show the correct icon for subsurface. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-29 16:14:15 +00:00
RESFILE = packaging/windows/subsurface.res
Get rid of the terminal window that is displayed under Windows Thanks to Michael Wiedmann I now know the magic incantation to get MinGW to create a Windows executable that doesn't open two windows, a text console and the actual gtk window. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-29 17:27:49 +00:00
LDFLAGS += -Wl,-subsystem,windows
Improve Makefile for MacOS Some macs appear to need "-framework CoreFoundation" added to the linking step, others (which appear to have the exact same OS and tools installed), don't. But as it doesn't appeart to hurt, I unconditionally add this. Switched to using pkgconfig to find libdivecomputer on the Mac. Tried to clean up the Makefile a bit Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Acked-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
2011-12-14 19:22:12 +00:00
else ifeq ($(UNAME), darwin)
More Mac improvements The startup shell script workaround isn't needed anymore. The preferences hotkey didn't work. Remove left-over menu separators. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
2012-01-03 19:18:04 +00:00
LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer)
LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer)
Cleanup Makefile and make it work for cross compiling with MinGW Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-27 16:04:29 +00:00
else
Makefile fixes The stupid lib vs lib64 problem. I'm sure there's a more portable way to handle this, but this at least seems to work. Also fix the install target. Seriously, you create a directory with mode 644 and claim that this ever worked? Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-24 11:12:44 +00:00
libdc-local := $(wildcard /usr/local/lib/libdivecomputer.a)
libdc-local64 := $(wildcard /usr/local/lib64/libdivecomputer.a)
libdc-usr := $(wildcard /usr/lib/libdivecomputer.a)
libdc-usr64 := $(wildcard /usr/lib64/libdivecomputer.a)
Since we don't want configure, use gnumake to find libdivecomputer Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-11 00:53:59 +00:00
Makefile hack to allow building with uninstalled libdivecomputer Simply call "make LIBDCDEVEL=1" and the libdivecomputer includefiles are expected in ../libdivecomputer/include and the actual library is linked from ../libdivecomputer/src/.libs Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-20 00:26:16 +00:00
ifneq ($(LIBDCDEVEL),)
LIBDIVECOMPUTERDIR = ../libdivecomputer
LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/src/.libs/libdivecomputer.a
else ifneq ($(strip $(libdc-local)),)
Since we don't want configure, use gnumake to find libdivecomputer Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-11 00:53:59 +00:00
LIBDIVECOMPUTERDIR = /usr/local
Update for libdivecomputer pkg-config include file changes Subsurface doesn't compile on OS X any more, because libdivecomputer changed the way the header inclusion works: the include path from pkg-config no longer includes the final "libdivecomputer" component, and instead of doing #include <header.h> for libdivecomputer headers, we're now supposed to do #include <libdivecomputer/header.h> instead. Which is cleaner anyway. The reason this only bit us on OS X is that I never trusted pkg-config that much for non-system libraries on Linux (maybe it works, maybe it doesn't, I've seen it go both ways), so on Linux we just used our own version of the include path, and thus weren't affected by the libdivecomputer config change. Clean up the includes while at it - we no longer need (or want) the device-specific header files, since we just use the generic functions. Reported-by: Grischa Toedt <toedt@embl.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-07-10 19:33:44 +00:00
LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
Don't use dynamic linking for libdivecomputer Commit bd8948386d55 ("Since we don't want configure, use gnumake to find libdivecomputer") was totally broken. Sure, using GNU make features is fine. But then hiding in that commit is the fact that it also changed it to use "-ldivecomputer" instead of just linking with the static libdivecomputer archive. And that's just a really bad idea. Dynamic linking is useful for things like libc, where it allows sharing of the code pages across all the programs using it. For something like libdivecomputer it's just a *bad* idea, and doesn't even work. The libdivecomputer interfaces aren't stable enough to make it a good idea even if it *did* work, and the libdivecomputer "make install" phase doesn't do the proper ldconfig etc setup anyway. Static linking is just simpler and better. It also means that the binary will work even if you move it around to another machine - since libdivecomputer isn't exactly a "standard library".. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-10-14 04:06:13 +00:00
LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
Makefile fixes The stupid lib vs lib64 problem. I'm sure there's a more portable way to handle this, but this at least seems to work. Also fix the install target. Seriously, you create a directory with mode 644 and claim that this ever worked? Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-24 11:12:44 +00:00
else ifneq ($(strip $(libdc-local64)),)
LIBDIVECOMPUTERDIR = /usr/local
Update for libdivecomputer pkg-config include file changes Subsurface doesn't compile on OS X any more, because libdivecomputer changed the way the header inclusion works: the include path from pkg-config no longer includes the final "libdivecomputer" component, and instead of doing #include <header.h> for libdivecomputer headers, we're now supposed to do #include <libdivecomputer/header.h> instead. Which is cleaner anyway. The reason this only bit us on OS X is that I never trusted pkg-config that much for non-system libraries on Linux (maybe it works, maybe it doesn't, I've seen it go both ways), so on Linux we just used our own version of the include path, and thus weren't affected by the libdivecomputer config change. Clean up the includes while at it - we no longer need (or want) the device-specific header files, since we just use the generic functions. Reported-by: Grischa Toedt <toedt@embl.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-07-10 19:33:44 +00:00
LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
Makefile fixes The stupid lib vs lib64 problem. I'm sure there's a more portable way to handle this, but this at least seems to work. Also fix the install target. Seriously, you create a directory with mode 644 and claim that this ever worked? Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-24 11:12:44 +00:00
LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib64/libdivecomputer.a
Since we don't want configure, use gnumake to find libdivecomputer Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-11 00:53:59 +00:00
else ifneq ($(strip $(libdc-usr)),)
LIBDIVECOMPUTERDIR = /usr
Update for libdivecomputer pkg-config include file changes Subsurface doesn't compile on OS X any more, because libdivecomputer changed the way the header inclusion works: the include path from pkg-config no longer includes the final "libdivecomputer" component, and instead of doing #include <header.h> for libdivecomputer headers, we're now supposed to do #include <libdivecomputer/header.h> instead. Which is cleaner anyway. The reason this only bit us on OS X is that I never trusted pkg-config that much for non-system libraries on Linux (maybe it works, maybe it doesn't, I've seen it go both ways), so on Linux we just used our own version of the include path, and thus weren't affected by the libdivecomputer config change. Clean up the includes while at it - we no longer need (or want) the device-specific header files, since we just use the generic functions. Reported-by: Grischa Toedt <toedt@embl.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-07-10 19:33:44 +00:00
LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
Don't use dynamic linking for libdivecomputer Commit bd8948386d55 ("Since we don't want configure, use gnumake to find libdivecomputer") was totally broken. Sure, using GNU make features is fine. But then hiding in that commit is the fact that it also changed it to use "-ldivecomputer" instead of just linking with the static libdivecomputer archive. And that's just a really bad idea. Dynamic linking is useful for things like libc, where it allows sharing of the code pages across all the programs using it. For something like libdivecomputer it's just a *bad* idea, and doesn't even work. The libdivecomputer interfaces aren't stable enough to make it a good idea even if it *did* work, and the libdivecomputer "make install" phase doesn't do the proper ldconfig etc setup anyway. Static linking is just simpler and better. It also means that the binary will work even if you move it around to another machine - since libdivecomputer isn't exactly a "standard library".. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-10-14 04:06:13 +00:00
LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
Makefile fixes The stupid lib vs lib64 problem. I'm sure there's a more portable way to handle this, but this at least seems to work. Also fix the install target. Seriously, you create a directory with mode 644 and claim that this ever worked? Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-24 11:12:44 +00:00
else ifneq ($(strip $(libdc-usr64)),)
LIBDIVECOMPUTERDIR = /usr
Update for libdivecomputer pkg-config include file changes Subsurface doesn't compile on OS X any more, because libdivecomputer changed the way the header inclusion works: the include path from pkg-config no longer includes the final "libdivecomputer" component, and instead of doing #include <header.h> for libdivecomputer headers, we're now supposed to do #include <libdivecomputer/header.h> instead. Which is cleaner anyway. The reason this only bit us on OS X is that I never trusted pkg-config that much for non-system libraries on Linux (maybe it works, maybe it doesn't, I've seen it go both ways), so on Linux we just used our own version of the include path, and thus weren't affected by the libdivecomputer config change. Clean up the includes while at it - we no longer need (or want) the device-specific header files, since we just use the generic functions. Reported-by: Grischa Toedt <toedt@embl.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-07-10 19:33:44 +00:00
LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
Makefile fixes The stupid lib vs lib64 problem. I'm sure there's a more portable way to handle this, but this at least seems to work. Also fix the install target. Seriously, you create a directory with mode 644 and claim that this ever worked? Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-24 11:12:44 +00:00
LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib64/libdivecomputer.a
Since we don't want configure, use gnumake to find libdivecomputer Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-11 00:53:59 +00:00
else
Fix Makefile syntax error it looks prettier, but we can't have a tab in front of the $(error) Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-12 04:09:46 +00:00
$(error Cannot find libdivecomputer - please edit Makefile)
Since we don't want configure, use gnumake to find libdivecomputer Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-11 00:53:59 +00:00
endif
Cleanup Makefile and make it work for cross compiling with MinGW Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-27 16:04:29 +00:00
endif
Start some very initial libdivecomputer integration Ok, so this is quite broken right now: it doesn't actually really *do* anything, and it now requires that you have libdivecomputer all set up and installed. That is fairly easy: mkdir ../src cd ../src git clone git://libdivecomputer.git.sourceforge.net/gitroot/libdivecomputer/libdivecomputer cd libdivecomputer autoreconf --install ./configure make sudo make install but you may feel that this is not exactly useful considering that nothing actually *works* yet. Some day. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-12 16:19:21 +00:00
Clean up library handling .. and pick up libusb-1.0 automatically if it's installed. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-22 19:21:20 +00:00
# Libusb-1.0 is only required if libdivecomputer was built with it.
# And libdivecomputer is only built with it if libusb-1.0 is
# installed. So get libusb if it exists, but don't complain
# about it if it doesn't.
Cleanup Makefile and make it work for cross compiling with MinGW Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-27 16:04:29 +00:00
LIBUSB = $(shell $(PKGCONFIG) --libs libusb-1.0 2> /dev/null)
Improve cross compile support and fix windows.c This should make the Makefile much more robust when cross compiling. The windows.c code is now compile tested but not functionally tested. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-11-25 06:32:10 +00:00
LIBGTK = $(shell $(PKGCONFIG) --libs gtk+-2.0 glib-2.0)
Cleanup Makefile and make it work for cross compiling with MinGW Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-27 16:04:29 +00:00
LIBDIVECOMPUTERCFLAGS = $(LIBDIVECOMPUTERINCLUDES)
Clean up library handling .. and pick up libusb-1.0 automatically if it's installed. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-22 19:21:20 +00:00
LIBDIVECOMPUTER = $(LIBDIVECOMPUTERARCHIVE) $(LIBUSB)
Split reading/writing preferences into OS specific files This adds tested code for Linux and Mac OS, implementing the api that Linus suggested. The Windows code was moved into its own file, but hasn't even been compile tested, yet. In order to have just one interface to set or get a preference value we encode TRUE as (void *) 1 and FALSE as NULL. This works consistently on all platforms and regardless of whether we have 32 or 64 bit. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-11-24 06:56:57 +00:00
LIBXML2 = $(shell $(XML2CONFIG) --libs)
LIBXSLT = $(shell $(XSLCONFIG) --libs)
XML2CFLAGS = $(shell $(XML2CONFIG) --cflags)
GLIB2CFLAGS = $(shell $(PKGCONFIG) --cflags glib-2.0)
GTK2CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-2.0)
CFLAGS += $(shell $(XSLCONFIG) --cflags)
Add "native" Suunto SDE zip file reading You need to have libzip-devel installed, and pkg-config needs to know about it for the build to pick up on it. On at least Fedora, a simple "yum install libzip-devel" will make things work, although you may need to force a rebuild of subsurface too (the "file.o" file in particular - the Makefile doesn't track system dependencies). Then, you can just do subsurface my-dives.SDE to read the data directly from the SDE file. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-01-27 01:43:33 +00:00
LIBZIP = $(shell $(PKGCONFIG) --libs libzip 2> /dev/null)
ifneq ($(strip $(LIBZIP)),)
ZIP = -DLIBZIP $(shell $(PKGCONFIG) --cflags libzip)
endif
Improve cross compile support and fix windows.c This should make the Makefile much more robust when cross compiling. The windows.c code is now compile tested but not functionally tested. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-11-25 06:32:10 +00:00
ifeq ($(UNAME), linux)
LIBGCONF2 = $(shell $(PKGCONFIG) --libs gconf-2.0)
GCONF2CFLAGS = $(shell $(PKGCONFIG) --cflags gconf-2.0)
Split reading/writing preferences into OS specific files This adds tested code for Linux and Mac OS, implementing the api that Linus suggested. The Windows code was moved into its own file, but hasn't even been compile tested, yet. In order to have just one interface to set or get a preference value we encode TRUE as (void *) 1 and FALSE as NULL. This works consistently on all platforms and regardless of whether we have 32 or 64 bit. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-11-24 06:56:57 +00:00
OSSUPPORT = linux
OSSUPPORT_CFLAGS = $(GTK2CFLAGS) $(GCONF2CFLAGS)
Improve cross compile support and fix windows.c This should make the Makefile much more robust when cross compiling. The windows.c code is now compile tested but not functionally tested. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-11-25 06:32:10 +00:00
else ifeq ($(UNAME), darwin)
Split reading/writing preferences into OS specific files This adds tested code for Linux and Mac OS, implementing the api that Linus suggested. The Windows code was moved into its own file, but hasn't even been compile tested, yet. In order to have just one interface to set or get a preference value we encode TRUE as (void *) 1 and FALSE as NULL. This works consistently on all platforms and regardless of whether we have 32 or 64 bit. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-11-24 06:56:57 +00:00
OSSUPPORT = macos
OSSUPPORT_CFLAGS = $(GTK2CFLAGS)
Improve Makefile for MacOS Some macs appear to need "-framework CoreFoundation" added to the linking step, others (which appear to have the exact same OS and tools installed), don't. But as it doesn't appeart to hurt, I unconditionally add this. Switched to using pkgconfig to find libdivecomputer on the Mac. Tried to clean up the Makefile a bit Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Acked-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
2011-12-14 19:22:12 +00:00
MACOSXINSTALL = /Applications/Subsurface.app
MACOSXFILES = packaging/macosx
Redoing the Mac bundling With the right tools in place you can now create a bundle from the Makefile by calling "make create-macos-bundle" In the process of this I also moved the locale directory where we stage our .mo files to share/locale (which is much more logical). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 04:24:02 +00:00
MACOSXSTAGING = $(MACOSXFILES)/Subsurface.app
More Mac improvements The startup shell script workaround isn't needed anymore. The preferences hotkey didn't work. Remove left-over menu separators. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
2012-01-03 19:18:04 +00:00
EXTRALIBS = $(shell $(PKGCONFIG) --libs gtk-mac-integration) -framework CoreFoundation
CFLAGS += $(shell $(PKGCONFIG) --cflags gtk-mac-integration)
More gtk-mac-bundler improvements Without "-headerpad_max_install_names", gtk-mac-bundler would complain with "changing install names or rpaths can't be redone for: /Applications/.subsurface.app/Contents/MacOS/subsurface-bin (for architecture x86_64) because larger updated load commands do not fit" Also, libdivecomputer needs to be configured with --with-prefix=/opt/local Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-07 14:39:17 +00:00
LDFLAGS += -headerpad_max_install_names
Redoing the Mac bundling With the right tools in place you can now create a bundle from the Makefile by calling "make create-macos-bundle" In the process of this I also moved the locale directory where we stage our .mo files to share/locale (which is much more logical). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 04:24:02 +00:00
GTK_MAC_BUNDLER = ~/.local/bin/gtk-mac-bundler
Split reading/writing preferences into OS specific files This adds tested code for Linux and Mac OS, implementing the api that Linus suggested. The Windows code was moved into its own file, but hasn't even been compile tested, yet. In order to have just one interface to set or get a preference value we encode TRUE as (void *) 1 and FALSE as NULL. This works consistently on all platforms and regardless of whether we have 32 or 64 bit. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-11-24 06:56:57 +00:00
else
OSSUPPORT = windows
OSSUPPORT_CFLAGS = $(GTK2CFLAGS)
Improved packaging for Windows This commit adds an install-cross-windows target to the Makefile that creates a staging directory for us under packaging/windows that contains the required .mo files. This currently fails for the Norwegian translation because of the no_NO.UTF-8 vs nb issue - right now we just use the first component of our own localization filename to find the matching Windows localization and that fails. The subsurface.nsi file is updated accordingly and this now appears to create working installers with sane paths for the localization files. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 11:04:37 +00:00
WINDOWSSTAGING = ./packaging/windows
Redoing the Mac bundling With the right tools in place you can now create a bundle from the Makefile by calling "make create-macos-bundle" In the process of this I also moved the locale directory where we stage our .mo files to share/locale (which is much more logical). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 04:24:02 +00:00
WINMSGDIRS=$(addprefix share/locale/,$(shell ls po/*.po | sed -e 's/po\/\(..\)_.*/\1\/LC_MESSAGES/'))
Split reading/writing preferences into OS specific files This adds tested code for Linux and Mac OS, implementing the api that Linus suggested. The Windows code was moved into its own file, but hasn't even been compile tested, yet. In order to have just one interface to set or get a preference value we encode TRUE as (void *) 1 and FALSE as NULL. This works consistently on all platforms and regardless of whether we have 32 or 64 bit. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-11-24 06:56:57 +00:00
endif
ifneq ($(strip $(LIBXSLT)),)
# We still need proper paths and install options for OSX and Windows
ifeq ($(shell sh -c 'uname -s 2>/dev/null || echo not'),Linux)
XSLT=-DXSLT='"$(XSLTDIR)"'
endif
endif
Improve on divecomputer data handling This simplifies the vendor/product fields into just a single "model" string for the dive computer, since we can't really validly ever use it any other way anyway. Also, add 'deviceid' and 'diveid' fields: they are just 32-bit hex values that are unique for that particular dive computer model. For libdivecomputer, they are basically the first word of the SHA1 of the data that libdivecomputer gives us. (Trying to expose it in some other way is insane - different dive computers use different models for the ID, so don't try to do some kind of serial number or something like that) For the Uemis Zurich, which doesn't use the libdivecomputer import, we currently only set the model name. The computer does have some kind of device ID string, and we could/should just do the same "SHA1 over the ID" to give it a unique ID, but the pseudo-xml parsing confuses me, so I'll let Dirk fix that up. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-25 19:44:27 +00:00
LIBS = $(LIBXML2) $(LIBXSLT) $(LIBGTK) $(LIBGCONF2) $(LIBDIVECOMPUTER) $(EXTRALIBS) $(LIBZIP) -lpthread -lm -lssl -lcrypto
Added a comment about libusb dependency in Makefile. Due to libdivecomputer's dependency, can be necessary to add libusb to pkg-config in order to compile, so I exported the pkg-config line in the subsurface target to LIBS variable, and added a comment about libusb. Signed-off-by: Riccardo Albertini <ssirowain@gmail.com>
2011-09-20 10:22:45 +00:00
Better gettext build My previous take at adding gettext to the Makefile wasn't very good, since it always relinked the subsurface executable. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-12 08:05:41 +00:00
MSGLANGS=$(notdir $(wildcard po/*po))
Redoing the Mac bundling With the right tools in place you can now create a bundle from the Makefile by calling "make create-macos-bundle" In the process of this I also moved the locale directory where we stage our .mo files to share/locale (which is much more logical). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 04:24:02 +00:00
MSGOBJS=$(addprefix share/locale/,$(MSGLANGS:.po=.UTF-8/LC_MESSAGES/subsurface.mo))
Better gettext build My previous take at adding gettext to the Makefile wasn't very good, since it always relinked the subsurface executable. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-12 08:05:41 +00:00
First stab at simplistic dive planning This comes with absolutely no gui - so the plan literally needs to be compiled into Subsurface. Not exactly a feature, but this allowed me to focus on the planning part instead of spending time on tedious UI work. A new menu "Planner" with entry "Test Planner" calls into the hard-coded function in planner.c. There a simple dive plan can be constructed with calls to plan_add_segment(&diveplan, duration, depth at the end, fO2, pO2) Calling plan(&diveplan) does the deco calculations and creates deco stops that keep us below the ceiling (with the GFlow/high values currently configured). The stop levels used are defined at the top of planner.c in the stoplevels array - there is no need to do the traditional multiples of 3m or anything like that. The dive including the ascents and deco stops all the way to the surface is completed and then added as simulated dive to the end of the divelist (I guess we could automatically select it later) and can be viewed. This is crude but shows the direction we can go with this. Envision a nice UI that allows you to simply enter the segments and pick the desired stops. What is missing is the ability to give the algorithm additional gases that it can use during the deco phase - right now it simply keeps using the last gas used in the diveplan. All that said, there are clear bugs here - and sadly they seem to be in the deco calculations, as with the example given the ceiling that is calculated makes no sense. When displayed in smooth mode it has very strange jumps up and down that I wouldn't expect. For example with GF 35/75 (the default) the deco ceiling when looking at the simulated dive jumps from 16m back up to 13m around 14:10 into the dive. That seems very odd. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-05 07:11:42 +00:00
OBJS = main.o dive.o time.o profile.o info.o equipment.o divelist.o deco.o planner.o \
First implementation of native Uemis downloader This includes one major hack that uses a private data structure from libdivecomputer to allow us to show the Uemis Zurich as one computer the user can import from. Once the user has chosen the Uemis we don't use libdivecomputer but our own downloader. Just like in the libdicecomputer case this runs in its own thread and updates the import dialog with progress information. The code also keeps track of the last dive that has been downloaded from a Uemis computer so we only import new dives on subsequent downloads. And since the Uemis Zurich gives us its device id, we make this a "per divecomputer" property for people who dive with multiple Uemis Zurich computers. This uses the debugfile infrastructure to allow easily collecting debugging output - especially on Windows where by default console output is lost. Known limitations: when the Uemis runs out of space (it uses its filesystem for communication with the host computer) we have no graceful way to reset things. This is why the code doesn't try to download ALL dives on the computer but instead download them in increments of ten dives. This clearly needs to be addressed once I understand how to reset the device. The Cancel button of the import dialog isn't correctly hooked up, yet. I still need to figure out how to gracefully shut down a download without potentially hanging the device. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-09-25 14:28:47 +00:00
parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o uemis-downloader.o \
Move device_info handling into a new 'device.c' file The legacy nickname wrappers (that use the device_info structure) are left in gtk-gui.c. We can slowly start moving away from them, we don't want to start exporting that thing as some kind of generic interface. This isn't a pure code movement - because we leave the legacy interfaces alone, there are a few new interfaces in device.c (like "create a new device_info entry") that were embedded into the legacy "create nickname" code, and needed to be abstracted out. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-09 20:07:09 +00:00
gtk-gui.o statistics.o file.o cochran.o device.o $(OSSUPPORT).o $(RESFILE)
Split up profile frame generation into its own file. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-08-31 17:20:46 +00:00
Better gettext build My previous take at adding gettext to the Makefile wasn't very good, since it always relinked the subsurface executable. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-12 08:05:41 +00:00
$(NAME): $(OBJS) $(MSGOBJS)
A Makefile 'clean' target is quite standard. Signed-off-by: Cristian Ionescu-Idbohrn <cii@axis.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-27 16:43:53 +00:00
$(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS)
Start moving some of the non-parsing stuff out of 'parse.c' Create a 'main.c' with the main routine and argument "parsing" etc. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-08-31 01:40:25 +00:00
A Makefile 'clean' target is quite standard. Signed-off-by: Cristian Ionescu-Idbohrn <cii@axis.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-27 16:43:53 +00:00
install: $(NAME)
use DESTDIR according to my understanding of GNU standards make DESRDIR a prefix of everything according my understanding of the GNU standards. This is also useful(/needed) for installing in Gentoo. Declare BINDIR for bin/program directory. Signed-off-by: Martin Gysel <me@bearsh.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-10-17 13:53:59 +00:00
$(INSTALL) -d -m 755 $(BINDIR)
$(INSTALL) $(NAME) $(BINDIR)
Have "make install" act more as expected for a desktop application I'm trying to get subsurface to get closer to becoming a "regular desktop application"; so far this is based on the recommendations and guidelines on OpenSUSE and Fedora. The icon is now named subsurface.svg and make install installs it in the correct location. At runtime subsurface first checks if an icon is installed and if it is it uses that - otherwise it falls back to the old code that tries to read the svg file from the current directory. We also install a subsurface.desktop file Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-11 22:58:38 +00:00
$(INSTALL) -d -m 755 $(DESKTOPDIR)
$(INSTALL) $(DESKTOPFILE) $(DESKTOPDIR)
$(INSTALL) -d -m 755 $(ICONDIR)
$(INSTALL) $(ICONFILE) $(ICONDIR)
Don't run gtk-update-icon-cache if DESTDIR is set We don't want to run gtk-update-icon-cache during a package build, when we're installing into a staging directory just to create a tree that will be packaged up and really installed later. The standard heuristic seems to be to skip gtk-update-icon-cache if DESTDIR is set (ie we're installing to a different location than we're configured to run from). Signed-off-by: Roland Dreier <roland@digitalvampire.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-10-31 20:05:55 +00:00
@-if test -z "$(DESTDIR)"; then \
$(gtk_update_icon_cache); \
fi
Makefile fixes The stupid lib vs lib64 problem. I'm sure there's a more portable way to handle this, but this at least seems to work. Also fix the install target. Seriously, you create a directory with mode 644 and claim that this ever worked? Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-24 11:12:44 +00:00
$(INSTALL) -d -m 755 $(MANDIR)
$(INSTALL) -m 644 $(MANFILES) $(MANDIR)
Use XSLT file to open JDiveLog logs Open JDiveLog files by translating them to subsurface format using XSLT. These files are identified by the name of the first element (JDiveLog) and transform is applied to only these. The XSLT feature is compiled in only if libxslt is installed. The transformation files are installed globally in Linux under /usr/share/subsurface/xslt. Windows and OSX still need appropriate Makefile changes and testing. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-05 10:39:17 +00:00
@-if test ! -z "$(XSLT)"; then \
$(INSTALL) -d -m 755 $(DATADIR)/subsurface; \
$(INSTALL) -d -m 755 $(XSLTDIR); \
$(INSTALL) -m 644 $(XSLTFILES) $(XSLTDIR); \
fi
Install all .mo files on all targets Linux didn't have a locale install target, and Windows didn't install aliased locale files. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 06:46:59 +00:00
for LOC in $(wildcard share/locale/*/LC_MESSAGES); do \
$(INSTALL) -d -m 755 $(prefix)/$$LOC; \
$(INSTALL) $$LOC/subsurface.mo $(prefix)/$$LOC/subsurface.mo; \
done
Add cheesy "install" target It just puts the subsurface binary in $(HOME)/bin. .. and then the binary won't find the icon file, so this is really not enough of an install to get it really working, but whatever. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-23 03:59:10 +00:00
Add basic MacOSX app bundle install target Native MacOSX app bundles are installed in /Applications. We want a separate install target for this, since some would probably prefer the regular unixy way. Signed-Off-By: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
2011-10-16 21:16:36 +00:00
install-macosx: $(NAME)
$(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources
$(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/MacOS
Finally a fully working Mac dmg The Makefile change simply gets us the same setup with make install-macosx that we are getting from the gtk-mac-bundler - with the launcher script and subsurface installed as subsurface-bin. The changes in the README are what make the difference for getting a working dmg - there are a bunch of .so files that are part of gtk that didn't have their dependency load paths updated - and those made the application either crash or at least not display its own icon correctly. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 04:06:35 +00:00
$(INSTALL) $(NAME) $(MACOSXINSTALL)/Contents/MacOS/$(NAME)-bin
$(INSTALL) $(MACOSXFILES)/$(NAME).sh $(MACOSXINSTALL)/Contents/MacOS/$(NAME)
Use the new packaging directory for MacOSX specific files, and provide shell script workaround to make the svg icon reachable. - Make use of the new packaging directory. - Set a current directory for subsurface to find the svg icon. There might be a pretter solution to this. - Somehow subsurface doesn't behave properly in the Dock. Running it in the background without Dock integration until we figure out why. Signed-Off-By: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
2011-10-30 21:27:33 +00:00
$(INSTALL) $(MACOSXFILES)/PkgInfo $(MACOSXINSTALL)/Contents/
$(INSTALL) $(MACOSXFILES)/Info.plist $(MACOSXINSTALL)/Contents/
$(INSTALL) $(ICONFILE) $(MACOSXINSTALL)/Contents/Resources/
$(INSTALL) $(MACOSXFILES)/Subsurface.icns $(MACOSXINSTALL)/Contents/Resources/
Redoing the Mac bundling With the right tools in place you can now create a bundle from the Makefile by calling "make create-macos-bundle" In the process of this I also moved the locale directory where we stage our .mo files to share/locale (which is much more logical). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 04:24:02 +00:00
for LOC in $(wildcard share/locale/*/LC_MESSAGES); do \
$(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources/$$LOC; \
$(INSTALL) $$LOC/subsurface.mo $(MACOSXINSTALL)/Contents/Resources/$$LOC/subsurface.mo; \
Support for gettext in MacOSX application bundle The MacOSX applications bundle needs to be told where to bind the text domain from. Also copy the gettext .mo files in the install-macosx target. [Dirk Hohndel: minor change in main(): move the path declaration to the beginning of the function] Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-15 12:44:01 +00:00
done
Add basic MacOSX app bundle install target Native MacOSX app bundles are installed in /Applications. We want a separate install target for this, since some would probably prefer the regular unixy way. Signed-Off-By: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
2011-10-16 21:16:36 +00:00
Redoing the Mac bundling With the right tools in place you can now create a bundle from the Makefile by calling "make create-macos-bundle" In the process of this I also moved the locale directory where we stage our .mo files to share/locale (which is much more logical). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 04:24:02 +00:00
create-macosx-bundle: $(NAME)
$(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources
$(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/MacOS
$(INSTALL) $(NAME) $(MACOSXSTAGING)/Contents/MacOS/
$(INSTALL) $(MACOSXFILES)/PkgInfo $(MACOSXSTAGING)/Contents/
$(INSTALL) $(MACOSXFILES)/Info.plist $(MACOSXSTAGING)/Contents/
$(INSTALL) $(ICONFILE) $(MACOSXSTAGING)/Contents/Resources/
$(INSTALL) $(MACOSXFILES)/Subsurface.icns $(MACOSXSTAGING)/Contents/Resources/
for LOC in $(wildcard share/locale/*/LC_MESSAGES); do \
$(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources/$$LOC; \
$(INSTALL) $$LOC/subsurface.mo $(MACOSXSTAGING)/Contents/Resources/$$LOC/subsurface.mo; \
done
Fix typo and make variable name more logical [the macos/macosx typo was also found and a patch submitted by Henrik Brautaset Aronsen <subsurface@henrik.synth.no>] Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 06:55:35 +00:00
$(GTK_MAC_BUNDLER) packaging/macosx/subsurface.bundle
Redoing the Mac bundling With the right tools in place you can now create a bundle from the Makefile by calling "make create-macos-bundle" In the process of this I also moved the locale directory where we stage our .mo files to share/locale (which is much more logical). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 04:24:02 +00:00
Improved packaging for Windows This commit adds an install-cross-windows target to the Makefile that creates a staging directory for us under packaging/windows that contains the required .mo files. This currently fails for the Norwegian translation because of the no_NO.UTF-8 vs nb issue - right now we just use the first component of our own localization filename to find the matching Windows localization and that fails. The subsurface.nsi file is updated accordingly and this now appears to create working installers with sane paths for the localization files. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 11:04:37 +00:00
install-cross-windows: $(NAME)
$(INSTALL) -d -m 755 $(WINDOWSSTAGING)/share/locale
for MSG in $(WINMSGDIRS); do\
Redoing the Mac bundling With the right tools in place you can now create a bundle from the Makefile by calling "make create-macos-bundle" In the process of this I also moved the locale directory where we stage our .mo files to share/locale (which is much more logical). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 04:24:02 +00:00
$(INSTALL) -d -m 755 $(WINDOWSSTAGING)/$$MSG;\
Fix typo and make variable name more logical [the macos/macosx typo was also found and a patch submitted by Henrik Brautaset Aronsen <subsurface@henrik.synth.no>] Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 06:55:35 +00:00
$(INSTALL) $(CROSS_PATH)/$$MSG/* $(WINDOWSSTAGING)/$$MSG;\
Improved packaging for Windows This commit adds an install-cross-windows target to the Makefile that creates a staging directory for us under packaging/windows that contains the required .mo files. This currently fails for the Norwegian translation because of the no_NO.UTF-8 vs nb issue - right now we just use the first component of our own localization filename to find the matching Windows localization and that fails. The subsurface.nsi file is updated accordingly and this now appears to create working installers with sane paths for the localization files. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 11:04:37 +00:00
done
Install all .mo files on all targets Linux didn't have a locale install target, and Windows didn't install aliased locale files. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 06:46:59 +00:00
for LOC in $(wildcard share/locale/*/LC_MESSAGES); do \
$(INSTALL) -d -m 755 $(WINDOWSSTAGING)/$$LOC; \
$(INSTALL) $$LOC/subsurface.mo $(WINDOWSSTAGING)/$$LOC/subsurface.mo; \
Improved packaging for Windows This commit adds an install-cross-windows target to the Makefile that creates a staging directory for us under packaging/windows that contains the required .mo files. This currently fails for the Norwegian translation because of the no_NO.UTF-8 vs nb issue - right now we just use the first component of our own localization filename to find the matching Windows localization and that fails. The subsurface.nsi file is updated accordingly and this now appears to create working installers with sane paths for the localization files. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 11:04:37 +00:00
done
Add Makefile target to update po files This is a bit of a hack to make my life easier. make update-po-files will extract the translation strings and merge them with the existing translations - for all existing translations. For good measure this commit includes the latest update of the po files (but no new translations should be needed). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-18 21:53:27 +00:00
update-po-files:
Add temporary locate files to the "clean" target. The update-po-files target creates backup files. Let's add them to the "clean" target. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-19 07:50:14 +00:00
xgettext -o po/subsurface-new.pot -s -k_ -kN_ --keyword=C_:1c,2 --add-comments="++GETTEXT" *.c
Add Makefile target to update po files This is a bit of a hack to make my life easier. make update-po-files will extract the translation strings and merge them with the existing translations - for all existing translations. For good measure this commit includes the latest update of the po files (but no new translations should be needed). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-18 21:53:27 +00:00
for i in po/*.po; do \
Add temporary locate files to the "clean" target. The update-po-files target creates backup files. Let's add them to the "clean" target. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-19 07:50:14 +00:00
msgmerge -s -U $$i po/subsurface-new.pot ; \
Add Makefile target to update po files This is a bit of a hack to make my life easier. make update-po-files will extract the translation strings and merge them with the existing translations - for all existing translations. For good measure this commit includes the latest update of the po files (but no new translations should be needed). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-18 21:53:27 +00:00
done
Add some initial cochran CAN file parsing It's broken, and currently only writes out a debug output file per dive. I'm not sure I'll ever really be able to decode the mess that is the Cochran ANalyst stuff, but I have a few test files, along with separate depth info from a couple of the dives in question, so in case this ever works I can at least validate it to some degree. The file format is definitely very intentionally obscured, though. Annoying. It's not like the Cochran software is actually all that good (it's really quite a horribly nasty Windows-only app, I'm told). Cochran Analyst is very much not the reason why people would buy those computers. So Cochran making their computers harder to use with other software is just stupid. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-01-27 20:43:40 +00:00
file.o: file.c dive.h file.h
Add "native" Suunto SDE zip file reading You need to have libzip-devel installed, and pkg-config needs to know about it for the build to pick up on it. On at least Fedora, a simple "yum install libzip-devel" will make things work, although you may need to force a rebuild of subsurface too (the "file.o" file in particular - the Makefile doesn't track system dependencies). Then, you can just do subsurface my-dives.SDE to read the data directly from the SDE file. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-01-27 01:43:33 +00:00
$(CC) $(CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) $(XSLT) $(ZIP) -c file.c
Split up file reading from 'parse-xml.c' into 'file.c' We're going to eventually import non-xml files too, so let's begin splitting the logic up. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-01-26 21:00:45 +00:00
Add some initial cochran CAN file parsing It's broken, and currently only writes out a debug output file per dive. I'm not sure I'll ever really be able to decode the mess that is the Cochran ANalyst stuff, but I have a few test files, along with separate depth info from a couple of the dives in question, so in case this ever works I can at least validate it to some degree. The file format is definitely very intentionally obscured, though. Annoying. It's not like the Cochran software is actually all that good (it's really quite a horribly nasty Windows-only app, I'm told). Cochran Analyst is very much not the reason why people would buy those computers. So Cochran making their computers harder to use with other software is just stupid. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-01-27 20:43:40 +00:00
cochran.o: cochran.c dive.h file.h
$(CC) $(CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) $(XSLT) $(ZIP) -c cochran.c
Rename some files to be more appropriate The executable is now called 'divelog'. If this gets useful enough to actually *use*, I guess I'll have to come up with a real name some day. Add a silly README, rename 'parse' to 'parse-xml'. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 17:09:53 +00:00
parse-xml.o: parse-xml.c dive.h
Fix the Makefile '-c' location, add XML2CFLAGS I was getting the following error: dive.h:8:25: fatal error: libxml/tree.h: No such file or directory compilation terminated. So I updated the Makefile to fix that error and follow the standard in the file. Signed-off-by: Terrance Stanfield <t@hollowcranium.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-19 17:28:31 +00:00
$(CC) $(CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) $(XSLT) -c parse-xml.c
Start moving some of the non-parsing stuff out of 'parse.c' Create a 'main.c' with the main routine and argument "parsing" etc. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-08-31 01:40:25 +00:00
Move device_info handling into a new 'device.c' file The legacy nickname wrappers (that use the device_info structure) are left in gtk-gui.c. We can slowly start moving away from them, we don't want to start exporting that thing as some kind of generic interface. This isn't a pure code movement - because we leave the legacy interfaces alone, there are a few new interfaces in device.c (like "create a new device_info entry") that were embedded into the legacy "create nickname" code, and needed to be abstracted out. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-09 20:07:09 +00:00
save-xml.o: save-xml.c dive.h device.h
Fix the Makefile '-c' location, add XML2CFLAGS I was getting the following error: dive.h:8:25: fatal error: libxml/tree.h: No such file or directory compilation terminated. So I updated the Makefile to fix that error and follow the standard in the file. Signed-off-by: Terrance Stanfield <t@hollowcranium.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-19 17:28:31 +00:00
$(CC) $(CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c save-xml.c
Add ability to 'save' dives This just generates another xml file. Don't get me wrong: I still don't like xml, but this way we can save in the same format we load things from. Except the save-format is a *lot* cleaner than the abortion that is Suunto or libdivecomputer xml. Don't bother with some crazy xml library crap for saving. Just do it! Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-01 23:27:52 +00:00
Add various dive fixups, and show pressure (if any) in the plot Now the dive profile plot *really* needs some units. The pressure is just a random line otherwise. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-03 20:19:26 +00:00
dive.o: dive.c dive.h
Fix the Makefile '-c' location, add XML2CFLAGS I was getting the following error: dive.h:8:25: fatal error: libxml/tree.h: No such file or directory compilation terminated. So I updated the Makefile to fix that error and follow the standard in the file. Signed-off-by: Terrance Stanfield <t@hollowcranium.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-19 17:28:31 +00:00
$(CC) $(CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c dive.c
Add various dive fixups, and show pressure (if any) in the plot Now the dive profile plot *really* needs some units. The pressure is just a random line otherwise. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-03 20:19:26 +00:00
Use a 64-bit 'timestamp_t' for all timestamps, rather than 'time_t' This makes the time type unambiguous, and we can use G_TYPE_INT64 for it in the divelist too. It also implements a portable (and thread-safe) "utc_mkdate()" function that acts kind of like gmtime_r(), but using the 64-bit timestamp_t. It matches our original "utc_mktime()". Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-09-20 00:35:52 +00:00
time.o: time.c dive.h
$(CC) $(CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c time.c
Open File works. I refactored the code and introduced a new type. I never used it as a pointer (their was no real reason), but I'm not really satisfied. Signed-off-by: Nathan Samson <nathansamson@gmail.com>
2011-09-05 19:12:58 +00:00
main.o: main.c dive.h display.h divelist.h
Fix the Makefile '-c' location, add XML2CFLAGS I was getting the following error: dive.h:8:25: fatal error: libxml/tree.h: No such file or directory compilation terminated. So I updated the Makefile to fix that error and follow the standard in the file. Signed-off-by: Terrance Stanfield <t@hollowcranium.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-19 17:28:31 +00:00
$(CC) $(CFLAGS) $(GLIB2CFLAGS) $(GCONF2CFLAGS) $(XML2CFLAGS) -c main.c
Split up profile frame generation into its own file. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-08-31 17:20:46 +00:00
Open File works. I refactored the code and introduced a new type. I never used it as a pointer (their was no real reason), but I'm not really satisfied. Signed-off-by: Nathan Samson <nathansamson@gmail.com>
2011-09-05 19:12:58 +00:00
profile.o: profile.c dive.h display.h divelist.h
Fix the Makefile '-c' location, add XML2CFLAGS I was getting the following error: dive.h:8:25: fatal error: libxml/tree.h: No such file or directory compilation terminated. So I updated the Makefile to fix that error and follow the standard in the file. Signed-off-by: Terrance Stanfield <t@hollowcranium.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-19 17:28:31 +00:00
$(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c profile.c
Split up divelist scroll window generation into its own file Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-08-31 17:27:58 +00:00
Separate out the UI from the program logic The following are UI toolkit specific: gtk-gui.c - overall layout, main window of the UI divelist.c - list of dives subsurface maintains equipment.c - equipment / tank information for each dive info.c - detailed dive info print.c - printing The rest is independent of the UI: main.c i - program frame dive.c i - creates and maintaines the internal dive list structure libdivecomputer.c uemis.c parse-xml.c save-xml.c - interface with dive computers and the XML files profile.c - creates the data for the profile and draws it using cairo This commit should contain NO functional changes, just moving code around and a couple of minor abstractions. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-09-20 19:40:34 +00:00
info.o: info.c dive.h display.h display-gtk.h divelist.h
Fix the Makefile '-c' location, add XML2CFLAGS I was getting the following error: dive.h:8:25: fatal error: libxml/tree.h: No such file or directory compilation terminated. So I updated the Makefile to fix that error and follow the standard in the file. Signed-off-by: Terrance Stanfield <t@hollowcranium.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-19 17:28:31 +00:00
$(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c info.c
Add fake 'info' frame contents It should have depth, time, place etc information, but right now it only has a fake depth that doesn't even get updated. Just to show the idea of the table usage. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-08-31 19:09:19 +00:00
Rename 'cylinder.c' as 'equipment.c' Make it about general equipment management, and start hooking up functions to show new equipment information when changing dives (and to flush changes to equipment information for the previously active dive). Nothing is hooked up yet, and it's now showing just one (really big) cylinder choice, so this is all broken. But it should make it possible to at least get somewhere some day. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-10 00:10:17 +00:00
equipment.o: equipment.c dive.h display.h divelist.h
Fix the Makefile '-c' location, add XML2CFLAGS I was getting the following error: dive.h:8:25: fatal error: libxml/tree.h: No such file or directory compilation terminated. So I updated the Makefile to fix that error and follow the standard in the file. Signed-off-by: Terrance Stanfield <t@hollowcranium.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-19 17:28:31 +00:00
$(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c equipment.c
Add a notebook for cylinder information Ok, so it's not connected to anything yet, and the tank choices (that don't do anything) are some random hardcoded collection, but maybe it will do something some day. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-09 15:38:48 +00:00
Add Info & Stats page to the notebook This provides the relevant information for the currently selected dive plus a bunch of statistics over all dives in the dive_table. The visual design has lots of room for improvement - right now the different fields change size - it might be nice to have a more modern look for the entries - the O2/He field is odd - for most divers the He value will always be 0, so maybe we should only show He if there's at least one dive that uses He? Also, we simply do a comma separated list of gases for all the tanks used Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-11-02 16:10:57 +00:00
statistics.o: statistics.c dive.h display.h divelist.h
Fix the Makefile '-c' location, add XML2CFLAGS I was getting the following error: dive.h:8:25: fatal error: libxml/tree.h: No such file or directory compilation terminated. So I updated the Makefile to fix that error and follow the standard in the file. Signed-off-by: Terrance Stanfield <t@hollowcranium.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-19 17:28:31 +00:00
$(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c statistics.c
Add Info & Stats page to the notebook This provides the relevant information for the currently selected dive plus a bunch of statistics over all dives in the dive_table. The visual design has lots of room for improvement - right now the different fields change size - it might be nice to have a more modern look for the entries - the O2/He field is odd - for most divers the He value will always be 0, so maybe we should only show He if there's at least one dive that uses He? Also, we simply do a comma separated list of gases for all the tanks used Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-11-02 16:10:57 +00:00
Open File works. I refactored the code and introduced a new type. I never used it as a pointer (their was no real reason), but I'm not really satisfied. Signed-off-by: Nathan Samson <nathansamson@gmail.com>
2011-09-05 19:12:58 +00:00
divelist.o: divelist.c dive.h display.h divelist.h
Fix the Makefile '-c' location, add XML2CFLAGS I was getting the following error: dive.h:8:25: fatal error: libxml/tree.h: No such file or directory compilation terminated. So I updated the Makefile to fix that error and follow the standard in the file. Signed-off-by: Terrance Stanfield <t@hollowcranium.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-19 17:28:31 +00:00
$(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c divelist.c
Start some very initial libdivecomputer integration Ok, so this is quite broken right now: it doesn't actually really *do* anything, and it now requires that you have libdivecomputer all set up and installed. That is fairly easy: mkdir ../src cd ../src git clone git://libdivecomputer.git.sourceforge.net/gitroot/libdivecomputer/libdivecomputer cd libdivecomputer autoreconf --install ./configure make sudo make install but you may feel that this is not exactly useful considering that nothing actually *works* yet. Some day. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-12 16:19:21 +00:00
Separate out the UI from the program logic The following are UI toolkit specific: gtk-gui.c - overall layout, main window of the UI divelist.c - list of dives subsurface maintains equipment.c - equipment / tank information for each dive info.c - detailed dive info print.c - printing The rest is independent of the UI: main.c i - program frame dive.c i - creates and maintaines the internal dive list structure libdivecomputer.c uemis.c parse-xml.c save-xml.c - interface with dive computers and the XML files profile.c - creates the data for the profile and draws it using cairo This commit should contain NO functional changes, just moving code around and a couple of minor abstractions. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-09-20 19:40:34 +00:00
print.o: print.c dive.h display.h display-gtk.h
Fix the Makefile '-c' location, add XML2CFLAGS I was getting the following error: dive.h:8:25: fatal error: libxml/tree.h: No such file or directory compilation terminated. So I updated the Makefile to fix that error and follow the standard in the file. Signed-off-by: Terrance Stanfield <t@hollowcranium.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-19 17:28:31 +00:00
$(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c print.c
Add the capability to print a dive profile Ok, this is the ugliest f*&$ing printout I have ever seen in my life, but think of it as a "the concept of printing works" commit, and you'll be able to hold your lunch down and not gouge out your eyeballs with a spoon. Maybe. I'm just doing the cairo display as-is for the printout, which is a seriously bad idea. I need to not try to do colors etc, and instead of having white lines on a black background I just need to make thelines be black on white paper. But that would involve actually changing the current "plot()" routine, which is against the point of the exercise right now. This really is just a demonstration of how to add printing capabilities. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-13 23:02:42 +00:00
First stab at deco calculations This seems to give us roughly the right data but needs a lot more testing. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-03 05:21:36 +00:00
deco.o: deco.c dive.h
$(CC) $(CFLAGS) $(GLIB2CFLAGS) -c deco.c
Move planner UI into planner.c There should be NO other changes in this commit - just moving the code and adjusting the includes (and adding the entry point to display-gtk.h). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-07 19:23:14 +00:00
planner.o: planner.c dive.h divelist.h display-gtk.h
$(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) -c planner.c
First stab at simplistic dive planning This comes with absolutely no gui - so the plan literally needs to be compiled into Subsurface. Not exactly a feature, but this allowed me to focus on the planning part instead of spending time on tedious UI work. A new menu "Planner" with entry "Test Planner" calls into the hard-coded function in planner.c. There a simple dive plan can be constructed with calls to plan_add_segment(&diveplan, duration, depth at the end, fO2, pO2) Calling plan(&diveplan) does the deco calculations and creates deco stops that keep us below the ceiling (with the GFlow/high values currently configured). The stop levels used are defined at the top of planner.c in the stoplevels array - there is no need to do the traditional multiples of 3m or anything like that. The dive including the ascents and deco stops all the way to the surface is completed and then added as simulated dive to the end of the divelist (I guess we could automatically select it later) and can be viewed. This is crude but shows the direction we can go with this. Envision a nice UI that allows you to simply enter the segments and pick the desired stops. What is missing is the ability to give the algorithm additional gases that it can use during the deco phase - right now it simply keeps using the last gas used in the diveplan. All that said, there are clear bugs here - and sadly they seem to be in the deco calculations, as with the example given the ceiling that is calculated makes no sense. When displayed in smooth mode it has very strange jumps up and down that I wouldn't expect. For example with GF 35/75 (the default) the deco ceiling when looking at the simulated dive jumps from 16m back up to 13m around 14:10 into the dive. That seems very odd. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-05 07:11:42 +00:00
Move device_info handling into a new 'device.c' file The legacy nickname wrappers (that use the device_info structure) are left in gtk-gui.c. We can slowly start moving away from them, we don't want to start exporting that thing as some kind of generic interface. This isn't a pure code movement - because we leave the legacy interfaces alone, there are a few new interfaces in device.c (like "create a new device_info entry") that were embedded into the legacy "create nickname" code, and needed to be abstracted out. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-09 20:07:09 +00:00
libdivecomputer.o: libdivecomputer.c dive.h display.h display-gtk.h libdivecomputer.h device.h
Fix the Makefile '-c' location, add XML2CFLAGS I was getting the following error: dive.h:8:25: fatal error: libxml/tree.h: No such file or directory compilation terminated. So I updated the Makefile to fix that error and follow the standard in the file. Signed-off-by: Terrance Stanfield <t@hollowcranium.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-19 17:28:31 +00:00
$(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) \
declare a var for libdivecomputer's cflags This allows us the specifiy libdivecomputer's cflags (and also the library, static or dynamic) outside of the Makefile Signed-off-by: Martin Gysel <me@bearsh.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-10-17 13:54:01 +00:00
$(LIBDIVECOMPUTERCFLAGS) \
Start some very initial libdivecomputer integration Ok, so this is quite broken right now: it doesn't actually really *do* anything, and it now requires that you have libdivecomputer all set up and installed. That is fairly easy: mkdir ../src cd ../src git clone git://libdivecomputer.git.sourceforge.net/gitroot/libdivecomputer/libdivecomputer cd libdivecomputer autoreconf --install ./configure make sudo make install but you may feel that this is not exactly useful considering that nothing actually *works* yet. Some day. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-12 16:19:21 +00:00
-c libdivecomputer.c
First pass to parse uemis Zurich '.SDA' files This is missing a ton of the information in the .SDA files It only parses the divelog.SDA file, not the dive.SDA file It ignores the information on the gas(es) used and all the data on the tanks. It still draws some strange artefacts at the end of the dive But it correctly hooks into the import dialogue, it gives you a file select box (somewhere, I'm sure, a gtk developer cries quietly) and then parses enough of this file to serve as a proof of concept. Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-15 04:00:49 +00:00
Move device_info handling into a new 'device.c' file The legacy nickname wrappers (that use the device_info structure) are left in gtk-gui.c. We can slowly start moving away from them, we don't want to start exporting that thing as some kind of generic interface. This isn't a pure code movement - because we leave the legacy interfaces alone, there are a few new interfaces in device.c (like "create a new device_info entry") that were embedded into the legacy "create nickname" code, and needed to be abstracted out. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-09 20:07:09 +00:00
gtk-gui.o: gtk-gui.c dive.h display.h divelist.h display-gtk.h libdivecomputer.h device.h Makefile
Fix the Makefile '-c' location, add XML2CFLAGS I was getting the following error: dive.h:8:25: fatal error: libxml/tree.h: No such file or directory compilation terminated. So I updated the Makefile to fix that error and follow the standard in the file. Signed-off-by: Terrance Stanfield <t@hollowcranium.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-19 17:28:31 +00:00
$(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(GCONF2CFLAGS) $(XML2CFLAGS) \
declare a var for libdivecomputer's cflags This allows us the specifiy libdivecomputer's cflags (and also the library, static or dynamic) outside of the Makefile Signed-off-by: Martin Gysel <me@bearsh.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-10-17 13:54:01 +00:00
$(LIBDIVECOMPUTERCFLAGS) \
Add the version to the Makefile Not quite the same format as for the kernel, but I want to do the normal "edit the makefile before making a release" model that I'm used to. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-26 18:04:50 +00:00
-DVERSION_STRING='"v$(VERSION)"' \
Separate out the UI from the program logic The following are UI toolkit specific: gtk-gui.c - overall layout, main window of the UI divelist.c - list of dives subsurface maintains equipment.c - equipment / tank information for each dive info.c - detailed dive info print.c - printing The rest is independent of the UI: main.c i - program frame dive.c i - creates and maintaines the internal dive list structure libdivecomputer.c uemis.c parse-xml.c save-xml.c - interface with dive computers and the XML files profile.c - creates the data for the profile and draws it using cairo This commit should contain NO functional changes, just moving code around and a couple of minor abstractions. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-09-20 19:40:34 +00:00
-c gtk-gui.c
Fix the Makefile '-c' location, add XML2CFLAGS I was getting the following error: dive.h:8:25: fatal error: libxml/tree.h: No such file or directory compilation terminated. So I updated the Makefile to fix that error and follow the standard in the file. Signed-off-by: Terrance Stanfield <t@hollowcranium.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-19 17:28:31 +00:00
uemis.o: uemis.c dive.h uemis.h
Create the correct ceiling events for Uemis Zurich The hold_depth field is rather misleading as it normally gives the safety stop depth and only when the p_amb_tol goes "below the surface" does it switch to showing the first deco stop depth. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-10 08:28:02 +00:00
$(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) $(LIBDIVECOMPUTERCFLAGS) -c uemis.c
A Makefile 'clean' target is quite standard. Signed-off-by: Cristian Ionescu-Idbohrn <cii@axis.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-27 16:43:53 +00:00
First implementation of native Uemis downloader This includes one major hack that uses a private data structure from libdivecomputer to allow us to show the Uemis Zurich as one computer the user can import from. Once the user has chosen the Uemis we don't use libdivecomputer but our own downloader. Just like in the libdicecomputer case this runs in its own thread and updates the import dialog with progress information. The code also keeps track of the last dive that has been downloaded from a Uemis computer so we only import new dives on subsequent downloads. And since the Uemis Zurich gives us its device id, we make this a "per divecomputer" property for people who dive with multiple Uemis Zurich computers. This uses the debugfile infrastructure to allow easily collecting debugging output - especially on Windows where by default console output is lost. Known limitations: when the Uemis runs out of space (it uses its filesystem for communication with the host computer) we have no graceful way to reset things. This is why the code doesn't try to download ALL dives on the computer but instead download them in increments of ten dives. This clearly needs to be addressed once I understand how to reset the device. The Cancel button of the import dialog isn't correctly hooked up, yet. I still need to figure out how to gracefully shut down a download without potentially hanging the device. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-09-25 14:28:47 +00:00
uemis-downloader.o: uemis-downloader.c dive.h uemis.h
$(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c uemis-downloader.c
Move device_info handling into a new 'device.c' file The legacy nickname wrappers (that use the device_info structure) are left in gtk-gui.c. We can slowly start moving away from them, we don't want to start exporting that thing as some kind of generic interface. This isn't a pure code movement - because we leave the legacy interfaces alone, there are a few new interfaces in device.c (like "create a new device_info entry") that were embedded into the legacy "create nickname" code, and needed to be abstracted out. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-09 20:07:09 +00:00
device.o: device.c device.h dive.h
$(CC) $(CFLAGS) $(GLIB2CFLAGS) -c device.c
Split reading/writing preferences into OS specific files This adds tested code for Linux and Mac OS, implementing the api that Linus suggested. The Windows code was moved into its own file, but hasn't even been compile tested, yet. In order to have just one interface to set or get a preference value we encode TRUE as (void *) 1 and FALSE as NULL. This works consistently on all platforms and regardless of whether we have 32 or 64 bit. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-11-24 06:56:57 +00:00
$(OSSUPPORT).o: $(OSSUPPORT).c display-gtk.h
$(CC) $(CFLAGS) $(OSSUPPORT_CFLAGS) -c $(OSSUPPORT).c
Yet more changes to create localized builds for Mac It turns out that we need aliases for all the languages. And more fiddling when creating the dmg. And a specialized MacPorts build with the install path as prefix. What this basically means is that our app will be correctly localized iff run as /Applications/Subsurface.app Otherwise the gtk default texts (on buttons for example) may or may not be translated. One remaining issue is that apparently Gtk's Mac integration triggers on the untranslated name Help the Menu tree in order to work. Yet we can't easily tell the app not to translate that word as the translations are done internally in gtk - we'd basicall have to build special subsurface.mo files for Mac that don't contain a translation of the word "Help" for this to work. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-19 19:53:08 +00:00
share/locale/%.UTF-8/LC_MESSAGES/subsurface.mo: po/%.po po/%.aliases
Better gettext build My previous take at adding gettext to the Makefile wasn't very good, since it always relinked the subsurface executable. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-12 08:05:41 +00:00
mkdir -p $(dir $@)
msgfmt -c -o $@ po/$*.po
Adjust locale path for install-macosx target gtk-mac-bundler uses Contents/Resources/share/locale, and the install-macosx target should do the same. Also quiet down the make process a bit Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 19:21:11 +00:00
@-if test -s po/$*.aliases; then \
Support for language aliases. Some languages have identifiers that gettext can't determine automatically in all OS'es. An example is Norwegian (no_NO, deprecated) with its Bokmål (nb_NO) and Nynorsk (nn_NO) form. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 13:09:34 +00:00
for ALIAS in `cat po/$*.aliases`; do \
Redoing the Mac bundling With the right tools in place you can now create a bundle from the Makefile by calling "make create-macos-bundle" In the process of this I also moved the locale directory where we stage our .mo files to share/locale (which is much more logical). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 04:24:02 +00:00
mkdir -p share/locale/$$ALIAS/LC_MESSAGES; \
cp $@ share/locale/$$ALIAS/LC_MESSAGES; \
Support for language aliases. Some languages have identifiers that gettext can't determine automatically in all OS'es. An example is Norwegian (no_NO, deprecated) with its Bokmål (nb_NO) and Nynorsk (nn_NO) form. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 13:09:34 +00:00
done; \
fi
Basic gettext support when building Added basic support for building gettext locales in the Makefile. The po file name should match the target locale. [Dirk Hohndel: Used git mv to rename the German .po file] Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-11 10:06:56 +00:00
First try at converting user-manual to AsciiDoc You can do "make doc" in the main directory to create the html version, and if you want to play around with it, do "make show" in the Documentation subdirectory to start firefox on the end result. It's by no means perfect, but it gives somewhat reasonable results, and this is enough initial work for people to play around with, I think. NOTE! You need "asciidoc" installed to do this: it's a python program, so it should be pretty easy even on non-Linux platforms. And on Linux, most distributions package it, so you just have to do something like yum install asciidoc to get it (replace with apt-get/zypper/whatever). Asciidoc can generate other output too (man-pages, LaTeX, etc), maybe people want to play with that part too. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-01-01 23:12:28 +00:00
doc:
$(MAKE) -C Documentation doc
A Makefile 'clean' target is quite standard. Signed-off-by: Cristian Ionescu-Idbohrn <cii@axis.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-27 16:43:53 +00:00
clean:
Add temporary locate files to the "clean" target. The update-po-files target creates backup files. Let's add them to the "clean" target. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-19 07:50:14 +00:00
rm -f $(OBJS) *~ $(NAME) $(NAME).exe po/*~ po/subsurface-new.pot
Redoing the Mac bundling With the right tools in place you can now create a bundle from the Makefile by calling "make create-macos-bundle" In the process of this I also moved the locale directory where we stage our .mo files to share/locale (which is much more logical). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 04:24:02 +00:00
rm -rf share
Reference in a new issue Copy permalink