[PD-cvs] SF.net SVN: pure-data:[10637] trunk/packages/darwin_app/Makefile

[eighthave at users.sourceforge.net]

Revision: 10637
          http://pure-data.svn.sourceforge.net/pure-data/?rev=10637&view=rev
Author:   eighthave
Date:     2009-01-25 20:50:09 +0000 (Sun, 25 Jan 2009)

Log Message:
-----------
- changed the "Scripts" folder to being a link to "bin" so that when
  AppMain.tcl is run from the Pd.app, it'll find the rest of the *.tcl files
  without and special tricks.

- test if AppMain.tcl exists, like with pd-devel, if not create a symlink
  called AppMain.tcl to pd.tk for pd-vanilla and pd-extended

Modified Paths:
--------------
    trunk/packages/darwin_app/Makefile

Modified: trunk/packages/darwin_app/Makefile
===================================================================
--- trunk/packages/darwin_app/Makefile	2009-01-25 20:07:39 UTC (rev 10636)
+++ trunk/packages/darwin_app/Makefile	2009-01-25 20:50:09 UTC (rev 10637)
@@ -119,7 +119,7 @@
 	fix_install_name "$(PD_APP_CONTENTS)/MacOS/$(WISH_NAME)" Tk
 endif # NOT /System
 # set up app wrapper
-	install -d "$(PD_APP_CONTENTS)/Resources/Scripts"
+	install -d "$(PD_APP_CONTENTS)/Resources"
 	install -m0644 -p Info.plist "$(PD_APP_CONTENTS)"
 	install -m0644 -p *.icns  "$(PD_APP_CONTENTS)/Resources"
 	mv "$(PD_APP_CONTENTS)/MacOS/${WISH_NAME}" \
@@ -177,8 +177,11 @@
 	$(MAKE) -C $(packages_src) $(DEST_PATHS) \
 		PD_CONFIGURE_FLAGS="--enable-jack --disable-fat" \
 		pd_install 
-	cd "$(PD_APP_CONTENTS)/Resources/Scripts" && \
-		ln -s ../bin/pd.tk AppMain.tcl
+	install -d "$(PD_APP_CONTENTS)/Resources"
+	cd "$(PD_APP_CONTENTS)/Resources" && \
+		ln -s bin Scripts
+	cd "$(PD_APP_CONTENTS)/Resources" && \
+		test -e AppMain.tcl || ln -s pd.tk AppMain.tcl
 # support for Info Panel Plugins mgmt
 	cd "$(PD_APP_CONTENTS)" && ln -s Resources/extra Plugins
 	install -p -m0644 org.puredata.pd.default.plist "$(PD_APP_CONTENTS)/"
@@ -258,8 +261,9 @@
 	-rm -f -- $(PD_APP_CONTENTS)/Plugins $(PD_APP_CONTENTS)/Info.plist
 	-rm -f -- "$(PD_APP_CONTENTS)/MacOS/$(PD_APP_NAME)"
 	-rmdir  $(PD_APP_CONTENTS)/MacOS
-	-rm -f -- $(PD_APP_CONTENTS)/Resources/Scripts/AppMain.tcl
-	-rmdir $(PD_APP_CONTENTS)/Resources/Scripts
+	-rm -f -- $(PD_APP_CONTENTS)/Resources/bin/*.tk
+	-rm -f -- $(PD_APP_CONTENTS)/Resources/bin/*.tcl
+	-rm -f -- $(PD_APP_CONTENTS)/Resources/Scripts
 	-rm -f -- "$(PD_APP_CONTENTS)/Resources/$(WISH_NAME).rsrc" \
 		"$(PD_APP_CONTENTS)/Resources/pd*.icns"
 	-rmdir  $(PD_APP_CONTENTS)/Resources


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.