From 8e4cc7c19066c82a091dc66bd8ce79bce16e830d Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner
Date: Thu, 14 Aug 2008 17:41:19 +0000
Subject: merged in changes from the v0-40 pd-extended release branch
svn path=/trunk/; revision=10244
---
doc/tutorials/visual/17.tracking.pd | 39 +++----
packages/Makefile | 70 +++++++++----
packages/darwin_app/DS_Store | Bin 12292 -> 12292 bytes
packages/darwin_app/Makefile | 12 ++-
packages/darwin_app/VolumeIcon.icns | Bin 47903 -> 47204 bytes
packages/darwin_app/org.puredata.pd.default.plist | 23 ++---
packages/linux_make/Makefile | 5 +-
packages/linux_make/debian/control | 4 +-
packages/linux_make/default.pdsettings | 24 ++---
packages/win32_inno/pd-inno.iss.in | 28 ++---
packages/win32_inno/pd-settings.reg | 26 ++---
.../tcltk_core-8-4-branch_auto-builder.sh | 4 +-
scripts/generate-pd-settings-files.sh | 115 ++++++++++++++-------
scripts/insert_declare.py | 31 ++++++
scripts/update-developer-layout.sh | 2 +-
15 files changed, 248 insertions(+), 135 deletions(-)
create mode 100755 scripts/insert_declare.py
diff --git a/doc/tutorials/visual/17.tracking.pd b/doc/tutorials/visual/17.tracking.pd
index c78e0bac..8fe413fe 100644
--- a/doc/tutorials/visual/17.tracking.pd
+++ b/doc/tutorials/visual/17.tracking.pd
@@ -1,4 +1,4 @@
-#N canvas 10 40 620 460 10;
+#N canvas 65 37 620 460 10;
#X declare -lib Gem;
#X obj 8 10 cnv 15 400 40 empty empty tracking 20 12 0 24 -228992 -66577
0;
@@ -8,7 +8,6 @@
#X msg 184 221 reset;
#X obj 159 250 pix_background;
#X msg 252 229 \$1 \$1 \$1;
-#X floatatom 252 213 5 0 0 0 - - -;
#X obj 103 316 pix_blob;
#N canvas 10 40 620 460 cursor 0;
#X obj 17 14 inlet;
@@ -118,24 +117,28 @@
#X obj 227 89 pix_video;
#X text 276 309 Show pix_background output;
#X text 116 369 Show centroid/size;
-#X text 294 210 Set noise threshold;
+#X text 348 227 Set noise threshold;
#X text 291 115 Render source video;
+#X obj 255 207 hsl 128 15 0 1 0 1 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X floatatom 311 229 5 0 0 0 - - -;
#X connect 3 0 5 0;
#X connect 4 0 5 0;
-#X connect 5 0 8 0;
-#X connect 5 0 16 0;
+#X connect 5 0 7 0;
+#X connect 5 0 15 0;
#X connect 6 0 5 1;
-#X connect 7 0 6 0;
-#X connect 8 1 9 0;
-#X connect 8 2 9 1;
-#X connect 8 3 9 2;
+#X connect 7 1 8 0;
+#X connect 7 2 8 1;
+#X connect 7 3 8 2;
+#X connect 9 0 10 0;
#X connect 10 0 11 0;
-#X connect 11 0 12 0;
-#X connect 13 0 17 0;
-#X connect 14 0 3 0;
-#X connect 15 0 13 0;
-#X connect 16 0 15 0;
-#X connect 17 0 18 0;
-#X connect 19 0 20 0;
-#X connect 20 0 10 0;
-#X connect 20 0 14 0;
+#X connect 12 0 16 0;
+#X connect 13 0 3 0;
+#X connect 14 0 12 0;
+#X connect 15 0 14 0;
+#X connect 16 0 17 0;
+#X connect 18 0 19 0;
+#X connect 19 0 9 0;
+#X connect 19 0 13 0;
+#X connect 24 0 25 0;
+#X connect 24 0 6 0;
diff --git a/packages/Makefile b/packages/Makefile
index e97b6cdd..ecc7c17f 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -479,15 +479,16 @@ $(gem_src)/src/Gem.pd_linux: $(gem_src)/src/configure
# always run aclocal/autoconf until "configure" is deleted from CVS
cd $(gem_src)/src && aclocal
cd $(gem_src)/src && autoconf
- cd $(gem_src)/src && ./configure --without-ffmpeg --with-pd=$(pd_src) \
- --disable-NV
+ cd $(gem_src)/src && ./configure \
+ --without-ffmpeg --with-pd=$(pd_src) --disable-NV
$(MAKE) -C $(gem_src)/src
$(gem_src)/src/Gem.pd_darwin:
# always run aclocal/autoconf until "configure" is deleted from CVS
cd $(gem_src)/src && aclocal
cd $(gem_src)/src && autoconf
- cd $(gem_src)/src && ./configure --without-x --without-ImageMagick \
+ cd $(gem_src)/src && ./configure \
+ --without-x --without-ImageMagick \
--without-tiff --without-jpeg --without-mpeg --without-mpeg3 \
--without-ieee1394 --without-aviplay --without-avifile --without-ffmpeg \
--with-ftgl-includes=/sw/include --with-ftgl-libs=/sw/lib \
@@ -502,8 +503,10 @@ gem_install: gem $(helpdir)
install -p $(gem_src)/abstractions/*-help.pd $(helpdir)/$(GEM_NAME)
install -d $(objectsdir)/$(GEM_NAME)
ifneq ($(OS_NAME),windows)
- install -p $(gem_src)/src/Gem.$(EXTENSION) $(objectsdir)
+ install -p $(gem_src)/src/Gem.$(EXTENSION) $(objectsdir)/$(GEM_NAME)/
endif
+# kludge to get helpfiles working since the HELPSYMBOL stuff changed
+ install -p $(gem_src)/help/*.* $(objectsdir)/$(GEM_NAME)/
install -p $(shell ls -1 $(gem_src)/abstractions/*.* | \
grep -v '\-help.pd') $(objectsdir)/$(GEM_NAME)
install -d $(manualsdir)/$(GEM_NAME)
@@ -609,14 +612,55 @@ ifeq ($(OS_NAME),linux)
echo "" >> $(README_FILE)
endif
ifeq ($(OS_NAME),darwin)
- echo "To install Pd, drag the $(PACKAGE_NAME).app into your /Applications folder or to the shortcut in the disk image. (You might need to put the old one in the trash before copying this one to /Applications)
" >> $(README_FILE)
- echo "By default, most of the included libraries are loaded at startup. To change this, set your own preferences in the Startup... Preferences pane usings the Save all settings button. If you want to start with a blank set of preferences, run this command in the Terminal.app:
touch ~/Library/Preferences/org.puredata.pd.plist
(~
means your home folder)
The Preferences panels in Pd are currently buggy, so you might have better luck with the Apple utility, Property List Editor, which is freely available as part of XCode or the Server Tools.
" >> $(README_FILE)
+ echo "To install Pd, drag the $(PD_APP_NAME).app into your /Applications folder or to the shortcut in the disk image. (You might need to put the old one in the trash before copying this one to /Applications)
" >> $(README_FILE)
+ echo "By default, most of the included libraries are loaded at startup. To change this, set your own preferences in the Startup... Preferences pane usings the Save all settings button. If you want to start with a blank set of preferences, run this command in the Terminal.app:
touch ~/Library/Preferences/org.puredata.pd.plist
(~
means your home folder)
The Preferences panels in Pd are currently buggy, so you might have better luck with the Apple utilities: defaults read org.puredata.pd
, or, Property List Editor, which is freely available as part of XCode or the Server Tools.
" >> $(README_FILE)
+ echo "If you want to use PDP on Mac OS X 10.4/Tiger or 10.3/Panther, you will need to install X11 (X11 comes installed with 10.5/Leopard). It comes on the install CD/DVD that your computer came with. For more detail, see How to install X11 in OS X or How do I install Pd on MacOS X?." >> $(README_FILE)
endif
ifeq ($(OS_NAME),windows)
echo "To install, run the installer.
" >> $(README_FILE)
echo "To make sure that all of the included 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. WARNING: this will overwrite any existing Pd preferences!
" >> $(README_FILE)
endif
+ echo "License
" >> $(README_FILE)
+ echo "" >> $(README_FILE)
+ echo 'This package is released under the GNU GPL. The Pd core and some other included code is originally available with a BSD license from the Pd CVS on SourceForge.' >> $(README_FILE)
+ echo "
" >> $(README_FILE)
+ echo "Installing Externals, Objects, and Help files
" >> $(README_FILE)
+ echo "" >> $(README_FILE)
+ echo "If you would like to install other externals, objects, help files, etc. there are special folders that Pd-extended uses." >> $(README_FILE)
+ echo "
" >> $(README_FILE)
+ echo "- User-specific
" >> $(README_FILE)
+ifeq ($(OS_NAME),darwin)
+ echo "- ~/Library/Pd
" >> $(README_FILE)
+endif
+ifeq ($(OS_NAME),linux)
+ echo "- ~/pd/
" >> $(README_FILE)
+endif
+ifeq ($(OS_NAME),windows)
+ echo "- %UserProfile%\Application Data\Pd
" >> $(README_FILE)
+endif
+ echo "- Global
" >> $(README_FILE)
+ifeq ($(OS_NAME),darwin)
+ echo "- /Library/Pd
" >> $(README_FILE)
+endif
+ifeq ($(OS_NAME),linux)
+ echo "- /usr/share/pd
" >> $(README_FILE)
+endif
+ifeq ($(OS_NAME),windows)
+ echo "- %ProgramFiles%\Common Files\Pd
" >> $(README_FILE)
+endif
+ echo "
" >> $(README_FILE)
+ echo "
" >> $(README_FILE)
+ echo "Patented Algorithms
" >> $(README_FILE)
+ echo "" >> $(README_FILE)
+ echo "This package may contain software that is covered by patents in certain countries, like the U.S. and Germany. In order to use this software you must have the proper license. Below is a list of the known software packages that are covered by patents in some countries:" >> $(README_FILE)
+ echo "
" >> $(README_FILE)
+ echo "" >> $(README_FILE)
+ echo 'Please consider trying to get rid of software patents in your country: http://www.nosoftwarepatents.com
' >> $(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)
@@ -624,10 +668,6 @@ endif
echo " " >> $(README_FILE)
echo "Many others not listed have contributed their time and effort, this is just a list of the current developers in the SourceForge project. But really, every Pd user is a developer and is encouraged to contribute to the CVS repository." >> $(README_FILE)
echo " " >> $(README_FILE)
- echo "License" >> $(README_FILE)
- echo "" >> $(README_FILE)
- echo 'This package is released under the GNU GPL. The Pd core and some other included code is originally available with a BSD license from the Pd CVS on SourceForge.' >> $(README_FILE)
- echo " " >> $(README_FILE)
echo "Included Versions" >> $(README_FILE)
echo "These externals are all included from the Pd CVS repository: " >> $(README_FILE)
echo "" >> $(README_FILE)
@@ -649,16 +689,6 @@ endif
echo "- unauthorized: `date +20%y.%m.%d`" >> $(README_FILE)
echo "
- zexy: $(ZEXY_VERSION)" >> $(README_FILE)
echo "
" >> $(README_FILE)
- echo "Patented Algorithms" >> $(README_FILE)
- echo "" >> $(README_FILE)
- echo "This package may contain software that is covered by patents in certain countries, like the U.S. and Germany. In order to use this software you must have the proper license. Below is a list of the known software packages that are covered by patents in some countries:" >> $(README_FILE)
- echo " " >> $(README_FILE)
- echo "" >> $(README_FILE)
- echo 'Please consider trying to get rid of software patents in your country: http://www.nosoftwarepatents.com ' >> $(README_FILE)
echo "(this package was built on `date`) " >> $(README_FILE)
echo " |