Author: esr
Date: Thu Mar 27 14:48:33 2008
New Revision: 25188
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25188&view=rev
Log:
Data directory installation now works.
Modified:
trunk/SConstruct
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25188&r1=25187&r2=25188&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Thu Mar 27 14:48:33 2008
@@ -5,7 +5,7 @@
# configure.ac. The optipng option is omitted. The following
# constanta should be set before release.
#
-import os, sys, commands
+import os, sys, commands, shutil
#
# Build-control options
@@ -637,6 +637,29 @@
pythontools = Split("wmlscope wmllint wmlindent")
pythonmodules = Split("wmltools.py wmlparser.py wmldata.py wmliterator.py
campaignserver_client.py libsvn.py __init__.py")
+def CopyFilter(fn):
+ "Filter out data-tree things that shouldn't be installed."
+ return not ".svn" in str(fn)
+
+def InstallFilteredHook(target, source, env):
+ if type(target) == type([]):
+ target = target[0]
+ target = str(target)
+ if type(source) == type([]):
+ map(lambda f: InstallFilteredHook(target, f, env), source)
+ elif os.path.isdir(str(source)):
+ if CopyFilter(source):
+ target = os.path.join(target, os.path.basename(str(source)))
+ if not os.path.exists(target):
+ #print "Make directory", target
+ os.makedirs(target)
+ map(lambda f: InstallFilteredHook(target,
os.path.join(str(source), f), env), os.listdir(str(source)))
+ elif CopyFilter(source):
+ #print "Copy source=%s target=%s" % (str(source), target)
+ shutil.copy2(str(source), target)
+ return None
+env =
Environment(BUILDERS={'InstallFiltered':Builder(action=InstallFilteredHook)})
+
install_env = env.Clone()
# TargetSignatures('content') causes a crash in the install
# production, at least in scons 0.97, right after the actions finish
@@ -646,7 +669,7 @@
install_env.Install(bindir, clientside),
install_env.Install(bindir, map(lambda tool : 'data/tools/' + tool,
pythontools)),
install_env.Install(pythonlib, map(lambda module : 'data/tools/wesnoth/' +
module, pythonmodules)),
- install_env.Install(datadir, Split('data fonts icons images sounds'))
+ install_env.InstallFiltered(Dir(datadir), map(Dir, Split('data fonts icons
images sounds translations')))
])
env.Alias("install-wesnothd", env.Clone().Install(bindir, wesnothd))
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
