diff options
| author | Oli <olivier.belanger@umontreal.ca> | 2007-09-21 23:58:32 (GMT) |
|---|---|---|
| committer | Oli <olivier.belanger@umontreal.ca> | 2007-09-21 23:58:32 (GMT) |
| commit | cde4bf13ada67edfd70058898cc32e909f53f629 (patch) | |
| tree | 76f8267693fe96cca993581f12ffbf688e1be6dd /TamTamSynthLab.activity | |
| parent | 1302c742f38b5f1325b669afe1abe0393101dc17 (diff) | |
| parent | 83d9ad95af8b9e2106d8ccde1c7b03b8a1239f0e (diff) | |
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'TamTamSynthLab.activity')
| -rw-r--r-- | TamTamSynthLab.activity/MANIFEST | 10 | ||||
| -rw-r--r-- | TamTamSynthLab.activity/setup.py | 6 |
2 files changed, 5 insertions, 11 deletions
diff --git a/TamTamSynthLab.activity/MANIFEST b/TamTamSynthLab.activity/MANIFEST index a757536..37a2ede 100644 --- a/TamTamSynthLab.activity/MANIFEST +++ b/TamTamSynthLab.activity/MANIFEST @@ -126,16 +126,6 @@ common/Resources/crop.csd common/Resources/tamtamorc.csd common/Resources/tooltips_en.py common/Resources/tooltips_fr.py -common/Resources/Desktops/desktop0 -common/Resources/Desktops/desktop1 -common/Resources/Desktops/desktop2 -common/Resources/Desktops/desktop3 -common/Resources/Desktops/desktop4 -common/Resources/Desktops/desktop5 -common/Resources/Desktops/desktop6 -common/Resources/Desktops/desktop7 -common/Resources/Desktops/desktop8 -common/Resources/Desktops/desktop9 common/Resources/SynthFiles/synthFile1 common/Resources/SynthFiles/synthFile2 common/Resources/SynthFiles/synthFile3 diff --git a/TamTamSynthLab.activity/setup.py b/TamTamSynthLab.activity/setup.py index c58f78c..65c27a0 100644 --- a/TamTamSynthLab.activity/setup.py +++ b/TamTamSynthLab.activity/setup.py @@ -24,7 +24,11 @@ import os os.system('unlink common')
shutil.copytree('../common', 'common')
-bundlebuilder.start('TamTamSynthLab')
+try:
+ bundlebuilder.start('TamTamSynthLab')
+except:
+ os.system('rm -rf common')
+ os.system('ln -s ../common common')
#Restore the symlink
os.system('rm -rf common')
os.system('ln -s ../common common')
|