[PATCH] Add XSLT support for the macosx install and bundle targets

subsurface at henrik.synth.no subsurface at henrik.synth.no
Sat Feb 9 01:36:02 PST 2013


From: Henrik Brautaset Aronsen <subsurface at henrik.synth.no>

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 <subsurface at henrik.synth.no>
---
 Makefile | 9 +++++++++
 macos.c  | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/Makefile b/Makefile
index 0b96816..fc3e6c4 100644
--- a/Makefile
+++ b/Makefile
@@ -192,6 +192,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
@@ -205,6 +210,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 c1b73c8..2e549f9 100644
--- a/macos.c
+++ b/macos.c
@@ -1,5 +1,6 @@
 /* macos.c */
 /* implements Mac OS X specific functions */
+#include <stdlib.h>
 #include "dive.h"
 #include "display-gtk.h"
 #include <CoreFoundation/CoreFoundation.h>
@@ -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);
 
-- 
1.8.1.2



More information about the subsurface mailing list