Commit 8c2eba77 authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

git rid of old flext stuff and use submodules for new flext and stk

parent 2aa4623e

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -16,3 +16,9 @@
[submodule "l2ork_addons/raspberry_pi/disis_gpio/wiringPi"]
path = l2ork_addons/raspberry_pi/disis_gpio/wiringPi
url = https://git.purrdata.net/jwilkes/wiringPi.git
[submodule "externals/disis/flext"]
path = externals/disis/flext
url = https://git.purrdata.net/jwilkes/flext.git
[submodule "externals/disis/stk"]
path = externals/disis/stk
url = https://github.com/thestk/stk.git
......@@ -133,8 +133,6 @@ LIB_TARGETS = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc
# DISABLED: flatgui
# NEW (IN-PROGRESS): flext
# this is for libraries that don't compile (yet) on all platforms
ifeq ($(OS_NAME),windows)
LIB_TARGETS += gem
......@@ -532,53 +530,6 @@ flatgui_install:
flatgui_clean:
make -C $(externals_src)/flatgui clean
#------------------------------------------------------------------------------#
# FLEXT and FLEXT externals
flext:
cd $(externals_src)/grill/trunk/flext && \
./bootstrap.sh || ./bootstrap.sh && \
./build.sh pd gcc build && \
./build.sh pd gcc build && \
./build.sh pd gcc build && \
./build.sh pd gcc install
#fluid~
# cd footils/fluid && \
# ../../grill/trunk/flext/build.sh pd gcc build && \
# ../../grill/trunk/flext/build.sh pd gcc build
#disis_munger~
cd ../l2ork_addons/disis_munger && \
../../externals/grill/trunk/flext/build.sh pd gcc build && \
../../externals/grill/trunk/flext/build.sh pd gcc build
flext_install:
# we don't install flext but rather link it statically,
# so we only install statically linked externals
#fluid~
# cd footils/fluid && \
# install -D pd-linux/release-multi/fluid~.pd_linux $(DESTDIR)$(objectsdir)/flext/fluid~.pd_linux && \
# install -D pd/* $(DESTDIR)$(objectsdir)/flext/
#disis_munger~
cd ../l2ork_addons/disis_munger && \
install -D pd-linux/release-multi/disis_munger~.pd_linux $(DESTDIR)$(objectsdir)/flext/disis_munger~.pd_linux && \
install -D *help.pd $(DESTDIR)$(objectsdir)/flext/
flext_clean:
#flext
cd grill/trunk/flext/ && \
./build.sh pd gcc clean
#fluid~
# cd footils/fluid && \
# ../../grill/trunk/flext/build.sh pd gcc clean
#fluid~
cd ../l2ork_addons/disis_munger && \
../../externals/grill/trunk/flext/build.sh pd gcc clean
#------------------------------------------------------------------------------#
# FLIB
FLIB_NAME=flib
......
Subproject commit 03494e18cffd5ba0a019bed98b88fd60ec9f5cb4
Subproject commit 11d1dc54f31e05ee71c8e63d116041dd2a8e7442
#!/bin/sh
ranlib /usr/local/pd/flext/*.a
#!/bin/sh
ranlib /usr/local/pd/flext/*.a
# generate MacOS X packages
#
# started by Adam Lindsay
# added by Hans-Christoph Steiner <hans@eds.org>
CXX=g++
# where to find the pd src for headers
PDPATH = ../../../pd/src
FLEXTPATH = ../flext
FLEXTLIB = $(FLEXTPATH)/pd-darwin/libflext.a
PD = ../../../pd/bin/pd
INSTALL_PREFIX = installroot
PD_ROOT = pd
HELP = $(INSTALL_PREFIX)/$(PD_ROOT)/doc/5.reference
EXTERNALS = $(INSTALL_PREFIX)/$(PD_ROOT)/extra
ADDITIONAL = $(INSTALL_PREFIX)/$(PD_ROOT)/doc/flext
FLEXT_VERSION = $(shell grep PROJECT_NUMBER ../../flext/flext.doxy | cut -d '"' -f2 | cut -d ' ' -f2)
PACKAGE_PREFIX = pd-flext
PACKAGE_NAME = $(PACKAGE_PREFIX)-$(FLEXT_VERSION)
PACKAGE_VERSION = ($shell date +%Y.%m.%d)
DMG_PREFIX = $(PACKAGE_PREFIX)
DMG_NAME = $(DMG_PREFIX)-$(PD_VERSION)-$(PACKAGE_VERSION)
WELCOME_FILE = Welcome.html
all:
# FLEXT
make -C ../../flext -f makefile.pd-darwin PDPATH=$(PDPATH) CXX=$(CXX)
# FLEXTERNALS
# make -C ../../dyn -f makefile.pd-darwin CXX=$(CXX) \
# INCLUDES="$(PDPATH) $(FLEXTPATH)/source/"\
# FLEXTLIB=$(FLEXTLIB) FLEXTPATH=$(FLEXTPATH) PD=$(PD)
# make -C ../../fftease -f makefile.pd-darwin CXX=$(CXX) \
# INCLUDES="$(PDPATH) $(FLEXTPATH)/source/"\
# FLEXTLIB=$(FLEXTLIB) FLEXTPATH=$(FLEXTPATH) PD=$(PD)
# make -C ../../idelay -f makefile.pd-darwin CXX=$(CXX) \
# INCLUDES="$(PDPATH) $(FLEXTPATH)/source/"\
# FLEXTLIB=$(FLEXTLIB) FLEXTPATH=$(FLEXTPATH) PD=$(PD)
make -C ../../pool -f makefile.pd-darwin CXX=$(CXX) \
INCLUDES="$(PDPATH) $(FLEXTPATH)/source/"\
FLEXTLIB=$(FLEXTLIB) FLEXTPATH=$(FLEXTPATH) PD=$(PD)
# make -C ../../py -f makefile.pd-darwin CXX=$(CXX) \
# INCLUDES="$(PDPATH) $(FLEXTPATH)/source/"\
# FLEXTLIB=$(FLEXTLIB) FLEXTPATH=$(FLEXTPATH) PD=$(PD)
## vasp fails without the dir
# test -d ../../vasp/pd-darwin || mkdir -p ../../vasp/pd-darwin
# make -C ../../vasp -f makefile.pd-darwin CXX=$(CXX) \
# INCLUDES="$(PDPATH) $(FLEXTPATH)/source/"\
# FLEXTLIB=$(FLEXTLIB) FLEXTPATH=$(FLEXTPATH) PD=$(PD)
# make -C ../../vst -f makefile.pd-darwin CXX=$(CXX) \
# INCLUDES="$(PDPATH) $(FLEXTPATH)/source/"\
# FLEXTLIB=$(FLEXTLIB) FLEXTPATH=$(FLEXTPATH) PD=$(PD)
make -C ../../xsample -f makefile.pd-darwin CXX=$(CXX) \
INCLUDES="$(PDPATH) $(FLEXTPATH)/source/"\
FLEXTLIB=$(FLEXTLIB) FLEXTPATH=$(FLEXTPATH) PD=$(PD)
clean:
make -C ../../flext -f makefile.pd-darwin clean
make -C ../../dyn -f makefile.pd-darwin clean
make -C ../../fftease -f makefile.pd-darwin clean
make -C ../../idelay -f makefile.pd-darwin clean
make -C ../../pool -f makefile.pd-darwin clean
make -C ../../py -f makefile.pd-darwin clean
make -C ../../vasp -f makefile.pd-darwin clean
make -C ../../vst -f makefile.pd-darwin clean
make -C ../../xsample -f makefile.pd-darwin clean
darwin_pkg_clean:
-sudo rm -Rf $(INSTALL_PREFIX) $(PACKAGE_PREFIX)*.pkg/
-sudo rm -Rf "$(DMG_NAME)"
-rm -f $(PACKAGE_PREFIX)-*.info 1 License.???* Welcome.???* *.dmg
darwin_pkg_welcome:
-rm $(WELCOME_FILE)
echo "<HTML><BODY>" > $(WELCOME_FILE)
echo "<H2>FLEXT $(FLEXT_VERSION)-$(PACKAGE_VERSION)</H2>" >> $(WELCOME_FILE)
echo "<P>For more information, go to: http://www.parasitaere-kapazitaeten.net/~thomas/ext/flext/</P>" >> $(WELCOME_FILE)
echo "<H3>Included Versions</H3>" >> $(WELCOME_FILE)
echo "<P>The various versions of the included packages:</P>" >> $(WELCOME_FILE)
echo "<UL>" >> $(WELCOME_FILE)
echo "<LI>flext: $(FLEXT_VERSION) " >> $(WELCOME_FILE)
echo "</UL>" >> $(WELCOME_FILE)
echo "(this package was built on `date`) <BR>" >> $(WELCOME_FILE)
echo "</BODY></HTML>" >> $(WELCOME_FILE)
darwin_pkg_license:
# generate HTML version of License
echo "<HTML><BODY><FONT SIZE="-1">" > License.html
cat ../../flext/gpl.txt | sed -e 's/^$$/\<P\>/g' >> License.html
echo "</FONT></BODY></HTML>" >> License.html
# install into MSP's default: /usr/local/lib
darwin_pkg: all darwin_pkg_clean darwin_pkg_license
# set up installroot dir
test -d $(HELP) || mkdir -p $(HELP)
test -d $(EXTERNALS) || mkdir -p $(EXTERNALS)
test -d $(ADDITIONAL) || mkdir -p $(ADDITIONAL)
test -d $(INSTALL_PREFIX)$(PD_ROOT)/flext \
|| mkdir -p $(INSTALL_PREFIX)$(PD_ROOT)/flext
# FLEXT
test -d $(HELP)/../tutorials || mkdir -p $(HELP)/../tutorials
cp -r ../../flext/tutorial $(HELP)/../tutorials/flext
mkdir $(ADDITIONAL)/flext
install -m444 ../../flext/gpl.txt ../../flext/readme.txt ../../flext/license.txt \
$(ADDITIONAL)/flext
# FLEXTERNALS
# dyn
# install -m444 ../../dyn/pd-darwin/*.pd_darwin $(EXTERNALS)
install -m444 ../../dyn/pd/*.pd $(HELP)
mkdir $(ADDITIONAL)/dyn
install -m444 ../../dyn/gpl.txt ../../dyn/readme.txt \
../../dyn/license.txt $(ADDITIONAL)/dyn
# fftease
# install -m444 ../../fftease/pd-darwin/*.pd_darwin $(EXTERNALS)
install -m444 ../../fftease/pd/*.pd $(HELP)
mkdir $(ADDITIONAL)/fftease
install -m444 ../../fftease/gpl.txt ../../fftease/readme.txt \
../../fftease/license.txt $(ADDITIONAL)/fftease
cp -r ../../fftease/media $(ADDITIONAL)/fftease
# idelay
# install -m444 ../../dyn/pd-darwin/*.pd_darwin $(EXTERNALS)
install -m444 ../../idelay/pd/*.pd $(HELP)
mkdir $(ADDITIONAL)/idelay
install -m444 ../../idelay/gpl.txt ../../idelay/license.txt $(ADDITIONAL)/idelay
# pool
install -m444 ../../pool/pd-darwin/*.pd_darwin $(EXTERNALS)
install -m444 ../../pool/pool.pd $(HELP)
mkdir $(ADDITIONAL)/pool
install -m444 ../../pool/gpl.txt ../../pool/readme.txt ../../pool/license.txt \
$(ADDITIONAL)/pool
# py/pyext
# install -m444 ../../py/pd-darwin/*.pd_darwin $(EXTERNALS)
mkdir -p $(ADDITIONAL)/py/examples
mkdir -p $(ADDITIONAL)/py/scripts
install -m444 ../../py/pd/*.pd $(ADDITIONAL)/py/examples
install -m444 ../../py/scripts/*.py $(ADDITIONAL)/py/scripts
install -m444 ../../py/gpl.txt ../../py/readme.txt ../../py/license.txt \
$(ADDITIONAL)/py
# mkdir -p $(INSTALL_PREFIX)/Library/Frameworks
# cp -R /Library/Frameworks/Python.framework $(INSTALL_PREFIX)/Library/Frameworks
# vasp
# fails without the dir
# test -d ../../vasp/pd-darwin || mkdir -p ../../vasp/pd-darwin
# install -m444 ../../vasp/pd-darwin/*.pd_darwin $(EXTERNALS)
install -m444 ../../vasp/pd-help/*.pd $(HELP)
mkdir $(ADDITIONAL)/vasp
install -m444 ../../vasp/gpl.txt ../../vasp/readme.txt ../../vasp/license.txt \
../../vasp/changes.txt ../../vasp/todo.txt $(ADDITIONAL)/vasp
cp -r ../../vasp/pd-ex $(ADDITIONAL)/vasp
# vst
# install -m444 ../../vst/pd-darwin/*.pd_darwin $(EXTERNALS)
install -m444 ../../vst/pd/*.pd $(HELP)
mkdir $(ADDITIONAL)/vst
install -m444 ../../vst/gpl.txt ../../vst/readme.txt \
../../vst/license.txt $(ADDITIONAL)/vst
# xsample
install -m444 ../../xsample/pd-darwin/*.pd_darwin $(EXTERNALS)
install -m444 ../../xsample/pd/*.pd $(HELP)
mkdir $(ADDITIONAL)/xsample
install -m444 ../../xsample/gpl.txt ../../xsample/readme.txt \
../../xsample/license.txt $(ADDITIONAL)/xsample
#
cp -f pd-flext.info $(PACKAGE_NAME).info
# delete cruft
-find installroot -name .DS_Store -delete
-rm -f 1
# set proper permissions
sudo chown -R root:staff $(INSTALL_PREFIX)
package $(INSTALL_PREFIX) $(PACKAGE_NAME).info -d . -ignoreDSStore
# install pkg docs
install -m644 License.html $(PACKAGE_NAME).pkg/Contents/Resources
cd Resources && \
install -m755 postinstall postupgrade ../$(PACKAGE_NAME).pkg/Contents/Resources
sudo chown -R root:staff $(PACKAGE_NAME).pkg/Contents/Resources
dmg: darwin_pkg
mv installroot "$(DMG_NAME)"
/bin/sh mkdmg "$(DMG_NAME)"
#!/bin/sh
#
# from: http://www.macosxhints.com/article.php?story=20020311215452999
#
#
# Creates a disk image (dmg) on Mac OS X from the command line
# from a folder.
FOLDER="$1"
if [ -z "$FOLDER" ]; then
echo
echo "usage: $0 <folder>"
echo
exit 1
fi
if [ ! -d "$FOLDER" ]; then
echo $FOLDER does not exist
exit 2
fi
SIZE=`/usr/bin/du -s "$FOLDER" | awk '{ print $1 }'`
# allow space for partition map and directory structure
SIZE=`echo 1024 + $SIZE \* 1.1 / 1 | bc`
NAME=`basename "$FOLDER"`
FILE=$NAME.dmg
TMP=${TMP:-/tmp}
if [ $SIZE -lt 9216 ]; then
SIZE=9216
fi
if [ -e "$FILE" ] ; then
echo $FILE already exists!
exit 3
fi
TMPFILE=$TMP/$$.dmg
echo Creating $TMPFILE from $FOLDER, $SIZE sectors...
hdiutil create $TMPFILE -sectors $SIZE -ov
if [ $? -ne 0 ] ; then
rm -f $TMPFILE
exit 4
fi
echo
DEVICES=`hdid -nomount $TMPFILE`
DEVMASTER=`echo $DEVICES| awk '{ print $1 }'`
DEVHFS=`echo $DEVICES| awk '{ print $5 }'`
echo Creating HFS partition $NAME on $TMPFILE at $DEVHFS
newfs_hfs -v "$NAME" $DEVHFS
if [ $? -ne 0 ] ; then
rm -f $TMPFILE
exit 5
fi
hdiutil eject $DEVMASTER
if [ $? -ne 0 ] ; then
rm -f $TMPFILE
exit 6
fi
DEVICES=`hdid $TMPFILE`
if [ $? -ne 0 ] ; then
rm -f $TMPFILE
exit 7
fi
DEVMASTER=`echo $DEVICES| awk '{ print $1 }'`
DEVHFS=`echo $DEVICES| awk '{ print $5 }'`
echo Copying $FOLDER to /Volumes/$NAME on $DEVMASTER
sudo ditto -rsrcFork "$FOLDER" "/Volumes/$NAME"
if [ $? -ne 0 ]; then
hdiutil eject $DEVMASTER
rm -f $TMPFILE
exit 8
fi
hdiutil eject $DEVMASTER
if [ $? -ne 0 ]; then
#rm -f $TMPFILE
exit 9
fi
echo "Compressing $NAME to $FILE"
#hdiutil convert $TMPFILE -format UDZO -o "$FILE"
hdiutil convert $TMPFILE -format UDZO -imagekey zlib-level=9 -o "$FILE"
if [ $? -ne 0 ]; then
rm -f "$FILE" $TMPFILE
exit 10
fi
rm -f $TMPFILE
# end
Title FLEXT for Pd
Version MSP standard paths
Description Thomas Grill's C++ layer for writing Pd externals
DefaultLocation /usr/local/lib
DeleteWarning
### Package Flags
NeedsAuthorization YES
Required NO
Relocatable YES
RequiresReboot NO
UseUserMask YES
OverwritePermissions NO
InstallFat NO
RootVolumeOnly NO
K 25
svn:wc:ra_dav:version-url
V 24
/ext/!svn/ver/3754/trunk
END
packing.py
K 25
svn:wc:ra_dav:version-url
V 35
/ext/!svn/ver/3550/trunk/packing.py
END
10
dir
3754
https://svn.grrrr.org/ext/trunk
https://svn.grrrr.org/ext
2011-11-30T21:12:05.295799Z
3754
thomas
4d9ac71a-51e6-0310-8455-cad1006bcd31
mousewarp
dir
sms_peaks
dir
sched
dir
patches
dir
py
dir
termination
dir
wmangle
dir
fsplay
dir
rpn
dir
absattr
dir
audiocube
dir
win-msvc
dir
wacom
dir
sms_guide_syn
dir
dct
dir
quadtree
dir
fftease
dir
sms_power
dir
delsplit
dir
flext
dir
osc
dir
deljoin
dir
sms_centroid
dir
dyn
dir
slitzer
dir
som
dir
dyn_py
dir
pd
dir
packing.py
file
2012-05-13T23:08:38.349556Z
7eaab3094832e02bb59ac6da4d497d6e
2008-04-07T16:12:37.745501Z
3550
thomas
12242
idelay
dir
sms_resid_ana
dir
pool
dir
hr
dir
vasp
dir
clk
dir
xsample
dir
constantq
dir
dynext
dir
vst
dir
rstream
dir
zconf
dir
bookmotion
dir
sms_resid_syn
dir
import string
import sys
import os
import shutil
import fnmatch
import glob
from types import TupleType, ListType
# sys.path += ['/Volumes/Daten/Prog/packs/Python-2.2.2/Mac/Lib']
try:
import macostools
except:
pass
folders = {
"flext": "flext",
"flext-tut": "flext/tutorial",
"vasp": "vasp", "vasp-bin": "vasp",
"pool": "pool", "pool-bin": "pool",
"py": "py", "py-bin": "py",
"xsample": "xsample", "xsample-bin": "xsample",
"dynext": "dynext", "dynext-bin": "dynext",
"wmangle-bin": "wmangle",
}
stdfiles = ["gpl.txt","license.txt","readme.txt","changes.txt","notes.txt","build.txt"]
autoconffiles = [] # ["bootstrap.sh","configure.ac","Makefile.am"]
buildfiles = ["build.sh","build.bat","build","package.txt"]