diff --git a/.cproject b/.cproject index 2d63c2a..fa0c4e8 100644 --- a/.cproject +++ b/.cproject @@ -29,7 +29,7 @@ - @@ -504,7 +504,7 @@ diff --git a/.project b/.project index 73e7fc8..8e0c100 100644 --- a/.project +++ b/.project @@ -5,6 +5,11 @@ + + org.python.pydev.PyDevBuilder + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder clean,full,incremental, @@ -79,5 +84,6 @@ org.eclipse.cdt.core.ccnature org.eclipse.cdt.managedbuilder.core.managedBuildNature org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + org.python.pydev.pythonNature diff --git a/.pydevproject b/.pydevproject new file mode 100644 index 0000000..a9cca03 --- /dev/null +++ b/.pydevproject @@ -0,0 +1,7 @@ + + + + +Default +python 2.7 + diff --git a/apple/GtkRadiant.app/Contents/Info.plist b/apple/GtkRadiant.app/Contents/Info.plist index d346cd0..9f049a4 100644 --- a/apple/GtkRadiant.app/Contents/Info.plist +++ b/apple/GtkRadiant.app/Contents/Info.plist @@ -7,7 +7,7 @@ CFBundleDisplayName GtkRadiant CFBundleExecutable - radiant.bin + radiant CFBundleIconFile radiant.icns CFBundleIdentifier diff --git a/apple/GtkRadiant.app/Contents/MacOS/modules/.turd b/apple/GtkRadiant.app/Contents/MacOS/lib/.turd similarity index 100% rename from apple/GtkRadiant.app/Contents/MacOS/modules/.turd rename to apple/GtkRadiant.app/Contents/MacOS/lib/.turd diff --git a/apple/GtkRadiant.app/Contents/MacOS/radiant b/apple/GtkRadiant.app/Contents/MacOS/radiant new file mode 100755 index 0000000..8ff4de4 --- /dev/null +++ b/apple/GtkRadiant.app/Contents/MacOS/radiant @@ -0,0 +1,23 @@ +#!/bin/bash + +RADIANT_HOME=$(dirname "$0") +RADIANT_HOME=${RADIANT_HOME/GtkRadiant.app*/GtkRadiant.app} + +echo +echo "Starting GtkRadiant in ${RADIANT_HOME}" +echo + +set -x + +GTK_RUNTIME="${RADIANT_HOME}/Contents/Resources/gtk-runtime" + +export GDK_PIXBUF_MODULE_FILE="${GTK_RUNTIME}/etc/gtk-2.0/gdk-pixbuf.loaders" + +export GTK_DATA_PREFIX="${GTK_RUNTIME}" +export GTK_EXE_PREFIX="${GTK_RUNTIME}" +export GTK_PATH="${GTK_RUNTIME}" + +export PANGO_SYSCONFDIR="${GTK_RUNTIME}/etc" +export PANGO_LIBDIR="${GTK_RUNTIME}/lib" + +"${RADIANT_HOME}/Contents/MacOS/radiant.bin" \ No newline at end of file diff --git a/apple/GtkRadiant.app/Contents/lib/.turd b/apple/GtkRadiant.app/Contents/Resources/gtk-runtime/etc/gtk-2.0/gtk.immodules similarity index 100% rename from apple/GtkRadiant.app/Contents/lib/.turd rename to apple/GtkRadiant.app/Contents/Resources/gtk-runtime/etc/gtk-2.0/gtk.immodules diff --git a/apple/GtkRadiant.app/Contents/Resources/gtk-runtime/etc/gtk-2.0/gtkrc b/apple/GtkRadiant.app/Contents/Resources/gtk-runtime/etc/gtk-2.0/gtkrc new file mode 100644 index 0000000..e69de29 diff --git a/apple/GtkRadiant.app/Contents/Resources/gtk-runtime/etc/pango/pangorc b/apple/GtkRadiant.app/Contents/Resources/gtk-runtime/etc/pango/pangorc new file mode 100644 index 0000000..f56d343 --- /dev/null +++ b/apple/GtkRadiant.app/Contents/Resources/gtk-runtime/etc/pango/pangorc @@ -0,0 +1 @@ +[Pango] \ No newline at end of file diff --git a/apple/GtkRadiant.app/Contents/Resources/gtk-runtime/lib/.turd b/apple/GtkRadiant.app/Contents/Resources/gtk-runtime/lib/.turd new file mode 100644 index 0000000..e69de29 diff --git a/apple/GtkRadiant.app/Contents/Resources/gtk-runtime/share/gtk-2.0/icons/.turd b/apple/GtkRadiant.app/Contents/Resources/gtk-runtime/share/gtk-2.0/icons/.turd new file mode 100644 index 0000000..e69de29 diff --git a/apple/GtkRadiant.app/Contents/Resources/gtk-runtime/share/gtk-2.0/themes/.turd b/apple/GtkRadiant.app/Contents/Resources/gtk-runtime/share/gtk-2.0/themes/.turd new file mode 100644 index 0000000..e69de29 diff --git a/apple/Makefile b/apple/Makefile index 7760d79..008d469 100644 --- a/apple/Makefile +++ b/apple/Makefile @@ -3,13 +3,16 @@ INSTALL = ../install TARGET = target GTKRADIANT = $(TARGET)/GtkRadiant.app -LIBRARIES = $(GTKRADIANT)/Contents/lib BINARIES = $(GTKRADIANT)/Contents/MacOS +LIBRARIES = $(GTKRADIANT)/Contents/MacOS/lib RESOURCES = $(GTKRADIANT)/Contents/Resources VERSION = 1.6.4 DMG = $(TARGET)/GtkRadiant-$(VERSION).dmg VOLUME_NAME = "GtkRadiant $(VERSION)" +GTK_RUNTIME = $(RESOURCES)/gtk-runtime +GTK_PREFIX_EXPR = 's:/opt/local:@executable_path/../Resources/gtk-runtime:g' + all: install pre-install: @@ -22,9 +25,10 @@ install: pre-install install $(INSTALL)/q3map2 $(BINARIES)/q3map2 install $(INSTALL)/q3map2_urt $(BINARIES)/q3map2_urt install $(INSTALL)/q3data $(BINARIES)/q3data - install $(INSTALL)/modules/*.so $(BINARIES)/modules - + install $(INSTALL)/bitmaps/*.* $(RESOURCES)/bitmaps + + install $(INSTALL)/modules/*.so $(RESOURCES)/modules install $(INSTALL)/modules/bitmaps/*.* $(RESOURCES)/modules/bitmaps @for i in $(INSTALL)/installs/*; do \ @@ -37,8 +41,39 @@ install: pre-install bundle: dylibbundler -b \ - `find $(BINARIES) -type f | xargs -I {} echo -x {}` \ - -d $(LIBRARIES) -of -p @executable_path/../lib + -x $(BINARIES)/radiant.bin \ + -x $(BINARIES)/q3map2 \ + -x $(BINARIES)/q3map2_urt \ + -x $(BINARIES)/q3data \ + -d $(LIBRARIES) -of -p @executable_path/lib + + # The Radiant plugins (modules) are a little funky + # Some of them are actually linked against the build directory + ln -s ../build ./build + + dylibbundler -b \ + `find $(RESOURCES)/modules -name "*.so" | xargs -I {} echo -x {}` \ + -d $(LIBRARIES) -of -p @executable_path/lib + + rm -f build + +gtk-runtime: + gdk-pixbuf-query-loaders | sed $(GTK_PREFIX_EXPR) > \ + $(GTK_RUNTIME)/etc/gtk-2.0/gdk-pixbuf.loaders + + pango-querymodules | sed $(GTK_PREFIX_EXPR) > \ + $(GTK_RUNTIME)/etc/pango/pango.modules + + cp -r /opt/local/lib/gdk-pixbuf-2.0 $(GTK_RUNTIME)/lib + cp -r /opt/local/lib/pango $(GTK_RUNTIME)/lib + + find $(GTK_RUNTIME)/lib -type f ! -name "*.so" -delete + + dylibbundler -b \ + `find $(GTK_RUNTIME)/lib -name "*.so" | xargs -I {} echo -x {}` \ + -d $(LIBRARIES) -of -p @executable_path/lib + + cp -r /opt/local/share/themes/Default $(GTK_RUNTIME)/share image: ln -f -s /Applications $(TARGET)/Applications