Update of /cvsroot/pure-data/packages/darwin_app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30976
Modified Files: Makefile README TODO Log Message: removed jack compilation; added lots of abstractions and objects writen in Pd
Index: README =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/README,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** README 19 Apr 2005 05:04:56 -0000 1.3 --- README 3 Jun 2005 20:28:25 -0000 1.4 *************** *** 5,10 **** Since currently, only Miller has commit permissions to the 'pd' section of the CVS, the fixes necessary for building the whole Pd.app are included in ! 'packages/darwin_app/patches'. The necessary patches are automatically applied ! by 'packages/darwin_app/Makefile' before building the sources in 'pd/src'
--- 5,10 ---- Since currently, only Miller has commit permissions to the 'pd' section of the CVS, the fixes necessary for building the whole Pd.app are included in ! 'packages/darwin_app/patches'. The patches can be applied by running "make ! darwin_patch_pd" or unpatched using "make darwin_unpatch_pd".
*************** *** 21,25 **** 1. download TclTkAquaStandalone-8.4.*.dmg from http://tcltkaqua.sourceforge.net/ (I used 8.4.9) ! 2. mount the dmg manually or put TclTkAquaStandalone-8.4.*.dmg in packages/darwin_app and it will be automatically mounted 3. the Makefile will find what it needs in the mounted .dmg --- 21,25 ---- 1. download TclTkAquaStandalone-8.4.*.dmg from http://tcltkaqua.sourceforge.net/ (I used 8.4.9) ! 2. mount the dmg manually, or, put TclTkAquaStandalone-8.4.*.dmg in packages/darwin_app and it will be automatically mounted 3. the Makefile will find what it needs in the mounted .dmg *************** *** 34,37 **** --- 34,41 ---- ______________________________
+ Jack is optional. The current linking method causes the resulting binary to + require the Jack.framework to start whether or not you are using Jack. + Ideally with would be fixed... + 1. download latest JackOSX from http://www.jackosx.com/download.html (I used version 0.6.1) *************** *** 47,50 **** --- 51,61 ---- cvs co externals cvs co packages + + either get Pd core from CVS: + cvs co pd + + or untar a tarball: + tar xzf pd-0.38-4.src.tar.gz + ln -s pd-0.38-4 pd ______________________________
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile 22 May 2005 06:04:56 -0000 1.10 --- Makefile 3 Jun 2005 20:28:25 -0000 1.11 *************** *** 28,36 **** PD_MINOR_VERSION = $(shell /usr/bin/grep 'Pd version' ../../pd/src/s_main.c | /usr/bin/cut -d '\' -f 1 | /usr/bin/cut -d ' ' -f 6 | /usr/bin/cut -d '.' -f 2) PD_BUGFIX_VERSION = $(shell /usr/bin/grep 'Pd version' ../../pd/src/s_main.c | /usr/bin/cut -d '\' -f 1 | /usr/bin/cut -d ' ' -f 6 | /usr/bin/cut -d '.' -f 3) ! PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION)
# release version for this distro ! PACKAGE_VERSION = hcs0 ! PACKAGE_NAME = pd-$(PD_VERSION)-$(PACKAGE_VERSION) DMG_NAME = $(PACKAGE_NAME)
--- 28,36 ---- PD_MINOR_VERSION = $(shell /usr/bin/grep 'Pd version' ../../pd/src/s_main.c | /usr/bin/cut -d '\' -f 1 | /usr/bin/cut -d ' ' -f 6 | /usr/bin/cut -d '.' -f 2) PD_BUGFIX_VERSION = $(shell /usr/bin/grep 'Pd version' ../../pd/src/s_main.c | /usr/bin/cut -d '\' -f 1 | /usr/bin/cut -d ' ' -f 6 | /usr/bin/cut -d '.' -f 3) ! PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION)-$(PD_BUGFIX_VERSION)
# release version for this distro ! PACKAGE_VERSION = extended-RC1 ! PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION) DMG_NAME = $(PACKAGE_NAME)
*************** *** 60,64 **** MAXLIB_VERSION = $(shell grep "define VERSION" ../../externals/maxlib/maxlib.c | cut -d '"' -f 2)
! OSC_VERSION = $(shell grep "define VERSION" ../../externals/OSCx/OSC.c | cut -d '"' -f 2)
PDP_VERSION = $(shell grep PDP_VERSION= ../../externals/pdp/configure | cut -d '=' -f 2) --- 60,64 ---- MAXLIB_VERSION = $(shell grep "define VERSION" ../../externals/maxlib/maxlib.c | cut -d '"' -f 2)
! OSC_VERSION = $(shell grep "define VERSION" ../../externals/OSCx/src/OSC.c | cut -d '"' -f 2)
PDP_VERSION = $(shell grep PDP_VERSION= ../../externals/pdp/configure | cut -d '=' -f 2) *************** *** 80,84 **** # Pd.app in installroot/Applications/Pd.app darwin_prebuilt_app: darwin_app_externals darwin_app_docs \ ! darwin_app_abstractions darwin_app_doc_format
darwin_app_license: --- 80,84 ---- # Pd.app in installroot/Applications/Pd.app darwin_prebuilt_app: darwin_app_externals darwin_app_docs \ ! darwin_app_abstractions darwin_app_doc_format darwin_app_noncvs
darwin_app_license: *************** *** 146,150 **** # http://cvs.sourceforge.net/viewcvs.py/tkcvs/tkcvs-proj/PackApp?rev=1.4 darwin_app_wrapper: ! -hdiutil mount $(TCLTK).dmg # copy Wish Shell.app from default install location # note: use the "standalone" Wish shell to make a "standalone" pd app --- 146,150 ---- # http://cvs.sourceforge.net/viewcvs.py/tkcvs/tkcvs-proj/PackApp?rev=1.4 darwin_app_wrapper: ! 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 *************** *** 173,176 **** --- 173,177 ---- # cd ../../pd/src/ && patch -p0 < ../../packages/darwin_app/patches/u_main.tk.patch cd ../../pd/src/ && patch -p0 < ../../packages/darwin_app/patches/darwin_build-0.38.patch + cd ../../pd/src/ && patch -p0 < ../../packages/darwin_app/patches/extended-help-menu.patch rm ../../pd/src/configure ../../pd/src/makefile cd ../../pd/src/ && autoconf *************** *** 178,184 **** darwin_app_core: darwin_app_wrapper # pd core ! # cd ../../pd/src/ && \ ! # ./configure --enable-jack --prefix=$(INSTALL_PREFIX) && make ! cd ../../pd/src/ && ./configure --enable-jack && make cp -Rp ../../pd/bin ../../pd/doc ../../pd/extra ../../pd/man \ $(PD_FILE_ROOT) --- 179,183 ---- darwin_app_core: darwin_app_wrapper # pd core ! cd ../../pd/src/ && ./configure && make cp -Rp ../../pd/bin ../../pd/doc ../../pd/extra ../../pd/man \ $(PD_FILE_ROOT) *************** *** 242,252 **** # ABSTRACTIONS install -d $(ABSTRACTIONS_DIR) ! # creb ! install -p -m0444 ../../externals/creb/abs/*.pd $(ABSTRACTIONS_DIR) ! cd $(ABSTRACTIONS_DIR) && rm -f count.pd ! install -d $(ABSTRACTIONS_DIR)/creb ! install -p -m0444 ../../externals/creb/doc/examples/*.* $(ABSTRACTIONS_DIR)/creb
- # cp -Rf footils timestretch vadsr~ $(ABSTRACTIONS_DIR)
darwin_app_externals: darwin_app_externals_standard darwin_app_externals_c++ --- 241,288 ---- # ABSTRACTIONS install -d $(ABSTRACTIONS_DIR) ! # audionerd ! cp -Rp ../../abstractions/audionerd $(ABSTRACTIONS_DIR) ! # footils ! cp -Rp ../../abstractions/footils $(ABSTRACTIONS_DIR) ! # keyboardkeys ! cp -Rp ../../abstractions/keyboardkeys $(ABSTRACTIONS_DIR) ! #---------------------------------------------------------------------------- ! # EXTERNALS written in Pd ! # RRADical ! cp -Rp ../../abstractions/rradical $(EXTERNALS_DIR) ! cp -Rp ../../abstractions/rradical/doc $(HELP_DIR)/rradical ! # footils ! install -p ../../abstractions/footils/softtakeover/sto-help.pd \ ! $(HELP_DIR)/5.reference ! install -p ../../abstractions/footils/softtakeover/sto.pd $(EXTERNALS_DIR) ! # fft_convolution ! install -p ../../abstractions/fft_convolution/*-help.pd \ ! $(HELP_DIR)/5.reference ! install -p -m0644 $(shell ls -1 ../../abstractions/fft_convolution/*.pd | \ ! grep -v '-help.pd') $(EXTERNALS_DIR) ! # La-kitchen ! install -d $(HELP_DIR)/5.reference/La-kitchen ! install -p ../../abstractions/La-kitchen/*-help.pd \ ! $(HELP_DIR)/5.reference/La-kitchen ! install -d $(EXTERNALS_DIR)/La-kitchen ! install -p -m0644 $(shell ls -1 ../../abstractions/La-kitchen/*.pd | \ ! grep -v '-help.pd') $(EXTERNALS_DIR)/La-kitchen ! # nusmuk ! install -d $(HELP_DIR)/5.reference/nusmuk ! install -p ../../abstractions/nusmuk/*-help.pd \ ! $(HELP_DIR)/5.reference/nusmuk ! install -d $(EXTERNALS_DIR)/nusmuk ! install -p -m0644 $(shell ls -1 ../../abstractions/nusmuk/*.pd | \ ! grep -v '-help.pd') $(EXTERNALS_DIR)/nusmuk ! # timestretch~ ! install -p ../../abstractions/timestretch/*-help.pd \ ! $(HELP_DIR)/5.reference ! install -p -m0644 $(shell ls -1 ../../abstractions/timestretch/*.pd | \ ! grep -v '-help.pd') $(EXTERNALS_DIR) ! # vadsr~ ! install -p ../../abstractions/vadsr~/vadsr-test.pd \ ! $(HELP_DIR)/5.reference/vadsr~-help.pd ! install -p ../../abstractions/vadsr~/vadsr~.pd $(EXTERNALS_DIR)
darwin_app_externals: darwin_app_externals_standard darwin_app_externals_c++ *************** *** 340,343 **** --- 376,385 ---- install -d $(EXTERNALS_DIR) install -p -m0644 ../../externals/build/darwin/*.pd_darwin $(EXTERNALS_DIR) + # creb + install -d $(EXTERNALS_DIR)/creb + install -p -m0644 ../../externals/creb/abs/*.pd $(EXTERNALS_DIR)/creb + install -d $(HELP_DIR)/5.reference/creb + install -p -m0644 ../../externals/creb/doc/examples/*.* \ + $(HELP_DIR)/5.reference/creb #---------------------------------------------------------------------------- # GEM *************** *** 350,364 **** #---------------------------------------------------------------------------- # hcs ! install -p -m0444 $(shell ls -1 ../../externals/hcs/*.pd | \ grep -v '-help.pd') $(EXTERNALS_DIR) # hid cd ../../externals/hcs/hid && make ! install -p -m0444 ../../externals/hcs/hid/hid.pd_darwin $(EXTERNALS_DIR) ! install -p -m0444 $(shell ls -1 ../../externals/hcs/hid/*.pd | \ grep -v '-help.pd'| grep -v '-list.pd') $(EXTERNALS_DIR) # general ! install -p -m0444 ../../externals/hcs/general/*.pd $(EXTERNALS_DIR) # pan ! install -p -m0444 $(shell ls -1 ../../externals/hcs/pan/*.pd | \ grep -v '-help.pd') $(EXTERNALS_DIR) #---------------------------------------------------------------------------- --- 392,406 ---- #---------------------------------------------------------------------------- # hcs ! install -p -m0644 $(shell ls -1 ../../externals/hcs/*.pd | \ grep -v '-help.pd') $(EXTERNALS_DIR) # hid cd ../../externals/hcs/hid && make ! install -p -m0644 ../../externals/hcs/hid/hid.pd_darwin $(EXTERNALS_DIR) ! install -p -m0644 $(shell ls -1 ../../externals/hcs/hid/*.pd | \ grep -v '-help.pd'| grep -v '-list.pd') $(EXTERNALS_DIR) # general ! install -p -m0644 ../../externals/hcs/general/*.pd $(EXTERNALS_DIR) # pan ! install -p -m0644 $(shell ls -1 ../../externals/hcs/pan/*.pd | \ grep -v '-help.pd') $(EXTERNALS_DIR) #---------------------------------------------------------------------------- *************** *** 477,497 ****
! #darwin_unix_pkg_welcome: ! # echo "<html><body><p><p>" > $(WELCOME_FILE) ! # echo "<CENTER><IMG SRC="logo.jpg">" >> $(WELCOME_FILE) ! # echo "<h2>Version $(PD_VERSION)</h2>" >> $(WELCOME_FILE) ! # echo "<p>written by Miller S. Puckette</p></CENTER>" >> $(WELCOME_FILE) ! # echo "<FONT SIZE="-1">" >> $(WELCOME_FILE) ! # echo "<p>`grep -A9 ACKNOWLEDG ../../pd/README.txt`</p>" >> $(WELCOME_FILE) ! # echo "</FONT>" >> $(WELCOME_FILE) ! # echo "</body></html>" >> $(WELCOME_FILE)
darwin_app_perms: chmod a-x $(HELP_DIR)/*/*.pd $(HELP_DIR)/*/*/*.pd $(HELP_DIR)/*/*/*/*.pd chmod -R a-w $(HELP_DIR)
! dmg: darwin_app_readme darwin_unix_pkg_welcome darwin_app_license install -d "$(DMG_NAME)" ! cd $(DESTDIR)/Applications && mv $(PD_APP_NAME).app "../../$(DMG_NAME)" install -p -m0444 ../../pd/LICENSE.txt "$(DMG_NAME)/PD LICENSE.txt" install -p -m0444 $(LICENSE_FILE) $(README_FILE) \ --- 519,549 ----
! darwin_unix_pkg_welcome: ! echo "<html><body><p><p>" > $(WELCOME_FILE) ! echo "<CENTER><IMG SRC="logo.jpg">" >> $(WELCOME_FILE) ! echo "<h2>Version $(PD_VERSION)</h2>" >> $(WELCOME_FILE) ! echo "<p>written by Miller S. Puckette</p></CENTER>" >> $(WELCOME_FILE) ! echo "<FONT SIZE="-1">" >> $(WELCOME_FILE) ! echo "<p>`grep -A9 ACKNOWLEDG ../../pd/README.txt`</p>" >> $(WELCOME_FILE) ! echo "</FONT>" >> $(WELCOME_FILE) ! echo "</body></html>" >> $(WELCOME_FILE) ! ! darwin_app_noncvs: ! test -d noncvs/doc/5.reference && \ ! install -p -m0644 noncvs/doc/5.reference/*.* $(HELP_DIR)/5.reference ! test -d noncvs/extra && \ ! install -p -m0644 noncvs/extra/*.* $(EXTERNALS_DIR) ! cp -Rp noncvs/doc/serendipd $(HELP_DIR)
darwin_app_perms: chmod a-x $(HELP_DIR)/*/*.pd $(HELP_DIR)/*/*/*.pd $(HELP_DIR)/*/*/*/*.pd chmod -R a-w $(HELP_DIR) + # serendiPd shared patch + chmod a+w $(HELP_DIR)/serendipd/*shared_patch.pd
! dmg: darwin_app_readme darwin_unix_pkg_welcome darwin_app_license darwin_app_perms install -d "$(DMG_NAME)" ! cd $(DESTDIR)/Applications && mv $(PD_APP_NAME).app \ ! "../../$(DMG_NAME)/$(DMG_NAME).app" install -p -m0444 ../../pd/LICENSE.txt "$(DMG_NAME)/PD LICENSE.txt" install -p -m0444 $(LICENSE_FILE) $(README_FILE) \ *************** *** 510,513 **** --- 562,566 ---- darwin_unpatch_pd: cd ../../pd/src/ && patch -R -p0 < ../../packages/darwin_app/patches/darwin_build-0.38.patch + cd ../../pd/src/ && patch -R -p0 < ../../packages/darwin_app/patches/extended-help-menu.patch
darwin_app_externals_standard_clean:
Index: TODO =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/TODO,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TODO 19 Apr 2005 05:04:56 -0000 1.5 --- TODO 3 Jun 2005 20:28:25 -0000 1.6 *************** *** 1,3 **** --- 1,5 ----
+ - fixed Pd.app file associations + - create old-style Help->Pure Documentation link on Help menu. It should use a symlink to the "doc" dir internal to that particular Pd.app. The symlink is *************** *** 7,13 **** - make Help menu generator recursive
- - check up on zexy in packages/darwin_app/Makefile and - externals/build/doc/makefile now that its been added to the build system - - follow AppMain.tcl instructions: http://wiki.tcl.tk/12987 --- 9,12 ---- *************** *** 40,46 **** - make Cmd-H and Alt-Cmd-H work when the Alt key is spec'ed
- - write sed script to set help-patch font size to 10 point from 12 point on - all help patches. - - create --enable-cpu and --enable-arch in pd/src/configure.in
--- 39,42 ---- *************** *** 50,52 **** __gnu_linux__) while I am at it
! - add context to all patches --- 46,48 ---- __gnu_linux__) while I am at it
! - add context (diff -u) to all patches