[PD-cvs] packages/darwin_app Info.plist.in, 1.2, 1.3 Makefile, 1.33, 1.34

[Hans-Christoph Steiner]

Update of /cvsroot/pure-data/packages/darwin_app
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27922/darwin_app

Modified Files:
	Info.plist.in Makefile 
Log Message:
fixed app renaming so that you can properly rename the Pd.app with one setting; fixed Pd version regexps to look in m_pd.h after complete_version_defines-0.39.2.patch is applied; upgraded to TclTk 8.4.10 and make automatic Wish.app/Wish Shell.app name handling

Index: Info.plist.in
===================================================================
RCS file: /cvsroot/pure-data/packages/darwin_app/Info.plist.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Info.plist.in	26 Nov 2005 01:51:35 -0000	1.2
--- Info.plist.in	27 Feb 2006 07:12:47 -0000	1.3
***************
*** 22,26 ****
  	</array>
  	<key>CFBundleExecutable</key>
! 	<string>Pd</string>
  	<key>CFBundleIdentifier</key>
  	<string>org.puredata.pd.wish</string>
--- 22,26 ----
  	</array>
  	<key>CFBundleExecutable</key>
! 	<string>PD_APP_NAME</string>
  	<key>CFBundleIdentifier</key>
  	<string>org.puredata.pd.wish</string>

Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/packages/darwin_app/Makefile,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Makefile	22 Feb 2006 06:13:22 -0000	1.33
--- Makefile	27 Feb 2006 07:12:47 -0000	1.34
***************
*** 22,31 ****
  #WISH = /Applications/Utilities/Wish\ Shell.app
  TCLTK := $(shell /bin/ls -1r TclTkAquaStandalone-8.?.*.dmg|head -1|sed 's/\.dmg//')
! # Tcl/Tk < 8.4.10
! #WISH_NAME = Wish\ Shell
! # Tcl/Tk >= 8.4.10
! WISH_NAME = Wish
! WISH = /Volumes/$(TCLTK)/$(WISH_NAME).app
! WISH_CONTENTS = $(WISH)/Contents
  
  
--- 22,33 ----
  #WISH = /Applications/Utilities/Wish\ Shell.app
  TCLTK := $(shell /bin/ls -1r TclTkAquaStandalone-8.?.*.dmg|head -1|sed 's/\.dmg//')
! TCKTK_BUGFIX_VERSION := $(shell echo $(TCLTK) | \
! 	sed 's|TclTkAquaStandalone-[0-9]\.[0-9]\.\([0-9]*\)|\1|')
! 
! # Wish Shell.app changed to Wish.app in TclTk 8.4.10
! WISH_NAME := $(shell ( test $(TCKTK_BUGFIX_VERSION) -ge 10 && echo Wish ) \
! 	|| echo Wish Shell )
! WISH = "/Volumes/$(TCLTK)/$(WISH_NAME).app"
! WISH_CONTENTS = "$(WISH)/Contents"
  
  
***************
*** 95,106 ****
  	install -d "$(PD_APP_CONTENTS)/MacOS"
  	install -m0755 -p \
! 		$(WISH_CONTENTS)/MacOS/$(WISH_NAME) \
  		"$(PD_APP_CONTENTS)/MacOS"
  	install -d "$(PD_APP_CONTENTS)/Resources"
  	install -m0644 -p \
! 		$(WISH_CONTENTS)/Resources/$(WISH_NAME).rsrc \
  		"$(PD_APP_CONTENTS)/Resources"
  	install -d "$(PD_APP_CONTENTS)/Frameworks"
! 	cp -Rp $(WISH_CONTENTS)/Frameworks "$(PD_APP_CONTENTS)"
  # set up app wrapper
  	install -d "$(PD_APP_CONTENTS)/Resources/Scripts"
--- 97,108 ----
  	install -d "$(PD_APP_CONTENTS)/MacOS"
  	install -m0755 -p \
! 		"$(WISH_CONTENTS)/MacOS/$(WISH_NAME)" \
  		"$(PD_APP_CONTENTS)/MacOS"
  	install -d "$(PD_APP_CONTENTS)/Resources"
  	install -m0644 -p \
! 		"$(WISH_CONTENTS)/Resources/$(WISH_NAME).rsrc" \
  		"$(PD_APP_CONTENTS)/Resources"
  	install -d "$(PD_APP_CONTENTS)/Frameworks"
! 	cp -Rp "$(WISH_CONTENTS)/Frameworks" "$(PD_APP_CONTENTS)"
  # set up app wrapper
  	install -d "$(PD_APP_CONTENTS)/Resources/Scripts"
***************
*** 108,112 ****
  	install -m0644 -p *.icns  "$(PD_APP_CONTENTS)/Resources"
  	mv "$(PD_APP_CONTENTS)/MacOS/${WISH_NAME}" \
! 		"$(PD_APP_CONTENTS)/MacOS/Pd"
  #	diskutil eject /Volumes/$(TCLTK)
  
--- 110,114 ----
  	install -m0644 -p *.icns  "$(PD_APP_CONTENTS)/Resources"
  	mv "$(PD_APP_CONTENTS)/MacOS/${WISH_NAME}" \
! 		"$(PD_APP_CONTENTS)/MacOS/${PD_APP_NAME}"
  #	diskutil eject /Volumes/$(TCLTK)
  
***************
*** 215,220 ****
  	-rm -f -- $(PD_APP_CONTENTS)/Resources/Scripts/AppMain.tcl
  	-rmdir $(PD_APP_CONTENTS)/Resources/Scripts
! 	-rm -f -- $(WISH_CONTENTS)/Resources/$(WISH_NAME).rsrc \
! 		$(WISH_CONTENTS)/Resources/pd*.icns
  	-rmdir $(PD_APP_CONTENTS)/Resources
  	-rm -f -- $(DESTDIR)
--- 217,222 ----
  	-rm -f -- $(PD_APP_CONTENTS)/Resources/Scripts/AppMain.tcl
  	-rmdir $(PD_APP_CONTENTS)/Resources/Scripts
! 	-rm -f -- "$(WISH_CONTENTS)/Resources/$(WISH_NAME).rsrc" \
! 		"$(WISH_CONTENTS)/Resources/pd*.icns"
  	-rmdir $(PD_APP_CONTENTS)/Resources
  	-rm -f -- $(DESTDIR)
***************
*** 231,235 ****
--- 233,240 ----
  test_locations:
  	@echo "PD_VERSION: $(PD_VERSION)"
+ 	@echo "PACKAGE_NAME: $(PACKAGE_NAME)"
  	@echo "PACKAGE_VERSION: $(PACKAGE_VERSION)"
+ 	@echo "WISH_NAME: $(WISH_NAME)"
+ 	@echo "TCKTK_BUGFIX_VERSION: $(TCKTK_BUGFIX_VERSION)"
  	@echo "CWD $(CWD)"
  	@echo "DESTDIR $(DESTDIR)"