preparing for RC6, bug fixes and tweaks, things are look ing good

svn path=/trunk/; revision=4086
author: Hans-Christoph Steiner <eighthave@users.sourceforge.net> 2005-11-30 07:03:19 +0000
committer: Hans-Christoph Steiner <eighthave@users.sourceforge.net> 2005-11-30 07:03:19 +0000
commit: 9cf2c9d4f466dfd9ae81bdae9aace2effbe5a5e5 (patch)
tree: 1db59bfe2e2c4eedca51c33c94448114ae649d0f /packages
parent: f7d28b65ad3287d8157c914f24e4003b8d5739b7 (diff)
6 files changed, 54 insertions, 29 deletions
diff --git a/packages/Makefile b/packages/Makefile
index b149cc43..0bad98cc 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -395,29 +395,34 @@ LICENSE_FILE = $(manualsdir)/$(PD_NAME)/License.html
 license_install:
   # generate HTML version of License
 	install -d $(manualsdir)/$(PD_NAME)
+	-rm $(LICENSE_FILE)
 	touch $(LICENSE_FILE)
 	echo "<html><body>" >> "$(LICENSE_FILE)"
 	echo "<h3>(Parts of this package can be used under " >> "$(LICENSE_FILE)"
-	echo "<a href="PD%20LICENSE.txt">Pd&quot;s BSD license</a>)</h3>" >> "$(LICENSE_FILE)"
+	echo "<a href="Pd-LICENSE.txt">Pd&quot;s BSD license</a>)</h3>" >> "$(LICENSE_FILE)"
 	echo "<font size=\"-1\">" >> "$(LICENSE_FILE)"
 	cat "$(externals_src)/creb/COPYING" | sed -e 's/^$$/\<P\>/g' >> "$(LICENSE_FILE)"
 	echo "</font></body></html>" >> $(LICENSE_FILE)
 # Pd's license file
-	install -p "$(pd_src)/LICENSE.txt" "$(manualsdir)/$(PD_NAME)/PD LICENSE.txt"
+	install -p "$(pd_src)/LICENSE.txt" "$(manualsdir)/$(PD_NAME)/Pd-LICENSE.txt"
 
 
 
 WELCOME_FILE = $(manualsdir)/$(PD_NAME)/Welcome.html
 welcome_install:
 	install -d $(manualsdir)/$(PD_NAME)
+	-rm $(WELCOME_FILE)
 	touch $(WELCOME_FILE)
-	echo "<html><body><p><p>" >> $(WELCOME_FILE)
-	echo "<CENTER><IMG SRC=\"logo.jpg\">" >> $(WELCOME_FILE)
+	echo "<html><head>" >> $(WELCOME_FILE)
+	echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"http://puredata.org/ploneCustom.css\" />" >> $(README_FILE)
+	echo "</head>" >> $(README_FILE)
+	echo "<body><p><p>" >> $(WELCOME_FILE)
+	echo "<center><img src=\"\">" >> $(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>written by Miller S. Puckette</p></center>" >> $(WELCOME_FILE)
+	echo "<font size=\"-1\">" >> $(WELCOME_FILE)
 	echo "<p>`grep -A9 ACKNOWLEDG $(pd_src)/README.txt`</p>" >> $(WELCOME_FILE)
-	echo "</FONT>" >> $(WELCOME_FILE)
+	echo "</font>" >> $(WELCOME_FILE)
 	echo "</body></html>" >> $(WELCOME_FILE)
 
 
@@ -431,14 +436,26 @@ readme_install:
 	echo "<html>" >> $(README_FILE)
 	echo "<head>" >> $(README_FILE)
 	echo "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\" />" >> $(README_FILE)
+	echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"http://puredata.org/plone.css\" />" >> $(README_FILE)
 	echo "</head>" >> $(README_FILE)
 	echo "<body>" >> $(README_FILE)
 	echo "<h2>Pure Data $(PD_VERSION)-$(PACKAGE_VERSION)</h2>" 	>> $(README_FILE)
 	echo "<p>Pd is a free real-time computer music software package resembling Max.  It provides a patchable environment for audio analysis, synthesis, and processing, with a rich set of multimedia capabilities.  You can get Pd for Linux, Windows, MacOS X, BSD, or IRIX.</p>" >> $(README_FILE)
 	echo "<p>For more information, go to: <a href=\"http://puredata.org\" target=\"pd\">http://puredata.org</a></p>" >> $(README_FILE)
 	echo "<h3>Installation</h3>" >> $(README_FILE)	
+	echo "<dl><dt>GNU/Linux</dt><dd>" >> $(README_FILE)
+	echo "<p></p>" >> $(README_FILE)
+	echo "<p></p>" >> $(README_FILE)
+	echo "</dd><dt>Mac OS X</dt>" >> $(README_FILE)
+	echo "<dd>" >> $(README_FILE)
 	echo "<p>To install Pd, drag the Pd.app to anywhere in your hard disk.</p>" >> $(README_FILE)	
 	echo "<p>To install Gem, pmpd, xsample, dyn~, and vasp support, copy <code>org.puredata.pd.plist</code> to <code>~/Library/Preferences</code> (<code>~</code> means your home folder).  WARNING: this will overwrite any existing Pd preferences!</p>" >> $(README_FILE)	
+	echo "</dd>" >> $(README_FILE)
+	echo "<dt>Windows</dt><dd>" >> $(README_FILE)
+	echo "<p>To install, run the installer.</p>" >> $(README_FILE)
+	echo "<p>To make sure that all of the libraries are loaded when Pd runs, " >> $(README_FILE)
+	echo "double-click <code>C:\Program Files\pd\pd-settings.reg</code> to import the settings to the registry.</p>" >> $(README_FILE)
+	echo "</dd></dl>" >> $(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:
 	curl 'http://sourceforge.net/project/memberlist.php?group_id=55736' | grep -A2 -e '<td>' | sed 's|\(href="\)|target="w" \1http://sourceforge.net|' >> $(README_FILE)
@@ -448,7 +465,7 @@ readme_install:
 	echo "</p>" >> $(README_FILE)
 	echo "<h3>License</h3>" >> $(README_FILE)	
 	echo "<p>" >> $(README_FILE)
-	echo "The Pd core is licensed under a <a href="PD%20LICENSE.txt">BSD license</a>, almost every other part of this package is available under the <a href="http://www.gnu.org/copyleft/gpl.html" target="gpl">GNU GPL</a>.  A couple packages have BSD-style licenses too." >> $(README_FILE)
+	echo "The Pd core is licensed under a <a href="Pd-LICENSE.txt">BSD license</a>, almost every other part of this package is available under the <a href="http://www.gnu.org/copyleft/gpl.html" target="gpl">GNU GPL</a>.  A couple packages have BSD-style licenses too." >> $(README_FILE)
 	echo "</p>" >> $(README_FILE)
 	echo "<h3>Included Versions</h3>" >> $(README_FILE)	
 	echo "<p>These externals are all included from the Pd CVS repository:</p>" >> $(README_FILE)
diff --git a/packages/Makefile.buildlayout b/packages/Makefile.buildlayout
index 5bc5f28b..6a2dab6d 100644
--- a/packages/Makefile.buildlayout
+++ b/packages/Makefile.buildlayout
@@ -40,7 +40,6 @@ UNAME := $(shell uname -s)
 ifeq ($(UNAME),Linux)
   OS_NAME = linux
   EXTENSION = pd_linux
-  prefix = /usr/local
 else 
   ifeq ($(UNAME),Darwin)
     OS_NAME = darwin
@@ -150,7 +149,7 @@ PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION)
 
 
 # release version for this distro
-PACKAGE_VERSION = extended-RC5
+PACKAGE_VERSION = extended-RC6
 PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION)
 
 
diff --git a/packages/TODO b/packages/TODO
index 7fe8857c..7c454300 100644
--- a/packages/TODO
+++ b/packages/TODO
@@ -1,4 +1,6 @@
 
+- document generate-libdir-metafile.sh
+
 - move darwin_app_perms to here and make generic prerelease_clean target which
   is called separately
 
diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile
index 3039ab77..4f6cb658 100644
--- a/packages/darwin_app/Makefile
+++ b/packages/darwin_app/Makefile
@@ -145,8 +145,11 @@ DMG_NAME = $(PACKAGE_NAME)
 dmg: darwin_app_perms
 	install -d "$(CWD)/$(DMG_NAME)"
 	cd $(BUILD_BASE) && mv $(PD_APP_NAME).app "$(CWD)/$(DMG_NAME)/"
-#	install -p -m0444 $(manualsdir)/$(PD_NAME)/PD\ LICENSE.txt \
-#		$(manualsdir)/*.html "$(CWD)/$(DMG_NAME)"
+	install -p -m0444 $(manualsdir)/Pd/Pd-LICENSE.txt \
+		$(manualsdir)/Pd/License.html \
+		$(manualsdir)/Pd/Welcome.html \
+		$(manualsdir)/Pd/ReadMe.html \
+		"$(CWD)/$(DMG_NAME)"
 	install -p -m0444 org.puredata.pd.plist "$(CWD)/$(DMG_NAME)"
 	cd $(CWD) && /bin/sh mkdmg "$(DMG_NAME)"
 
diff --git a/packages/darwin_app/org.puredata.pd.plist b/packages/darwin_app/org.puredata.pd.plist
index 0f3370c1..f1a415bb 100644
--- a/packages/darwin_app/org.puredata.pd.plist
+++ b/packages/darwin_app/org.puredata.pd.plist
@@ -2,25 +2,33 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>standardpath</key>
+	<string>1</string>
 	<key>loadlib1</key>
 	<string>Gem</string>
 	<key>loadlib2</key>
-	<string>xsample</string>
+	<string>cyclone</string>
 	<key>loadlib3</key>
-	<string>vasp</string>
+	<string>iemabs</string>
 	<key>loadlib4</key>
-	<string>dyn~</string>
+	<string>iemmatrix</string>
 	<key>loadlib5</key>
-	<string>pmpd</string>
+	<string>memento</string>
 	<key>loadlib6</key>
-	<string>cyclone</string>
+	<string>pixeltango</string>
 	<key>loadlib7</key>
-	<string>memento</string>
+	<string>pmpd</string>
 	<key>loadlib8</key>
-	<string>toxy</string>
+	<string>rradical</string>
 	<key>loadlib9</key>
-	<string></string>
-	<key>standardpath</key>
-	<string>1</string>
+	<string>toxy</string>
+	<key>loadlib10</key>
+	<string>unauthorized</string>
+	<key>loadlib11</key>
+	<string>vasp</string>
+	<key>loadlib12</key>
+	<string>xsample</string>
+	<key>loadlib13</key>
+	<string>zexy</string>
 </dict>
 </plist>
diff --git a/packages/win32_inno/TODO b/packages/win32_inno/TODO
index 278207ee..3a82f593 100644
--- a/packages/win32_inno/TODO
+++ b/packages/win32_inno/TODO
@@ -1,7 +1,7 @@
 
-- add SMlib from email from Anders
+- Another detail is that the menu item "help/1 manual" results in no action - possibly some link pointing to the wrong place?
 
-- add Gem to noncvs
+- add SMlib from email from Anders
 
 - get Pd compiling on MinGW:.  From Carmen: 
   
@@ -15,8 +15,4 @@
 
 - menu_openhtml on Win32 with rundll should be able to open other filetypes like open on MACOSX.
 
-- fix PD_VERSION, the sed patterns aren't working
-
-- figure out why MinGW-compiled "unauthorized" externals don't work
-
-- get Windows Makefiles for Gem, unauthorized
+- get Windows Makefiles for Gem
author	Hans-Christoph Steiner <eighthave@users.sourceforge.net>	2005-11-30 07:03:19 +0000
committer	Hans-Christoph Steiner <eighthave@users.sourceforge.net>	2005-11-30 07:03:19 +0000
commit	9cf2c9d4f466dfd9ae81bdae9aace2effbe5a5e5 (patch)
tree	1db59bfe2e2c4eedca51c33c94448114ae649d0f /packages
parent	f7d28b65ad3287d8157c914f24e4003b8d5739b7 (diff)