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 /TamTamMini.activity | |
| parent | 1302c742f38b5f1325b669afe1abe0393101dc17 (diff) | |
| parent | 83d9ad95af8b9e2106d8ccde1c7b03b8a1239f0e (diff) | |
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'TamTamMini.activity')
| -rw-r--r-- | TamTamMini.activity/Config.py | 12 | ||||
| -rw-r--r-- | TamTamMini.activity/setup.py | 6 |
2 files changed, 15 insertions, 3 deletions
diff --git a/TamTamMini.activity/Config.py b/TamTamMini.activity/Config.py index e469af2..62aab60 100644 --- a/TamTamMini.activity/Config.py +++ b/TamTamMini.activity/Config.py @@ -24,7 +24,12 @@ print 'INFO: loaded TAMTAM_ROOT=%s' % TAM_TAM_ROOT #PATHS -SOUNDS_DIR = "/usr/share/tamtam/Sounds" +if os.path.isdir("/usr/share/tamtam/Sounds"): + SOUNDS_DIR = "/usr/share/tamtam/Sounds" + LIB_DIR = "/usr/share/tamtam" +else: + SOUNDS_DIR = "/usr/share/activities/TamTamEdit.activity/common/Resources/Sounds" + LIB_DIR = "/usr/share/activities/TamTamEdit.activity/common/Resources" FILES_DIR = TAM_TAM_ROOT + "/common/Resources" TUNE_DIR='/' SYNTH_DIR='/' @@ -377,7 +382,10 @@ UNLOAD_TABLES_COMMAND = \ ################# LANGUAGE = 'En' -IMAGE_ROOT = "/usr/share/tamtam/Images/" +if os.path.isdir("/usr/share/tamtam/Images"): + IMAGE_ROOT = '/usr/share/tamtam/Images/' +else: + IMAGE_ROOT = "/usr/share/activities/TamTamEdit.activity/common/Resources/Images/" MAIN_WINDOW_PADDING = 5 BG_COLOR = '#404040' diff --git a/TamTamMini.activity/setup.py b/TamTamMini.activity/setup.py index 87a6a08..99b805d 100644 --- a/TamTamMini.activity/setup.py +++ b/TamTamMini.activity/setup.py @@ -24,7 +24,11 @@ import os os.system('unlink common')
shutil.copytree('../common', 'common')
-bundlebuilder.start('TamTamMini')
+try:
+ bundlebuilder.start('TamTamMini')
+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')
|