From eb7acc1d96a3aa627f1a0e882445e804f5d12d49 Mon Sep 17 00:00:00 2001 From: Henrik Brautaset Aronsen Date: Sat, 9 Feb 2013 10:36:02 +0100 Subject: [PATCH] Add XSLT support for the macosx install and bundle targets Works like it should for the install-macosx target. I haven't tested the create-macosx-bundle target, but it shouldn't be any different. Signed-off-by: Henrik Brautaset Aronsen Signed-off-by: Dirk Hohndel --- Makefile | 9 +++++++++ macos.c | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/Makefile b/Makefile index ba8fdc0f6..ca6041642 100644 --- a/Makefile +++ b/Makefile @@ -190,6 +190,11 @@ install-macosx: $(NAME) $(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources/$$LOC; \ $(INSTALL) $$LOC/subsurface.mo $(MACOSXINSTALL)/Contents/Resources/$$LOC/subsurface.mo; \ done + @-if test ! -z "$(XSLT)"; then \ + $(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources/xslt; \ + $(INSTALL) -m 644 $(XSLTFILES) $(MACOSXINSTALL)/Contents/Resources/xslt/; \ + fi + create-macosx-bundle: $(NAME) $(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources @@ -203,6 +208,10 @@ create-macosx-bundle: $(NAME) $(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources/$$LOC; \ $(INSTALL) $$LOC/subsurface.mo $(MACOSXSTAGING)/Contents/Resources/$$LOC/subsurface.mo; \ done + @-if test ! -z "$(XSLT)"; then \ + $(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources/xslt; \ + $(INSTALL) -m 644 $(XSLTFILES) $(MACOSXSTAGING)/Contents/Resources/xslt/; \ + fi $(GTK_MAC_BUNDLER) packaging/macosx/subsurface.bundle install-cross-windows: $(NAME) diff --git a/macos.c b/macos.c index c1b73c879..2e549f926 100644 --- a/macos.c +++ b/macos.c @@ -1,5 +1,6 @@ /* macos.c */ /* implements Mac OS X specific functions */ +#include #include "dive.h" #include "display-gtk.h" #include @@ -172,6 +173,10 @@ void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar, GtkWidget *vbox, GtkUIManager *ui_manager) { GtkWidget *menu_item, *sep; + static char path[1024]; + + snprintf(path, 1024, "%s/xslt", gtkosx_application_get_resource_path()); + setenv("SUBSURFACE_XSLT_PATH", path, TRUE); g_object_set(G_OBJECT(settings), "gtk-font-name", UI_FONT, NULL);