Merge pull request #183 from jdolan/master

Mac packaging

.cproject

@@ -29,7 +29,7 @@
 								</inputType>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.assembler.macosx.exe.debug.1572348978" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.macosx.exe.debug">
-								<option id="gnu.both.asm.option.include.paths.1149695882" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath"/>
+								<option id="gnu.both.asm.option.include.paths.1149695882" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths"/>
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1405583986" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.macosx.base.273649264" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.macosx.base"/>
@@ -504,7 +504,7 @@
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.exe.release.135156334" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.exe.release">
 								<option id="gnu.cpp.compiler.macosx.exe.release.option.optimization.level.818801563" name="Optimization Level" superClass="gnu.cpp.compiler.macosx.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
 								<option id="gnu.cpp.compiler.macosx.exe.release.option.debugging.level.1473482005" name="Debug Level" superClass="gnu.cpp.compiler.macosx.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.option.include.paths.1755333885" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
+								<option id="gnu.cpp.compiler.option.include.paths.1755333885" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="/opt/local/include"/>
 									<listOptionValue builtIn="false" value="/opt/local/include/gtk-2.0"/>
 								</option>

.gitignore

@@ -1,4 +1,9 @@
+/apple/target/*
+/install/games
+/install/installs
+/install/q3data
 /install/q3map2
+/install/q3map2_urt
 /install/radiant.bin
 /.sconsign.dblite
 /site.sconf
@@ -6,3 +11,4 @@
 *.pyc
 *.so
 .settings
+.DS_Store

.project

@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
 			<triggers>clean,full,incremental,</triggers>
@@ -79,5 +84,6 @@
 		<nature>org.eclipse.cdt.core.ccnature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+		<nature>org.python.pydev.pythonNature</nature>
 	</natures>
 </projectDescription>

.pydevproject

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?>
+
+<pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+</pydev_project>

apple/GtkRadiant.app/Contents/Info.plist

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>CFBundleDevelopmentRegion</key>
+        <string>English</string>
+        <key>CFBundleDisplayName</key>
+        <string>GtkRadiant</string>
+        <key>CFBundleExecutable</key>
+        <string>radiant</string>
+        <key>CFBundleIconFile</key>
+        <string>radiant.icns</string>
+        <key>CFBundleIdentifier</key>
+        <string>org.icculus.gtkradiant</string>
+        <key>CFBundleName</key>
+        <string>GtkRadiant</string>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>1.6.4</string>
+        <key>CFBundleSignature</key>
+        <string>????</string>
+        <key>CFBundleVersion</key>
+        <string>1.6.4</string>
+        <key>LSMinimumSystemVersion</key>
+        <string>10.6</string>
+</dict>
+</plist>

apple/GtkRadiant.app/Contents/MacOS/radiant

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+RADIANT_HOME=$(dirname "$0")
+RADIANT_HOME=${RADIANT_HOME/GtkRadiant.app*/GtkRadiant.app}
+
+echo
+echo "Starting GtkRadiant in ${RADIANT_HOME}"
+echo
+
+set -x
+
+resources="${RADIANT_HOME}/Contents/Resources"
+
+export FONTCONFIG_PATH="${resources}/etc/fonts"
+export FC_DEBUG=1024
+
+export GDK_GL_LIBGL_PATH="${resources}/lib/libGL.1.dylib"
+export GDK_GL_LIBGLU_PATH="${resources}/lib/libGLU.1.dylib"
+
+export GDK_PATH="${resources}"
+export GDK_PIXBUF_MODULE_FILE="${resources}/etc/gtk-2.0/gdk-pixbuf.loaders"
+
+export GOBJECT_PATH="${resources}"
+
+export GTK_DATA_PREFIX="${resources}"
+export GTK_EXE_PREFIX="${resources}"
+export GTK_PATH="${resources}"
+
+export PANGO_SYSCONFDIR="${resources}/etc"
+export PANGO_LIBDIR="${resources}/lib"
+
+cd "${resources}/install"
+./radiant.bin &
+
+set +x

apple/GtkRadiant.app/Contents/Resources/etc/fonts/fonts.conf

@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!--
+  Adjusted FontConfig for GtkRadiant.app. Include only paths which Mac users
+  will more than likely have.
+-->
+
+<!--
+  Font directory list
+-->
+	<dir>/usr/X11/lib/X11/fonts</dir>
+	<dir>/Library/Fonts</dir>
+	<dir>/System/Library/Fonts</dir>
+	<dir prefix="xdg">fonts</dir>
+
+<!--
+  Accept deprecated 'mono' alias, replacing it with 'monospace'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>mono</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>monospace</string>
+		</edit>
+	</match>
+
+<!--
+  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans serif</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+<!--
+  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+<!-- Font cache directory list -->
+	<cachedir prefix="xdg">fontconfig</cachedir>
+
+	<config>
+<!--
+  These are the default Unicode chars that are expected to be blank
+  in fonts.  All other blank chars are assumed to be broken and
+  won't appear in the resulting charsets
+ -->
+		<blank>
+			<int>0x0020</int>	<!-- SPACE -->
+			<int>0x00A0</int>	<!-- NO-BREAK SPACE -->
+			<int>0x00AD</int>	<!-- SOFT HYPHEN -->
+			<int>0x034F</int>	<!-- COMBINING GRAPHEME JOINER -->
+			<int>0x0600</int>	<!-- ARABIC NUMBER SIGN -->
+			<int>0x0601</int>	<!-- ARABIC SIGN SANAH -->
+			<int>0x0602</int>	<!-- ARABIC FOOTNOTE MARKER -->
+			<int>0x0603</int>	<!-- ARABIC SIGN SAFHA -->
+			<int>0x06DD</int>	<!-- ARABIC END OF AYAH -->
+			<int>0x070F</int>	<!-- SYRIAC ABBREVIATION MARK -->
+			<int>0x115F</int>	<!-- HANGUL CHOSEONG FILLER -->
+			<int>0x1160</int>	<!-- HANGUL JUNGSEONG FILLER -->
+			<int>0x1680</int>	<!-- OGHAM SPACE MARK -->
+			<int>0x17B4</int>	<!-- KHMER VOWEL INHERENT AQ -->
+			<int>0x17B5</int>	<!-- KHMER VOWEL INHERENT AA -->
+			<int>0x180E</int>	<!-- MONGOLIAN VOWEL SEPARATOR -->
+			<int>0x2000</int>	<!-- EN QUAD -->
+			<int>0x2001</int>	<!-- EM QUAD -->
+			<int>0x2002</int>	<!-- EN SPACE -->
+			<int>0x2003</int>	<!-- EM SPACE -->
+			<int>0x2004</int>	<!-- THREE-PER-EM SPACE -->
+			<int>0x2005</int>	<!-- FOUR-PER-EM SPACE -->
+			<int>0x2006</int>	<!-- SIX-PER-EM SPACE -->
+			<int>0x2007</int>	<!-- FIGURE SPACE -->
+			<int>0x2008</int>	<!-- PUNCTUATION SPACE -->
+			<int>0x2009</int>	<!-- THIN SPACE -->
+			<int>0x200A</int>	<!-- HAIR SPACE -->
+			<int>0x200B</int>	<!-- ZERO WIDTH SPACE -->
+			<int>0x200C</int>	<!-- ZERO WIDTH NON-JOINER -->
+			<int>0x200D</int>	<!-- ZERO WIDTH JOINER -->
+			<int>0x200E</int>	<!-- LEFT-TO-RIGHT MARK -->
+			<int>0x200F</int>	<!-- RIGHT-TO-LEFT MARK -->
+			<int>0x2028</int>	<!-- LINE SEPARATOR -->
+			<int>0x2029</int>	<!-- PARAGRAPH SEPARATOR -->
+			<int>0x202A</int>	<!-- LEFT-TO-RIGHT EMBEDDING -->
+			<int>0x202B</int>	<!-- RIGHT-TO-LEFT EMBEDDING -->
+			<int>0x202C</int>	<!-- POP DIRECTIONAL FORMATTING -->
+			<int>0x202D</int>	<!-- LEFT-TO-RIGHT OVERRIDE -->
+			<int>0x202E</int>	<!-- RIGHT-TO-LEFT OVERRIDE -->
+			<int>0x202F</int>	<!-- NARROW NO-BREAK SPACE -->
+			<int>0x205F</int>	<!-- MEDIUM MATHEMATICAL SPACE -->
+			<int>0x2060</int>	<!-- WORD JOINER -->
+			<int>0x2061</int>	<!-- FUNCTION APPLICATION -->
+			<int>0x2062</int>	<!-- INVISIBLE TIMES -->
+			<int>0x2063</int>	<!-- INVISIBLE SEPARATOR -->
+			<int>0x206A</int>	<!-- INHIBIT SYMMETRIC SWAPPING -->
+			<int>0x206B</int>	<!-- ACTIVATE SYMMETRIC SWAPPING -->
+			<int>0x206C</int>	<!-- INHIBIT ARABIC FORM SHAPING -->
+			<int>0x206D</int>	<!-- ACTIVATE ARABIC FORM SHAPING -->
+			<int>0x206E</int>	<!-- NATIONAL DIGIT SHAPES -->
+			<int>0x206F</int>	<!-- NOMINAL DIGIT SHAPES -->
+			<int>0x2800</int>	<!-- BRAILLE PATTERN BLANK -->
+			<int>0x3000</int>	<!-- IDEOGRAPHIC SPACE -->
+			<int>0x3164</int>	<!-- HANGUL FILLER -->
+			<int>0xFEFF</int>	<!-- ZERO WIDTH NO-BREAK SPACE -->
+			<int>0xFFA0</int>	<!-- HALFWIDTH HANGUL FILLER -->
+			<int>0xFFF9</int>	<!-- INTERLINEAR ANNOTATION ANCHOR -->
+			<int>0xFFFA</int>	<!-- INTERLINEAR ANNOTATION SEPARATOR -->
+			<int>0xFFFB</int>	<!-- INTERLINEAR ANNOTATION TERMINATOR -->
+		</blank>
+<!--
+  Rescan configuration every 30 seconds when FcFontSetList is called
+ -->
+		<rescan>
+			<int>30</int>
+		</rescan>
+	</config>
+
+</fontconfig>
+

apple/GtkRadiant.app/Contents/Resources/etc/pango/pangorc

@@ -0,0 +1 @@
+[Pango]

apple/Makefile

@@ -0,0 +1,77 @@
+# Makefile for GtkRadiant.app, requires http://macdylibbundler.sourceforge.net/
+
+INSTALL = ../install
+TARGET = target
+RESOURCES = $(TARGET)/GtkRadiant.app/Contents/Resources
+CONFDIR = $(RESOURCES)/etc
+DATADIR = $(RESOURCES)/share
+LIBDIR = $(RESOURCES)/lib
+INSTDIR = $(RESOURCES)/install
+PREFIX_SED_EXPR = 's:/opt/local:@executable_path/..:g'
+VERSION = 1.6.4
+DMG = $(TARGET)/GtkRadiant-$(VERSION).dmg
+VOLUME_NAME = "GtkRadiant $(VERSION)"
+
+all: install bundle
+
+-pre-install:
+	install -d $(TARGET)
+	cp -r GtkRadiant.app $(TARGET)
+	find $(TARGET) -name .turd -delete
+	
+-gtk-runtime-gdk-pixbuf-2.0:
+	cp -r /opt/local/lib/gdk-pixbuf-2.0 $(LIBDIR)
+	find $(LIBDIR)/gdk-pixbuf-2.0 -type f ! -name "*.so" -delete
+	
+	gdk-pixbuf-query-loaders | sed $(PREFIX_SED_EXPR) > \
+		$(CONFDIR)/gtk-2.0/gdk-pixbuf.loaders
+
+-gtk-runtime-pango:
+	cp -r /opt/local/lib/pango $(LIBDIR)
+	find $(LIBDIR)/pango -type f ! -name "*.so" -delete
+	
+	pango-querymodules | sed $(PREFIX_SED_EXPR) > \
+		$(CONFDIR)/pango/pango.modules
+	
+-gtk-runtime: -gtk-runtime-gdk-pixbuf-2.0 -gtk-runtime-pango
+	cp -r /opt/local/lib/gtk-2.0 $(LIBDIR)
+	find $(LIBDIR)/gtk-2.0 -type f ! -name "*.so" -delete	
+	
+	rm -rf $(LIBDIR)/gtk-2.0/{includes,modules}
+	rm -rf $(LIBDIR)/gtk-2.0/*/printbackends
+	
+	cp -r /opt/local/share/themes/Default $(RESOURCES)/share
+	
+	gtk-query-immodules-2.0 | sed $(PREFIX_SED_EXPR) > \
+		$(CONFDIR)/gtk-2.0/gtk.immodules
+
+install: -pre-install -gtk-runtime
+	cp -r $(INSTALL) $(RESOURCES)
+	rm -rf `find $(INSTDIR)/installs -type d -name .svn`
+
+bundle:
+
+	# The Radiant plugins (modules) are a little funky
+	# Some of them are actually linked against the build directory
+	
+	ln -s ../build ./build
+	
+	dylibbundler -b \
+		-x $(INSTDIR)/radiant.bin \
+		-x $(INSTDIR)/q3map2 \
+		-x $(INSTDIR)/q3map2_urt \
+		-x $(INSTDIR)/q3data \
+		`find $(INSTDIR)/modules -name "*.so" | xargs -I {} echo -x {}` \
+		`find $(LIBDIR) -name "*.so" | xargs -I {} echo -x {}` \
+	-d $(LIBDIR) -of -p @executable_path/../lib
+
+	rm -f build
+
+image:
+	find $(TARGET) -name .DS_Store -delete
+	ln -f -s /Applications $(TARGET)/Applications
+	hdiutil create -ov $(DMG) -srcfolder $(TARGET) -volname $(VOLUME_NAME)
+	rm $(TARGET)/Applications
+
+clean:
+	rm -rf $(TARGET)/*

config.py

@@ -247,6 +247,10 @@ class Config:
             # this lets us catch libjpg and libpng libraries that we put in the same directory as radiant.bin
             env.Append( LINKFLAGS = '-Wl,-rpath,.' )
             
+        # On Mac, we pad headers so that we may rewrite them for packaging
+        if ( self.platform == 'Darwin' ) :
+            env.Append( LINKFLAGS = [ '-headerpad_max_install_names' ] )
+
     def CheckoutOrUpdate( self, svnurl, path ):
         if ( os.path.exists( path ) ):
             cmd = [ 'svn', 'update', path ]
@@ -257,22 +261,9 @@ class Config:
 
     def FetchGamePaks( self, path ):
         for pak in self.setup_packs:
-			if ( pak == 'Q2WPack' ):
-				continue
             svnurl = 'svn://svn.icculus.org/gtkradiant-gamepacks/%s/trunk' % pak
             self.CheckoutOrUpdate( svnurl, os.path.join( path, 'installs', pak ) )
         
-		if 'Q2WPack' in self.setup_packs:
-			if ( os.path.exists( 'quake2world' ) ):
-				subprocess.check_call( [ 'git', 'pull', ], cwd = 'quake2world' )
-			else:
-				cmd = [ 'git', 'clone', 'git://github.com/jdolan/quake2world.git' ]
-				subprocess.check_call( cmd )
-			# squash and sync..
-			if ( os.path.exists( 'install/installs/Q2WPack' ) ):
-				shutil.rmtree( 'install/installs/Q2WPack/' )
-			shutil.copytree( 'quake2world/gtkradiant/Q2WPack/', 'install/installs/Q2WPack/' )
-
     def CopyTree( self, src, dst):
         for root, dirs, files in os.walk( src ):
             target_dir = os.path.join( dst, root[root.find( '/' )+1:] )

radiant/main.cpp

@@ -463,19 +463,17 @@ int main( int argc, char* argv[] ) {
 	 */
 	putenv( "LC_NUMERIC=C" );
 
-#ifdef _WIN32
+	// Use the same environment variable for resolving libGL as libgtkglext does.
+	libgl = getenv("GDK_GL_LIBGL_PATH");
+	if ( libgl == NULL ) {
+		#if defined ( _WIN32 )
 			libgl = "opengl32.dll";
-#endif
-
-#if defined ( __linux__ )
+		#elif defined ( __linux__ )
 			libgl = "libGL.so.1";
-#endif
-
-#ifdef __APPLE__
-	//	libgl = "/usr/X11R6/lib/libGL.dylib";
-	//	libgl = "/usr/X11/lib/libGL.dylib";
+		#elif defined ( __APPLE__ )
 			libgl = "/opt/local/lib/libGL.dylib";
-#endif
+		#endif
+	}
 
 #if defined ( __linux__ ) || defined ( __APPLE__ )
 	// Give away unnecessary root privileges.

radiant/preferences.cpp

@@ -662,7 +662,9 @@ PrefsDlg::PrefsDlg (){
 #endif
 	m_nLightRadiuses = 1;
 	m_bQ3Map2Texturing = TRUE;
+#ifdef _WIN32
 	m_bx64q3map2 = TRUE;
+#endif
 #ifdef ATIHACK_812
 	m_bGlATIHack = FALSE;
 #endif
@@ -3144,7 +3146,9 @@ void PrefsDlg::LoadPrefs(){
 	mLocalPrefs.GetPref( LIGHTRADIUS_KEY, &m_nLightRadiuses, TRUE );
 
 	mLocalPrefs.GetPref( Q3MAP2TEX_KEY, &m_bQ3Map2Texturing, TRUE );
+#ifdef _WIN32
 	mLocalPrefs.GetPref( X64Q3MAP2_KEY, &m_bx64q3map2, TRUE );
+#endif
 
 #ifdef ATIHACK_812
 	mLocalPrefs.GetPref( ATIHACK_KEY, &m_bGlATIHack, FALSE );

radiant/qe3.cpp

@@ -473,9 +473,12 @@ void ReplaceTemplates( char* w, const char* r ){
 			else if ( strncmp( r + 1, __Q3MAP2, strlen( __Q3MAP2 ) ) == 0 ) {
 				r += strlen( __Q3MAP2 ) + 1;
 				// see https://github.com/TTimo/GtkRadiant/issues/116
+#ifdef _WIN32
 				if ( g_PrefsDlg.m_bx64q3map2 ) {
 				  p = "x64/q3map2";
-                                } else {
+				} else
+#endif
+				{
 				  p = "q3map2";
 				}
 			}

radiant/qgl.c

@@ -1717,11 +1717,9 @@ int GL_ExtensionSupported( const char *extension ){
 	}
 
 	extensions = qglGetString( GL_EXTENSIONS );
-#ifndef __APPLE__
 	if ( !extensions ) {
 		return 0;
 	}
-#endif
 
 	// It takes a bit of care to be fool-proof about parsing the
 	// OpenGL extensions string. Don't be fooled by sub-strings, etc.