From 9cf2c9d4f466dfd9ae81bdae9aace2effbe5a5e5 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 30 Nov 2005 07:03:19 +0000 Subject: preparing for RC6, bug fixes and tweaks, things are look ing good svn path=/trunk/; revision=4086 --- packages/Makefile | 33 +++++++++++++++++++++++-------- packages/Makefile.buildlayout | 3 +-- packages/TODO | 2 ++ packages/darwin_app/Makefile | 7 +++++-- packages/darwin_app/org.puredata.pd.plist | 28 ++++++++++++++++---------- packages/win32_inno/TODO | 10 +++------- 6 files changed, 54 insertions(+), 29 deletions(-) (limited to 'packages') 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 "" >> "$(LICENSE_FILE)" echo "

(Parts of this package can be used under " >> "$(LICENSE_FILE)" - echo "Pd"s BSD license)

" >> "$(LICENSE_FILE)" + echo "Pd"s BSD license)" >> "$(LICENSE_FILE)" echo "" >> "$(LICENSE_FILE)" cat "$(externals_src)/creb/COPYING" | sed -e 's/^$$/\/g' >> "$(LICENSE_FILE)" echo "" >> $(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 "

" >> $(WELCOME_FILE) - echo "

" >> $(WELCOME_FILE) + echo "" >> $(WELCOME_FILE) + echo "" >> $(README_FILE) + echo "" >> $(README_FILE) + echo "

" >> $(WELCOME_FILE) + echo "

" >> $(WELCOME_FILE) echo "

Version $(PD_VERSION)

" >> $(WELCOME_FILE) - echo "

written by Miller S. Puckette

" >> $(WELCOME_FILE) - echo "" >> $(WELCOME_FILE) + echo "

written by Miller S. Puckette

" >> $(WELCOME_FILE) + echo "" >> $(WELCOME_FILE) echo "

`grep -A9 ACKNOWLEDG $(pd_src)/README.txt`

" >> $(WELCOME_FILE) - echo "" >> $(WELCOME_FILE) + echo "" >> $(WELCOME_FILE) echo "" >> $(WELCOME_FILE) @@ -431,14 +436,26 @@ readme_install: echo "" >> $(README_FILE) echo "" >> $(README_FILE) echo "" >> $(README_FILE) + echo "" >> $(README_FILE) echo "" >> $(README_FILE) echo "" >> $(README_FILE) echo "

Pure Data $(PD_VERSION)-$(PACKAGE_VERSION)

" >> $(README_FILE) echo "

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.

" >> $(README_FILE) echo "

For more information, go to: http://puredata.org

" >> $(README_FILE) echo "

Installation

" >> $(README_FILE) + echo "

GNU/Linux

" >> $(README_FILE) + echo "

Mac OS X

" >> $(README_FILE) echo "

To install Pd, drag the Pd.app to anywhere in your hard disk.

" >> $(README_FILE) echo "

To install Gem, pmpd, xsample, dyn~, and vasp support, copy org.puredata.pd.plist to ~/Library/Preferences (~ means your home folder). WARNING: this will overwrite any existing Pd preferences!

" >> $(README_FILE) + echo "

Windows

" >> $(README_FILE) + echo "

To install, run the installer.

" >> $(README_FILE) + echo "

To make sure that all of the libraries are loaded when Pd runs, " >> $(README_FILE) + echo "double-click C:\Program Files\pd\pd-settings.reg to import the settings to the registry.

" >> $(README_FILE) + echo "

" >> $(README_FILE) echo "

Pure Data CVS Developers

" >> $(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 '' | sed 's|$href="$|target="w" \1http://sourceforge.net|' >> $(README_FILE) @@ -448,7 +465,7 @@ readme_install: echo "

" >> $(README_FILE) echo "

License

" >> $(README_FILE) echo "

" >> $(README_FILE) - echo "The Pd core is licensed under a BSD license, almost every other part of this package is available under the GNU GPL. A couple packages have BSD-style licenses too." >> $(README_FILE) + echo "The Pd core is licensed under a BSD license, almost every other part of this package is available under the GNU GPL. A couple packages have BSD-style licenses too." >> $(README_FILE) echo "

" >> $(README_FILE) echo "

Included Versions

" >> $(README_FILE) echo "

These externals are all included from the Pd CVS repository:

" >> $(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 @@ + standardpath + 1 loadlib1 Gem loadlib2 - xsample + cyclone loadlib3 - vasp + iemabs loadlib4 - dyn~ + iemmatrix loadlib5 - pmpd + memento loadlib6 - cyclone + pixeltango loadlib7 - memento + pmpd loadlib8 - toxy + rradical loadlib9 - - standardpath - 1 + toxy + loadlib10 + unauthorized + loadlib11 + vasp + loadlib12 + xsample + loadlib13 + zexy 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 -- cgit v1.2.1