Skip to content

Commit

Permalink
Complete install to home directory using SCons
Browse files Browse the repository at this point in the history
  • Loading branch information
senshu committed May 12, 2013
1 parent 0b829ac commit 4d8c54b
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 12 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@ node_modules
CMakeCache.txt
CMakeFiles
*.pyc

.sconsign.dblite
build

4 changes: 3 additions & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Export("sozi_version")
license_files = Glob("doc/*-license.txt")
Export("license_files")

SConscript("player/SConscript", variant_dir="build/player")
player_files = SConscript("player/SConscript", variant_dir="build/player")
Export("player_files")

SConscript("editors/SConscript", variant_dir="build/editors")

10 changes: 4 additions & 6 deletions editors/inkscape/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,19 @@ glade_files = Glob("sozi/*.glade")
po_files = Glob("sozi/lang/*.po")
icon_files = Glob("sozi/*.png")

Import("player_files")

#
# Set target directory for installation
#

inkscape_extensions_dir = os.environ["HOME"] + "/tmp/config/inkscape/extensions"
inkscape_extensions_dir = os.environ["HOME"] + "/.config/inkscape/extensions"
inkscape_extensions_sozi_dir = inkscape_extensions_dir + "/sozi"

Alias("install-editor-inkscape", inkscape_extensions_dir)

Install(inkscape_extensions_dir, inx_files + py_files)
Install(inkscape_extensions_sozi_dir, py_module_files + glade_files + icon_files)
Install(inkscape_extensions_sozi_dir, py_module_files + glade_files + icon_files + player_files)

#
# Insert Sozi version in sozi/version.py
Expand All @@ -46,10 +48,6 @@ for mo_file in mo_files:
lang = os.path.splitext(mo_file.name)[0]
InstallAs("{0}/lang/{1}/LC_MESSAGES/sozi.mo".format(inkscape_extensions_sozi_dir, lang), mo_file)

#
# TODO install player files
#

#
# Install license files
#
Expand Down
7 changes: 5 additions & 2 deletions player/SConscript
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@

SConscript("js/SConscript")
SConscript("css/SConscript")
player_files = SConscript("js/SConscript")
player_files += SConscript("css/SConscript")

Return("player_files")

4 changes: 3 additions & 1 deletion player/css/SConscript
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

Command("sozi.min.css", "sozi.css", Copy("$TARGET", "$SOURCE"))
css_files = Command("sozi.min.css", "sozi.css", Copy("$TARGET", "$SOURCE"))

Return("css_files")

7 changes: 5 additions & 2 deletions player/js/SConscript
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@

env = Environment(tools = ["default", CONCATENATE_JS, UGLIFY_JS])

env.ConcatenateJS("sozi.cat.js", "sozi.js")
env.UglifyJS("sozi.min.js", "sozi.cat.js")
js_files = env.UglifyJS("sozi.min.js", "sozi.cat.js")

js_files += env.UglifyJS("extras/sozi_extras_media.min.js", "extras/sozi_extras_media.js")

env.UglifyJS("extras/sozi_extras_media.min.js", "extras/sozi_extras_media.js")
Return("js_files")

0 comments on commit 4d8c54b

Please sign in to comment.