[PD-cvs] packages/darwin_app Makefile,1.38,1.39

[Hans-Christoph Steiner]

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

Modified Files:
	Makefile 
Log Message:
fixed up the tracking down of the Wish.app to support both Mac OS X/Intel and the auto-builds

Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/packages/darwin_app/Makefile,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Makefile	21 Jul 2006 00:22:52 -0000	1.38
--- Makefile	28 Jul 2006 05:44:41 -0000	1.39
***************
*** 18,29 ****
  # and mount it.  The files will be copied from the mounted .dmg image.
  #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"
  
--- 18,30 ----
  # and mount it.  The files will be copied from the mounted .dmg image.
  #WISH = /Applications/Utilities/Wish\ Shell.app
! TCLTK := $(shell /bin/ls -1r TclTkAquaStandalone-8.?.*.dmg|head -n 1|sed 's/\.dmg//')
! TCLTK_BUGFIX_VERSION := $(shell echo $(TCLTK) | \
  	sed 's|TclTkAquaStandalone-[0-9]\.[0-9]\.\([0-9]*\)|\1|')
  
+ WISH_SOURCE = $(shell $(scripts_src)/find-wish.app.sh)
  # Wish Shell.app changed to Wish.app in TclTk 8.4.10
! WISH_NAME := $(shell ( test -d $(WISH_SOURCE)/Wish.app && echo Wish) \
! 	|| echo Wish Shell)
! WISH = "$(WISH_SOURCE)/$(WISH_NAME).app"
  WISH_CONTENTS = "$(WISH)/Contents"
  
***************
*** 95,99 ****
  # http://cvs.sourceforge.net/viewcvs.py/tkcvs/tkcvs-proj/PackApp?rev=1.4
  darwin_app_wrapper: Info.plist
- 	test -d /Volumes/$(TCLTK) || hdiutil mount $(TCLTK).dmg
  # copy Wish Shell.app from default install location
  # note: use the "standalone" Wish shell to make a "standalone" pd app
--- 96,99 ----
***************
*** 114,118 ****
  	mv "$(PD_APP_CONTENTS)/MacOS/${WISH_NAME}" \
  		"$(PD_APP_CONTENTS)/MacOS/${PD_APP_NAME}"
- #	diskutil eject /Volumes/$(TCLTK)
  
  
--- 114,117 ----
***************
*** 242,246 ****
  	@echo "PACKAGE_VERSION: $(PACKAGE_VERSION)"
  	@echo "WISH_NAME: $(WISH_NAME)"
! 	@echo "TCKTK_BUGFIX_VERSION: $(TCKTK_BUGFIX_VERSION)"
  	@echo "CWD $(CWD)"
  	@echo "DESTDIR $(DESTDIR)"
--- 241,245 ----
  	@echo "PACKAGE_VERSION: $(PACKAGE_VERSION)"
  	@echo "WISH_NAME: $(WISH_NAME)"
! 	@echo "TCLTK_BUGFIX_VERSION: $(TCLTK_BUGFIX_VERSION)"
  	@echo "CWD $(CWD)"
  	@echo "DESTDIR $(DESTDIR)"