packages/darwin_app Makefile,1.2,1.3 - Pd-cvs

1 Sep 2004


      Update of /cvsroot/pure-data/packages/darwin_app
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9019
Modified Files:
    Makefile 
Log Message:
macosx app style
Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/packages/darwin_app/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	30 Aug 2004 02:11:24 -0000	1.2
--- Makefile	31 Aug 2004 23:18:10 -0000	1.3
***************
*** 8,11 ****
--- 8,13 ----
  INSTALL_PREFIX = $(PD_APP_CONTENTS)/Resources
+ WISH_SHELL_CONTENTS = /Applications/Utilities/Wish\ Shell.app/Contents
+ 
  PD_FILE_ROOT = $(DESTDIR)$(INSTALL_PREFIX)/lib/pd
  ABSTRACTIONS_DIR = $(PD_FILE_ROOT)/doc/abstractions
***************
*** 87,91 ****
    echo "<p>For more information, go to: http://www.puredata.org</p>" >> $(README_FILE)
    echo "<h3>Installation</h3>" >> $(README_FILE)	
! 	echo "<p>To install Pd, drag the Pd.app to your /Applications folder. Currently, this app will only work in this location, nowhere else.</p>" >> $(README_FILE)	
    echo "<h3>Pure Data CVS Developers</h3>" >> $(README_FILE)	
  # this may seem whack, but it generates the list of developers from the SourceForge site:
--- 89,93 ----
    echo "<p>For more information, go to: http://www.puredata.org</p>" >> $(README_FILE)
    echo "<h3>Installation</h3>" >> $(README_FILE)	
! 	echo "<p>To install Pd, drag the Pd.app to anywhere in your hard disk.</p>" >> $(README_FILE)	
    echo "<h3>Pure Data CVS Developers</h3>" >> $(README_FILE)	
  # this may seem whack, but it generates the list of developers from the SourceForge site:
***************
*** 129,132 ****
--- 131,135 ----
  darwin_app_wrapper:
  # copy Wish Shell.app from default install location
+ # note: use the "standalone" Wish shell to make a "standalone" pd app
    install -d "$(DESTDIR)$(PD_APP_CONTENTS)/MacOS"
    install -m0755 -p \
***************
*** 137,148 ****
    	/Applications/Utilities/Wish\ Shell.app/Contents/Resources/Wish\ Shell.rsrc \
    	"$(DESTDIR)$(PD_APP_CONTENTS)/Resources"
  # set up app wrapper
    install -d "$(DESTDIR)$(PD_APP_CONTENTS)/Resources/Scripts"
    install -m0644 -p Info.plist "$(DESTDIR)$(PD_APP_CONTENTS)"
! 	install -m0644 -p Pd.term "$(DESTDIR)$(PD_APP_CONTENTS)/Resources"
    install -m0644 -p *.icns  "$(DESTDIR)$(PD_APP_CONTENTS)/Resources"
  # using the shell script hack until AppMain.tcl works
! #	install -m0644 -p AppMain.tcl "$(DESTDIR)$(PD_APP_CONTENTS)/Resources/Scripts"
! 	install -m0755 -p Pd "$(DESTDIR)$(PD_APP_CONTENTS)/MacOS"
--- 140,163 ----
    	/Applications/Utilities/Wish\ Shell.app/Contents/Resources/Wish\ Shell.rsrc \
    	"$(DESTDIR)$(PD_APP_CONTENTS)/Resources"
+ #	install -d "$(DESTDIR)$(PD_APP_CONTENTS)/Frameworks"
+ 	cp -Rp \
+ 		/Applications/Utilities/Wish\ Shell.app/Contents/Frameworks \
+ 		"$(DESTDIR)$(PD_APP_CONTENTS)"
+ 	cp -Rp \
+                 /Applications/Utilities/Wish\ Shell.app/Contents/Frameworks \
+                 "$(DESTDIR)$(PD_APP_CONTENTS)/Resources"
+ 
+ #	install -d "$(DESTDIR)$(PD_APP_CONTENTS)/Frameworks"  \
+ #	"$(DESTDIR)$(PD_APP_CONTENTS)/Resources"
  # set up app wrapper
    install -d "$(DESTDIR)$(PD_APP_CONTENTS)/Resources/Scripts"
    install -m0644 -p Info.plist "$(DESTDIR)$(PD_APP_CONTENTS)"
! 	#install -m0644 -p Pd.term "$(DESTDIR)$(PD_APP_CONTENTS)/Resources"
    install -m0644 -p *.icns  "$(DESTDIR)$(PD_APP_CONTENTS)/Resources"
  # using the shell script hack until AppMain.tcl works
! 	install -m0644 -p AppMain.tcl "$(DESTDIR)$(PD_APP_CONTENTS)/Resources/Scripts"
! 	#  install -m0755 -p Pd "$(DESTDIR)$(PD_APP_CONTENTS)/MacOS"
! # rename the Wish Shell executable to "Pd"
! 	mv "$(DESTDIR)$(PD_APP_CONTENTS)/MacOS/Wish Shell" "$(DESTDIR)$(PD_APP_CONTENTS)/MacOS/Pd"
***************
*** 150,155 ****
  # prefix=$(INSTALL_PREFIX) is for pd-CVS 0.37
  darwin_app_core:
  # pd core
! 	cd ../../pd/src/ && ./configure && \
    	make install \
    		DESTDIR=../../packages/darwin_app/$(DESTDIR) \
--- 165,176 ----
  # prefix=$(INSTALL_PREFIX) is for pd-CVS 0.37
  darwin_app_core:
+ # apply some patches 
+ 	cd ../../pd/src/ && patch -p0<../../packages/darwin_app/patches/socket.patch
+ 	cd ../../pd/src/ && patch -p0<../../packages/darwin_app/patches/makefile.in.patch
+ 	cd ../../pd/src/ && patch -p0<../../packages/darwin_app/patches/u_main.tk.patch
+ 	cd ../../pd/src/ && patch -p0<../../packages/darwin_app/patches/configure.jackosx.patch
+ 	cd ../../pd/src/ && patch -p0<../../packages/darwin_app/patches/s_audio_jack.patch
  # pd core
! 	cd ../../pd/src/ && ./configure --enable-jack &&\
    	make install \
    		DESTDIR=../../packages/darwin_app/$(DESTDIR) \
***************
*** 167,170 ****
--- 188,199 ----
    install -m644 --group=staff ../../doc/pddp/*.pd $(HELP_DIR)/5.reference
+ # DOC menus
+ 	install -d $(HELP_DIR)/menus
+ 	cp -p ./doc-menu.pd $(HELP_DIR)/menus
+ 	./mkdocs $(HELP_DIR)/2.control.examples>$(HELP_DIR)/menus/2.control.examples.pd
+ 	./mkdocs $(HELP_DIR)/3.audio.examples>$(HELP_DIR)/menus/3.audio.examples.pd
+ 	./mkdocs $(HELP_DIR)/4.fft.examples>$(HELP_DIR)/menus/4.fft.examples.pd
+ 	./mkdocs $(HELP_DIR)/5.reference>$(HELP_DIR)/menus/5.reference.pd
+ 
  darwin_app_abstractions:
  #----------------------------------------------------------------------------
***************
*** 182,186 ****
  #----------------------------------------------------------------------------
  # FLEXT
! 	install -d $(PD_FILE_ROOT)/flext
    cd ../../externals/grill/build/darwin && make 
    install -d $(HELP_DIR)/tutorials
--- 211,215 ----
  #----------------------------------------------------------------------------
  # FLEXT
! 	
    cd ../../externals/grill/build/darwin && make 
    install -d $(HELP_DIR)/tutorials
***************
*** 348,352 ****
    install -d $(UNIX_DESTDIR)$(UNIX_prefix)
  # copy stuff to UNIX dirs
! 	cp -Rp $(DESTDIR)$(INSTALL_PREFIX)/bin \
    	$(DESTDIR)$(INSTALL_PREFIX)/include \
    	$(DESTDIR)$(INSTALL_PREFIX)/man \
--- 377,381 ----
    install -d $(UNIX_DESTDIR)$(UNIX_prefix)
  # copy stuff to UNIX dirs
! 	sudo cp -Rp $(DESTDIR)$(INSTALL_PREFIX)/bin \
    	$(DESTDIR)$(INSTALL_PREFIX)/include \
    	$(DESTDIR)$(INSTALL_PREFIX)/man \
***************
*** 379,386 ****
    	-d $(PWD)/Description.plist
  # generate .info file
! 	sed -e 's/PACKAGE_PREFIX/$(PACKAGE_PREFIX)/' pkg/pd.info \
! 		| sed -e 's/PACKAGE_VERSION/$(PACKAGE_VERSION)/' \
! 		| sed -e 's/PD_VERSION/$(PD_VERSION)/' \
! 		> $(UNIX_PACKAGE_NAME).pkg/Contents/Resources
  # install pkg docs
  #	sudo install -m 644 $(LICENSE_FILE) $(UNIX_PACKAGE_NAME).pkg/Contents/Resources
--- 408,415 ----
    	-d $(PWD)/Description.plist
  # generate .info file
! #	 sed -e 's/PACKAGE_PREFIX/$(PACKAGE_PREFIX)/' pkg/pd.info \
! #		| sed -e 's/PACKAGE_VERSION/$(PACKAGE_VERSION)/' \
! #		| sed -e 's/PD_VERSION/$(PD_VERSION)/' \
! #		> $(UNIX_PACKAGE_NAME).pkg/Contents/Resources
  # install pkg docs
  #	sudo install -m 644 $(LICENSE_FILE) $(UNIX_PACKAGE_NAME).pkg/Contents/Resources
***************
*** 417,418 ****
--- 446,448 ----
    -rm -f *~ 1 $(README_FILE) $(WELCOME_FILE) $(LICENSE_FILE) \
    	$(UNIX_PACKAGE_NAME).pkg  "$(DMG_NAME).dmg"
+ 	cd patches && ./unpatch