added double-clickers, cyclone, flext, nqpoly, noncvs, unauthorized

svn path=/trunk/; revision=1123

7 files changed, 105 insertions, 38 deletions

diff --git a/packages/darwin_pkg/BUGS b/packages/darwin_pkg/BUGS
index 96ac7ad7..05792ff4 100644
--- a/packages/darwin_pkg/BUGS
+++ b/packages/darwin_pkg/BUGS
@@ -1,12 +1,28 @@
 
-- zexy crashes with an error due to _z_wrap_setup
+- fix transparent file icon pd-file.icns
 
-- maxlib/unauthorized/etc. help files don't load properly
+- the .pkg names should probably not have the version in them. The installer
+  then doesn't recognize that it is upgrading a package, since the package
+  name is different.  This doesn't matter yet since an upgrade doesn't behave
+  any differently.
+
+- alt stops working?
+
+- shift sometimes does not work with multiple selections
+
+- right-click menu sometimes comes up about 10 pixels to the right of where
+  it should be.
+
+- many unauthorized externals don't work.  try -bundle_loader ../../../pd/bin/pd
+
+- "compute audio" checkbox only refreshes when you click on the Pd window
+
+------------------------------------------------------------------------------
+DONE?
 
 - The installer selects the System Disk by default as the disk to install
   to but it doesn't allow you to install there. You have to either click "Go
   Back" then "Continue" or click on another disk, then click on the System Disk.
 
-- the .pkg names should probably non have the version in them. The installer
-  then doesn't recognize that it is upgrading a package, since the package
-  name is different.
+- help files don't load properly (can't seem to find anymore broken ones)
+
diff --git a/packages/darwin_pkg/Makefile b/packages/darwin_pkg/Makefile
index fb409584..19ee6aa1 100644
--- a/packages/darwin_pkg/Makefile
+++ b/packages/darwin_pkg/Makefile
@@ -13,16 +13,24 @@ CYCLONE_RELEASE = $(shell grep CYCLONE_RELEASE ../externals/miXed/cyclone/build_
 CYCLONE_BUILD = $(shell grep CYCLONE_BUILD ../externals/miXed/cyclone/build_counter | cut -d ' ' -f 3 | cut -d '"' -f 2)
 CYCLONE_VERSION = $(CYCLONE_MAJOR_VERSION) $(CYCLONE_RELEASE) $(CYCLONE_BUILD)
 
+FLEXT_VERSION = $(shell grep PROJECT_NUMBER ../externals/grill/flext/flext.doxy | cut -d '"' -f2 | cut -d ' ' -f2)
+
 ZEXY_VERSION = $(shell grep VERSION ../externals/zexy/src/zexy.h | cut -d ' ' -f 3 | cut -d '"' -f 2)
 
 # various files
 
+
+DOUBLECLICKERS_VERSION = $(shell date +20%y.%m.%d)
+DOUBLECLICKERS_PREFIX = pd-double-clickers
+DOUBLECLICKERS_NAME =  $(DOUBLECLICKERS_PREFIX)-$(DOUBLECLICKERS_VERSION)
+
 PACKAGE_VERSION = $(shell date +20%y.%m.%d)
 PACKAGE_PREFIX = Pure Data
 PACKAGE_NAME = $(PACKAGE_PREFIX)
 
-DMG_PREFIX = Pure Data Installer
-DMG_NAME = $(DMG_PREFIX) $(PD_VERSION)-$(PACKAGE_VERSION)
+# needs to have no spaces for SourceForce
+DMG_PREFIX = PureDataInstaller
+DMG_NAME = $(DMG_PREFIX)_$(PD_VERSION)-$(PACKAGE_VERSION)
 
 WELCOME_FILE = Welcome.html
 README_FILE = ReadMe.html
@@ -30,26 +38,40 @@ INFO_FILE = $(PACKAGE_PREFIX).info
 
 clean: darwin_mpkg_clean
 	-cd ../pd/src && make clean
+	cd ../externals/miXed/cyclone && make clean
 	cd ../externals/build/darwin && make clean
+	cd ../externals/grill/build/darwin && make clean
+	cd ../externals/unauthorized && make clean
 	cd ../externals/zexy/src && make -f makefile.darwin clean
-	cd ../externals/miXed/cyclone && make clean
 	cd ../doc/pddp && make clean
-	cd ../externals/unauthorized && make clean
 	-cd ../externals/sprinkler && make distclean
+	cd ../nqpoly && make clean
 
 darwin_mpkg_clean:
 	-sudo rm -Rf installroot
 	-sudo rm -Rf "$(DMG_PREFIX)"*
 	-rm -f "$(README_FILE)" *.dmg *~
 	-cd ../pd/src && make darwin_pkg_clean
+	cd ../externals/miXed/cyclone && make darwin_pkg_clean
 	cd ../externals/build/darwin && make darwin_pkg_clean
+	cd ../externals/grill/build/darwin && make darwin_pkg_clean
+	cd ../externals/unauthorized && make darwin_pkg_clean
 	cd ../externals/zexy/src && make -f makefile.darwin darwin_pkg_clean
-	cd ../externals/miXed/cyclone && make darwin_pkg_clean
 	cd ../doc/  && make darwin_pkg_clean
 	cd ../doc/pddp  && make darwin_pkg_clean
-	cd ../externals/unauthorized && make darwin_pkg_clean
 	cd ../abstractions && make darwin_pkg_clean
-	cd noncvs && make darwin_pkg_clean
+# don't fail on these since they aren't in CVS
+	-cd noncvs && make darwin_pkg_clean
+	-cd ../nqpoly && make darwin_pkg_clean
+
+# this gets the files you need and puts them in the 
+# right places for this Makefile to find them.  You 
+# might want to use a different version of Pd.
+checkout:
+	cd .. && cvs co pd
+	cd .. && cvs co externals
+	cd .. && cvs co doc
+	cd .. && cvs co abstractions
 
 darwin_mpkg_welcome:
 	echo "<HTML><BODY><P><P>" > $(WELCOME_FILE)
@@ -61,6 +83,14 @@ darwin_mpkg_welcome:
 	echo "</FONT>" >> $(WELCOME_FILE)
 	echo "</BODY></HTML>" >> $(WELCOME_FILE)
 
+darwin_mpkg_license:
+  # generate HTML version of License
+	echo "<HTML><BODY>" > License.html
+	echo "<H5>(Parts of this package can be used under the Pd/BSD license.)</H5>" >> License.html
+	echo "<FONT SIZE=\"-1\">" >> License.html
+	cat ../externals/creb/COPYING | sed -e 's/^$$/\<P\>/g' >> License.html	
+	echo "</FONT></BODY></HTML>" >> License.html
+
 darwin_mpkg_readme:
 	echo $(CYCLONE_RELEASE)
 	-rm $(README_FILE)
@@ -73,6 +103,7 @@ darwin_mpkg_readme:
 	echo "<UL>" >> $(README_FILE)
 	echo "<LI>pure data: $(PD_VERSION) " >> $(README_FILE)
 	echo "<LI>cyclone: $(CYCLONE_VERSION)" >> $(README_FILE)
+	echo "<LI>flext: $(FLEXT_VERSION)" >> $(README_FILE)
 	echo "<LI>pd-abstractions: `date +20%y.%m.%d`" >> $(README_FILE)
 	echo "<LI>pd-doc: `date +20%y.%m.%d`" >> $(README_FILE)
 	echo "<LI>pd-externals: `date +20%y.%m.%d`" >> $(README_FILE)
@@ -83,38 +114,53 @@ darwin_mpkg_readme:
 	echo "(this package was built on `date`) <BR>" >> $(README_FILE)
 	echo "</BODY></HTML>" >> $(README_FILE)
 
-
-darwin_mpkg: darwin_mpkg_readme darwin_mpkg_welcome
+darwin_mpkg: darwin_mpkg_readme darwin_mpkg_license darwin_mpkg_welcome
 	test -d installroot/Packages || mkdir -p installroot/Packages
 	test -d "installroot/$(PACKAGE_NAME).mpkg/Contents/Resources" \
 		|| mkdir -p "installroot/$(PACKAGE_NAME).mpkg/Contents/Resources"
+##############################
+# MAKE PACKAGES
+#
 # pd
 	cd ../pd/src && ./configure && make darwin_pkg
 	sudo cp -R ../pd/pd-*.pkg installroot/Packages
-# pd-externals
+# cyclone
+	cd ../externals/miXed/cyclone && make darwin_pkg
+	sudo cp -R ../externals/miXed/cyclone/pd-*.pkg installroot/Packages
+# 'externals'
 	cd ../externals/build/darwin && make darwin_pkg
 	sudo cp -R ../externals/build/darwin/pd-externals*.pkg installroot/Packages
+# flext
+	cd ../externals/grill/build/darwin && make darwin_pkg
+	sudo cp -R ../externals/grill/build/darwin/pd-*.pkg installroot/Packages
+# unauthorized
+	cd ../externals/unauthorized && make darwin_pkg
+	sudo cp -R ../externals/unauthorized/pd-unauthorized*.pkg installroot/Packages
 # zexy
 	cd ../externals/zexy/src && make -f makefile.darwin darwin_pkg
 	sudo cp -R ../externals/zexy/src/pd-zexy*.pkg installroot/Packages
-# cyclone
-	cd ../externals/miXed/cyclone && make darwin_pkg
-	sudo cp -R ../externals/miXed/cyclone/pd-cyclone*.pkg installroot/Packages
 # pd-abstractions
 	cd ../abstractions/  && make darwin_pkg
 	sudo cp -R ../abstractions/pd-abstractions*.pkg installroot/Packages
 # pd-doc
 	cd ../doc/  && make darwin_pkg
 	sudo cp -R ../doc/pd-doc*.pkg installroot/Packages
-# pd-noncvs
-	cd noncvs && make darwin_pkg
-	sudo cp -R noncvs/pd-noncvs*.pkg installroot/Packages
 # pddp
 	cd ../doc/pddp  && make darwin_pkg
 	sudo cp -R ../doc/pddp/pd-pddp*.pkg installroot/Packages
-# unauthorized
-	cd ../externals/unauthorized && make darwin_pkg
-	sudo cp -R ../externals/unauthorized/pd-unauthorized*.pkg installroot/Packages
+# double-clickers
+	cd double-clickers && make darwin_pkg
+	sudo cp -R double-clickers/pd-*.pkg installroot/Packages
+# don't fail on these since they aren't in CVS
+# pd-noncvs
+	-cd noncvs && make darwin_pkg
+	-sudo cp -R noncvs/pd-noncvs*.pkg installroot/Packages
+# nqpoly
+	-cd ../nqpoly && make darwin_pkg
+	-sudo cp -R ../nqpoly/pd-*.pkg installroot/Packages
+##############################
+# MAKE MPKG
+#
 # generate pd.list
 	cd installroot/Packages && /bin/ls -1d *.pkg \
 		| sed -e 's/\(.*\)/\1\:Selected/' \
@@ -137,7 +183,7 @@ darwin_mpkg: darwin_mpkg_readme darwin_mpkg_welcome
 # install files
 	install -m644 ../pd/LICENSE.txt "installroot/PD LICENSE.txt"
 	install -m644 ../externals/creb/COPYING "installroot/GNU GPL.txt"
-	install -m644 $(README_FILE) $(WELCOME_FILE) \
+	install -m644 $(README_FILE) $(WELCOME_FILE) Licence.html \
 		logo.jpg pd-32.png pd-16.png \
 		background.tiff \
 		"installroot/$(PACKAGE_NAME).mpkg/Contents/Resources/"
@@ -146,7 +192,7 @@ darwin_mpkg: darwin_mpkg_readme darwin_mpkg_welcome
 	sudo chmod -R go-w installroot
 	sudo chgrp -R staff installroot
 
-dmg: darwin_mpkg_clean darwin_mpkg
+dmg: 
 	mv installroot "$(DMG_NAME)"
 	/bin/sh mkdmg "$(DMG_NAME)"
 
diff --git a/packages/darwin_pkg/README b/packages/darwin_pkg/README
index 9cc60934..b88c7928 100644
--- a/packages/darwin_pkg/README
+++ b/packages/darwin_pkg/README
@@ -33,6 +33,7 @@ The recommended way to do this is:
 	 mkdir pure-data && cd pure-data
 	 setenv CVSROOT :pserver:anonymous@cvs.sourceforge.net:/cvsroot/pure-data
 	 tar xzf pd-0.37.tar.gz (or cvs checkout -r devel_0_37 pd )
+	 ln -s pd-0.37.0 pd
 	 cvs checkout darwin-pkg
 	 cvs checkout doc
 	 cvs checkout externals
@@ -45,4 +46,7 @@ that is the same minor version as the one you are compiling into the package
 
 -bundle_loader /usr/local/bin/pd
 
+This should probably be changed to be a relative path so that you can use the
+pd version that you are compiling to link with.
+
   - Hans-Christoph Steiner <hans@eds.org>
diff --git a/packages/darwin_pkg/background.tiff b/packages/darwin_pkg/background.tiff
index 6f5c51f3..598f7deb 100644
--- a/packages/darwin_pkg/background.tiff
+++ b/packages/darwin_pkg/background.tiff
diff --git a/packages/darwin_pkg/installer.pd b/packages/darwin_pkg/installer.pd
index f4d850bd..b9ecd77d 100644
--- a/packages/darwin_pkg/installer.pd
+++ b/packages/darwin_pkg/installer.pd
@@ -1,6 +1,6 @@
-#N canvas 235 178 661 452 10;
+#N canvas 235 178 665 456 10;
 #X obj 61 208 route 1 2 3 4 5 6;
-#X obj 18 34 vradio 22 1 0 7 empty empty empty 0 -6 0 8 -262144 -1
+#X obj 18 33 vradio 22 1 0 7 empty empty empty 0 -6 0 8 -262144 -1
 -1 0;
 #X obj 31 228 stage;
 #X obj 31 342 stage;
@@ -12,14 +12,14 @@
 #X msg 533 373 \; --------------;
 #X msg 427 373 \; --------------;
 #X obj 98 392 install;
-#X obj 39 36 delay 11111;
-#X obj 39 58 delay 111;
-#X obj 39 80 delay 1;
-#X obj 39 102 delay 1.11111e+09;
-#X obj 39 146 delay 11;
+#X obj 39 34 delay 11111;
+#X obj 39 56 delay 111;
+#X obj 39 78 delay 1;
+#X obj 39 101 delay 1.11111e+09;
+#X obj 39 145 delay 11;
 #X obj 39 168 delay 1111;
-#X obj 39 124 delay 1.1111e+08;
-#X obj 39 8 loadbang;
+#X obj 39 123 delay 1.1111e+08;
+#X obj 39 7 loadbang;
 #X obj 77 366 tabread array;
 #X msg 191 374 \; -----------------------------;
 #X connect 0 0 2 1;
diff --git a/packages/darwin_pkg/noncvs/Makefile b/packages/darwin_pkg/noncvs/Makefile
index 7a7547f9..f05daf0b 100644
--- a/packages/darwin_pkg/noncvs/Makefile
+++ b/packages/darwin_pkg/noncvs/Makefile
@@ -13,7 +13,7 @@ INFO_FILE = $(PKG_NAME).info
 clean: darwin_pkg_clean
 
 darwin_pkg_clean:
-	-sudo rm -Rf installroot $(PKG_NAME)*
+	-sudo rm -Rf installroot $(PKG_NAME)* *.pkg
 	-rm -f *~ 1
 
 # install into MSP's default: /usr/local/lib
diff --git a/packages/darwin_pkg/pdrc-parser.pl b/packages/darwin_pkg/pdrc-parser.pl
index 6bc0ac6d..cb034c35 100755
--- a/packages/darwin_pkg/pdrc-parser.pl
+++ b/packages/darwin_pkg/pdrc-parser.pl
@@ -48,9 +48,10 @@ if ( -d $ENV{'HOME'} ) {
 				 "-lib iem_mp3",
 				 "-lib iem_t3_lib",
 				 "-lib pdp",
+				 "-lib xsample",
 				 "-lib zexy",
-				 "$EXTERNALS",
-				 "$HELP"
+				 "-path $EXTERNALS",
+				 "-helppath $HELP"
 				 );
 	 
 	 foreach $line (@pdrc) {