Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Config.py2
-rw-r--r--Util/Clooper/Makefile4
-rwxr-xr-xUtil/Clooper/aclient.sobin169404 -> 48095 bytes
-rwxr-xr-xscripts/update-activity.sh25
4 files changed, 22 insertions, 9 deletions
diff --git a/Config.py b/Config.py
index 5594ead..2e4bb14 100644
--- a/Config.py
+++ b/Config.py
@@ -39,7 +39,7 @@ else:
#PLUGIN
-PLUGIN_DEBUG = os.getenv('HOME')+"/tamtam.aclient.log"
+PLUGIN_DEBUG = os.getenv('HOME')+"/.tamtam/clooper.log"
PLUGIN_VERBOSE = 0
PLUGIN_UNIVORC = TAM_TAM_ROOT + "/Resources/univorc.csd"
PLUGIN_KSMPS = 64
diff --git a/Util/Clooper/Makefile b/Util/Clooper/Makefile
index a1d1870..5d5ac39 100644
--- a/Util/Clooper/Makefile
+++ b/Util/Clooper/Makefile
@@ -1,6 +1,6 @@
CC=gcc
-CXXFLAGS+=-g -Wall -Werror -fPIC -O3 -finline
+CXXFLAGS+= -Wall -Werror -fPIC -O2 -finline
LDFLAGS+= -lasound
LDFLAGS+= -L/usr/local/lib -lcsound
@@ -9,7 +9,7 @@ CPPFLAGS+=-I/home/james/cvs/sugar-jhbuild/build/include/python2.5
LDFLAGS+=-L/home/james/cvs/sugar-jhbuild/build/lib
CPPFLAGS+=-I/usr/include/python2.4
-LDFlAGS+=-lpython2.4
+LDFLAGS+=-lpython2.4
all : aclient.so
diff --git a/Util/Clooper/aclient.so b/Util/Clooper/aclient.so
index 2df6327..095c775 100755
--- a/Util/Clooper/aclient.so
+++ b/Util/Clooper/aclient.so
Binary files differ
diff --git a/scripts/update-activity.sh b/scripts/update-activity.sh
index 540cd08..b06a628 100755
--- a/scripts/update-activity.sh
+++ b/scripts/update-activity.sh
@@ -1,7 +1,20 @@
#!/bin/sh
-cp *.py /usr/share/activities/TamTam.activity
-cp Edit/*.py /usr/share/activities/TamTam.activity/Edit
-cp miniTamTam/*.py /usr/share/activities/TamTam.activity/miniTamTam
-cp Util/*.py /usr/share/activities/TamTam.activity/Util
-cp SynthLab/*.py /usr/share/activities/TamTam.activity/SynthLab
-cp Generation/*.py /usr/share/activities/TamTam.activity/Generation
+DEST=/usr/share/activities/TamTam.activity
+SRC=.
+PYTHON_DIR=" . Edit miniTamTam Util SynthLab Generation "
+OTHER_DIRS=" Resources "
+FILES="Util/Clooper/aclient.so"
+for DIR in $PYTHON_DIR ; do
+ echo cp $SRC/$DIR/*.py $DEST/$DIR
+ cp $SRC/$DIR/*.py $DEST/$DIR
+done
+
+for DIR in $OTHER_DIRS ; do
+ echo cp -R $SRC/$DIR/* $DEST/$DIR
+ cp -R $SRC/$DIR/* $DEST/$DIR
+done
+
+for F in $FILES ; do
+ echo cp $F $DEST/$F
+ cp $F $DEST/$F
+done