added in Jamie's dlopn patch so I can use his binaries; fixed a number of bugs reported on the list; added platform-specific noncvs handling

svn path=/trunk/; revision=4035

3 files changed, 27 insertions, 43 deletions

diff --git a/packages/darwin_app/Info.plist.in b/packages/darwin_app/Info.plist.in
index d2a4201a..4450e8d6 100644
--- a/packages/darwin_app/Info.plist.in
+++ b/packages/darwin_app/Info.plist.in
@@ -9,7 +9,8 @@
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
-				<string>PD_APP_NAME</string>
+				<string>pd</string>
+				<string>pat</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
 			<string>pd-file.icns</string>
@@ -22,7 +23,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Pd</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.puredata.pd</string>
+	<string>org.puredata.pd.wish</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile
index 9ba57465..2aa69bf0 100644
--- a/packages/darwin_app/Makefile
+++ b/packages/darwin_app/Makefile
@@ -35,7 +35,7 @@ DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \
 install: darwin_app
 
 #------------------------------------------------------------------------------#
-darwin_app: darwin_app_core extended_app_install rez_install
+darwin_app: darwin_app_core extended_app_install darwin_app_doc_format rez_install
 	@echo " "
 	@echo "Pd.app build succeeded!"
 
@@ -43,7 +43,7 @@ darwin_app: darwin_app_core extended_app_install rez_install
 # this target is for when you already have a pre-built Pd.app and you
 # just want to fill it with goodies from CVS.  To do so, place your 
 # Pd.app in $(BUILD_BASE)/Pd.app
-extended_app_install:  extended_install darwin_app_noncvs darwin_app_doc_format
+extended_app_install:  extended_install
 
 
 #------------------------------------------------------------------------------#
@@ -68,7 +68,7 @@ darwin_app_wrapper: Info.plist
 	install -m0644 -p Info.plist "$(PD_APP_CONTENTS)"
 	install -m0644 -p *.icns  "$(PD_APP_CONTENTS)/Resources"
 	mv "$(PD_APP_CONTENTS)/MacOS/Wish Shell" \
-		"$(PD_APP_CONTENTS)/MacOS/$(PD_APP_NAME)"
+		"$(PD_APP_CONTENTS)/MacOS/Pd"
 #	diskutil eject /Volumes/$(TCLTK)
 
 
@@ -107,6 +107,7 @@ darwin_app_doc_format:
 	cd $(DOCS_DEST) && \
 		sed -i.bak 's/^\(\#N canvas [0-9]* [0-9]* [0-9]* [0-9]*\) 12/\1 10/' \
 			*/*.pd */*/*.pd */*/*/*.pd
+	find $(INSTALL_PREFIX) -name '*.pd.bak' -delete
 
 #==============================================================================#
 #
@@ -120,19 +121,7 @@ extended_install:
 
 #------------------------------------------------------------------------------#
 darwin_app_externals: darwin_app_externals_standard darwin_app_externals_c++ darwin_app_externals_flext
-#darwin_app_externals: darwin_app_externals_standard darwin_app_externals_c++ darwin_app_externals_gem
-
-
-#------------------------------------------------------------------------------#
-# GEM
-darwin_app_externals_gem:
-	cd $(GEM_SRC)/Gem && xcodebuild
-	install -p -m0644 $(GEM_SRC)/Gem/help/*.* $(HELP_DEST)
-	install -d $(DOCS_DEST)/Gem/doc
-	install -p -m0644 $(GEM_SRC)/Gem/doc/*.* $(DOCS_DEST)/gem
-	install -d $(DOCS_DEST)/Gem/00.manual
-	install -p -m0644 $(GEM_SRC)/Gem/manual/*.* $(DOCS_DEST)/gem/00.manual
-	cp -Rfp $(GEM_SRC)/Gem/examples/*.* $(GEM_SRC)/Gem/examples/data $(DOCS_DEST)/gem
+#darwin_app_externals: darwin_app_externals_standard darwin_app_externals_c++
 
 
 #------------------------------------------------------------------------------#
@@ -270,24 +259,10 @@ darwin_app_externals_c++:
 # gem2pdp
 #	cd $(EXTERNALS_SRC)/gem2pdp && $(MAKE) -f Makefile.darwin
 #	install -p -m0444 $(EXTERNALS_SRC)/gem2pdp/*.pd_darwin $(OBJECTS_DEST)
-#----------------------------------------------------------------------------
-# GridFlow
-#	cd ../../gridflow && ./configure && $(MAKE)
 
 
-darwin_app_noncvs:
-	test -d noncvs/doc/5.reference && \
-		install -p noncvs/doc/5.reference/*.* $(HELP_DEST)
-	test -d noncvs/extra && install -p noncvs/extra/*.* $(OBJECTS_DEST)
-	test -d noncvs/doc/serendipd && cp -Rp noncvs/doc/serendipd \
-		$(APPLICATIONS_DEST)
-
 darwin_app_perms:
-	chmod a-x $(DOCS_DEST)/*/*.pd $(DOCS_DEST)/*/*/*.pd $(DOCS_DEST)/*/*/*/*.pd
 	chmod -R a-w $(DOCS_DEST)
-# serendiPd shared patch
-	test -d $(APPLICATIONS_DEST)/serendipd && \
-		chmod a+w $(APPLICATIONS_DEST)/serendipd/*shared_patch.pd
 
 DMG_NAME = $(PACKAGE_NAME)
 dmg: darwin_app_perms
@@ -299,8 +274,7 @@ dmg: darwin_app_perms
 	cd $(CWD) && /bin/sh mkdmg "$(DMG_NAME)"
 
 
-clean: darwin_app_clean darwin_app_externals_standard_clean \
-	darwin_app_externals_gem_clean darwin_app_externals_flext_clean \
+clean: darwin_app_clean	darwin_app_externals_flext_clean \
 	cd $(PACKAGES_SRC) && make clean
 	-rm Info.plist
 
@@ -312,7 +286,7 @@ darwin_app_clean:
 
 
 
-darwin_app_externals_gem_clean:
+
 	cd $(GEM_SRC)/Gem && xcodebuild clean
 
 darwin_app_externals_flext_clean:
@@ -331,6 +305,22 @@ darwin_app_externals_flext_clean:
 #
 #==============================================================================#
 
+darwin_app_noncvs:
+	@echo " "
+	@echo "Deprecated!!" 
+	@echo "cd $(PACKAGES_SRC) && make noncvs_install"
+	cd $(PACKAGES_SRC) && make $(DEST_PATHS) noncvs_install
+
+darwin_app_externals_gem_clean:
+	@echo " "
+	@echo "Deprecated!!" 
+	@echo "cd $(PACKAGES_SRC) && make gem_clean"
+
+darwin_app_externals_gem:
+	@echo " "
+	@echo "Deprecated!!" 
+	@echo "cd $(PACKAGES_SRC) && make gem_install"
+
 darwin_app_externals_standard_clean:
 	@echo " "
 	@echo "Deprecated!!" 
diff --git a/packages/darwin_app/TODO b/packages/darwin_app/TODO
index a64c8665..38bc6a39 100644
--- a/packages/darwin_app/TODO
+++ b/packages/darwin_app/TODO
@@ -3,18 +3,11 @@
 
 - in post-clean, rm *.bak
 
-- make Info.plist.in template and have the Makefile create Info.plist
-
-- check to make sure that Rez mac.r is working in Makefile
-
 - make Pd open a new window when its launched to workaround the bug where the
   menus don't work until a window is opened.
 
 - otool dylib help: http://qin.laya.com/tech_coding_help/dylib_linking.html
 
-- add symbolic link for flext 
-  (cd Pd.app/Contents/Resources/extra && ln -s . lib)
-
 - from Carmen Rocco about [fiddle~] crash: "is fiddle~: * compiled with the same header * linked with the same binary of (lib)pd * compiled with the same compiler? i had very similar issues with bonk on windows (Virtually same stacktrace but s/fiddle/bonk) until fixing the above 3 things..."
 
 - review permissions so that you can build on top on existing builds
@@ -55,7 +48,7 @@ http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/Articles
 		 - make Cmd-click work like Ctrl-click
 
 - write script to convert from -DMACOSX to -D__APPLE__ where ever possible (check out
-  __gnu_linux__ while I am at it) and submit to miller
+  __gnu_linux__ and WIN32 while I am at it) and submit to miller
 
 - instead of shipping Pd.app with a org.puredata.pd.plist, make a script that
   uses the "defaults" command to add the desired prefs to any existing