* More work on MonoDevelop.app bundle

svn path=/trunk/monodevelop/; revision=125592

3 files changed, 62 insertions, 48 deletions

diff --git a/main/build/MacOSX/Makefile b/main/build/MacOSX/Makefile
new file mode 100644
index 0000000000..9cc794560a
--- /dev/null
+++ b/main/build/MacOSX/Makefile
@@ -0,0 +1,44 @@
+
+BUNDLE_VERSION=0.0.3
+MAC_APP_DIR=MonoDevelop.app
+MACOS=$(MAC_APP_DIR)/Contents/MacOS
+MAC_APP_LIB_DIR=$(MACOS)/lib/monodevelop
+ADDINS=$(MACOS)/lib/monodevelop/AddIns
+
+all: app-dir
+
+
+clean:
+	rm -rf MonoDevelop.app
+app-dir:
+	mkdir -p $(MAC_APP_DIR)/Contents/{MacOS,Resources}
+	mkdir -p $(MAC_APP_DIR)/Contents/MacOS/{lib,share}
+	mkdir -p $(MAC_APP_LIB_DIR)
+	cp -pR ../AddIns $(MAC_APP_LIB_DIR)
+	cp -pR ../data $(MAC_APP_LIB_DIR)
+	cp -pR ../bin $(MAC_APP_LIB_DIR)
+	cp -pR ../locale $(MAC_APP_DIR)/Contents/MacOS/share
+
+	sed -e "s/@BUNDLE_VERSION@/$(BUNDLE_VERSION)/" -e "s/@ASSEMBLY_VERSION@/$(ASSEMBLY_VERSION)/" Info.plist.in > $(MAC_APP_DIR)/Contents/Info.plist
+	cp ../../theme-icons/Mac/monodevelop.icns $(MAC_APP_DIR)/Contents/Resources
+	cp monodevelop.in $(MACOS)/monodevelop
+	cp mdtool.in $(MACOS)/mdtool
+
+# copy monodevelop.pc and mono-addins.pc to Contents/MacOS/lib/pkgconfig
+	mkdir -p $(MACOS)/lib/pkgconfig
+	cp ../../*.pc $(MACOS)/lib/pkgconfig
+
+# Copy main/monodevelop.xml to MonoDevelop.app/Contents/MacOS/share/mime/packages
+	mkdir -p $(MACOS)/share/{applications,mime,icons,locale,man}
+	mkdir -p $(MACOS)/share/mime/packages
+	cp ../../monodevelop.xml $(MACOS)/share/mime/packages
+	cp ../../monodevelop.desktop $(MACOS)/share/applications
+
+# Copy icons from main/theme-icons/Mac/png to .app/Contents/MacOS/share/icons
+	mkdir -p $(MACOS)/share/icons
+	cp ../../theme-icons/Mac/png/* $(MACOS)/share/icons
+
+
+# Remove Gettext plugin (It's broken on OSX)
+	rm -rf $(ADDINS)/*Gettext*
+
diff --git a/main/build/MacOSX/monodevelop.in b/main/build/MacOSX/monodevelop.in
index dda420dff9..af100259e2 100755
--- a/main/build/MacOSX/monodevelop.in
+++ b/main/build/MacOSX/monodevelop.in
@@ -45,26 +45,34 @@ fi
 
 eval set -- `reWrite "$@"`
 
+# Work around a bug in 'exec' in older versions of macosx
+OSX_VERSION=$(uname -r | cut -f1 -d.)
+if [ $OSX_VERSION -lt 9 ]; then  # If OSX version is 10.4
+   EXEC=""
+else
+   EXEC="exec -a monodevelop"
+fi
+
 cd $MD_BIN_PATH
 
 case x$1 in
 	x--profile)
 		shift
-		exec -a "monodevelop" $MONO --profile $ASSEMBLY "$@"
+		$EXEC $MONO --profile $ASSEMBLY "$@"
 		exit 0
 		;;
 	x--debug)
 		shift
 		export MONODEVELOP_DISPATCH_DEBUG=yes
-		exec -a "monodevelop"  $MONO --debug $ASSEMBLY "$@"
+		$EXEC $MONO --debug $ASSEMBLY "$@"
 		exit 0
 		;;
 	x--trace)
 		shift
-		exec -a "monodevelop"  $MONO --trace $ASSEMBLY "$@"
+		$EXEC $MONO --trace $ASSEMBLY "$@"
 		exit 0;
 		;;
 esac
 
-exec -a "monodevelop" $MONO $ASSEMBLY "$@"
+$EXEC $MONO $ASSEMBLY "$@"
 
diff --git a/main/build/Makefile.am b/main/build/Makefile.am
index 26061365d9..bd2cbeb0e1 100644
--- a/main/build/Makefile.am
+++ b/main/build/Makefile.am
@@ -1,52 +1,14 @@
 
-
-if ENABLE_MACPLATFORM
-BUNDLE_VERSION=0.0.3
-MAC_APP_DIR=MonoDevelop.app
-MACOS=$(MAC_APP_DIR)/Contents/MacOS
-MAC_APP_LIB_DIR=$(MACOS)/lib/monodevelop
-ADDINS=$(MACOS)/lib/monodevelop/AddIns
-
-all: app-dir
-
+if ENABLE_MACBUNDLE
+SUBDIRS = MacOSX
 else
-all:
 
+SUBDIRS=
 endif
 
-clean-local:
-	rm -rf bin
-	rm -rf AddIns
-	rm -rf MonoDevelop.app
-
-
-app-dir:
-	mkdir -p $(MAC_APP_DIR)/Contents/{MacOS,Resources}
-	mkdir -p $(MAC_APP_DIR)/Contents/MacOS/{lib,share}
-	mkdir -p $(MAC_APP_LIB_DIR)
-	cp -a AddIns $(MAC_APP_LIB_DIR)
-	cp -a data $(MAC_APP_LIB_DIR)
-	cp -a bin $(MAC_APP_LIB_DIR)
-	cp -a locale $(MAC_APP_DIR)/Contents/MacOS/share
-
-	sed -e "s/@BUNDLE_VERSION@/$(BUNDLE_VERSION)/" -e "s/@ASSEMBLY_VERSION@/$(ASSEMBLY_VERSION)/" MacOSX/Info.plist.in > $(MAC_APP_DIR)/Contents/Info.plist
-	cp ../theme-icons/Mac/monodevelop.icns $(MAC_APP_DIR)/Contents/Resources
-	cp MacOSX/monodevelop.in $(MACOS)/monodevelop
-	cp MacOSX/mdtool.in $(MACOS)/mdtool
-
-# copy monodevelop.pc and mono-addins.pc to Contents/MacOS/lib/pkgconfig
-	mkdir -p $(MACOS)/lib/pkgconfig
-	cp ../*.pc $(MACOS)/lib/pkgconfig
-
-# Copy main/monodevelop.xml to MonoDevelop.app/Contents/MacOS/share/mime/packages
-	mkdir -p $(MACOS)/share/mime/packages
-	cp ../monodevelop.xml $(MACOS)/share/mime/packages
-
-# Copy icons from main/theme-icons/Mac/png to .app/Contents/MacOS/share/icons
-	mkdir -p $(MACOS)/share/icons
-	cp ../theme-icons/Mac/png/* $(MACOS)/share/icons
+all:
 
+clean-local:
+	rm -rf bin AddIns locale data
 
-# Remove Gettext plugin (It's broken on OSX)
-	rm -rf $(ADDINS)/*Gettext*