[PD-cvs] packages/darwin_app Makefile,1.41,1.42

[Hans-Christoph Steiner]

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

Modified Files:
	Makefile 
Log Message:
fixed up logic for tracking down which Wish.app to use and whether to copy it has embedded Frameworks

Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/packages/darwin_app/Makefile,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** Makefile	28 Jul 2006 15:16:55 -0000	1.41
--- Makefile	29 Jul 2006 23:12:20 -0000	1.42
***************
*** 19,27 ****
  # 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) \
--- 19,27 ----
  # and mount it.  The files will be copied from the mounted .dmg image.
  #WISH = /Applications/Utilities/Wish\ Shell.app
! TCLTK := $(shell find $(packages_src)/darwin_app -name 'TclTkAquaStandalone-8.?.*.dmg'|head -n 1|sed 's|.*/\(.*\)\.dmg|\1|')
  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 "$(TCLTK)")
  # Wish Shell.app changed to Wish.app in TclTk 8.4.10
  WISH_NAME := $(shell ( test -d $(WISH_SOURCE)/Wish.app && echo Wish) \
***************
*** 82,86 ****
  extended_install:
  	cd $(packages_src) && $(MAKE) $(DEST_PATHS) install
! 	
  #------------------------------------------------------------------------------#
  darwin_app_devel: darwin_app_devel_core rez_install
--- 82,86 ----
  extended_install:
  	cd $(packages_src) && $(MAKE) $(DEST_PATHS) install
! 
  #------------------------------------------------------------------------------#
  darwin_app_devel: darwin_app_devel_core rez_install
***************
*** 113,118 ****
  		"$(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"
--- 113,121 ----
  		"$(WISH_CONTENTS)/Resources/$(WISH_NAME).rsrc" \
  		"$(PD_APP_CONTENTS)/Resources"
! # only install Frameworks if using a standalone Wish.app
! 	(test -d "$(WISH_CONTENTS)/Frameworks" && \
! 		(install -d "$(PD_APP_CONTENTS)/Frameworks"; \
! 		cp -Rp "$(WISH_CONTENTS)/Frameworks" "$(PD_APP_CONTENTS)" ) ) || \
! 		echo "Skipping Frameworks copy."
  # set up app wrapper
  	install -d "$(PD_APP_CONTENTS)/Resources/Scripts"
***************
*** 284,288 ****
  	@echo "PACKAGE_NAME: $(PACKAGE_NAME)"
  	@echo "PACKAGE_VERSION: $(PACKAGE_VERSION)"
! 	@echo "WISH_NAME: $(WISH_NAME)"
  	@echo "TCLTK_BUGFIX_VERSION: $(TCLTK_BUGFIX_VERSION)"
  	@echo "CWD $(CWD)"
--- 287,292 ----
  	@echo "PACKAGE_NAME: $(PACKAGE_NAME)"
  	@echo "PACKAGE_VERSION: $(PACKAGE_VERSION)"
! 	@echo "WISH: $(WISH)"
! 	@echo "TCLTK: $(TCLTK)"
  	@echo "TCLTK_BUGFIX_VERSION: $(TCLTK_BUGFIX_VERSION)"
  	@echo "CWD $(CWD)"