Author: esr
Date: Thu Mar 27 16:22:56 2008
New Revision: 25192
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25192&view=rev
Log:
A step towards getting fifodir install right.
Modified:
trunk/SConstruct
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25192&r1=25191&r2=25192&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Thu Mar 27 16:22:56 2008
@@ -174,6 +174,10 @@
# Simulate autools-like behavior of prefix and datadir
if not env["datadir"].startswith("/"):
env["datadir"] = os.path.join(env["prefix"], env["datadir"])
+
+# Simulate autools-like behavior of prefix and fifodir
+if not env["fifodir"].startswith("/"):
+ env["fifodir"] = os.path.join(env["prefix"], env["fifofodir"])
env["CXXFLAGS"].append("-DWESNOTH_PATH='\"%s\"'" % env['datadir'])
@@ -624,6 +628,7 @@
bindir = os.path.normpath(os.path.join(env['prefix'], "bin"))
pythonlib = os.path.join(env['prefix'] + "/lib/python/site-packages/wesnoth")
datadir = env['datadir']
+fifodir = env['fifodir']
clientside = [wesnoth, wesnoth_editor, cutter, exploder]
daemons = [wesnothd, campaignd]
pythontools = Split("wmlscope wmllint wmlindent")
@@ -650,21 +655,31 @@
#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()
+env.Append(BUILDERS={'InstallFiltered':Builder(action=InstallFilteredHook)})
+
+clientside_env = env.Clone()
# TargetSignatures('content') causes a crash in the install
# production, at least in scons 0.97, right after the actions finish
# (thus, probably, at target-signature generation time).
-install_env.TargetSignatures('build')
+clientside_env.TargetSignatures('build')
env.Alias('install', [
- 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.InstallFiltered(Dir(datadir), map(Dir, Split('data fonts icons
images sounds translations')))
+ clientside_env.Install(bindir, clientside),
+ clientside_env.Install(bindir, map(lambda tool : 'data/tools/' + tool,
pythontools)),
+ clientside_env.Install(pythonlib, map(lambda module :
'data/tools/wesnoth/' + module, pythonmodules)),
+ clientside_env.InstallFiltered(Dir(datadir), map(Dir, Split('data fonts
icons images sounds translations')))
])
-env.Alias("install-wesnothd", env.Clone().Install(bindir, wesnothd))
+wesnothd_env = env.Clone()
+# FIXME: Only works under Unixes
+fifobuilder = wesnothd_env.Command(bindir, '', [
+ Mkdir(fifodir),
+ Chmod(fifodir, 0700),
+ ])
+env.Alias("install-wesnothd", [ \
+ wesnothd_env.Install(bindir, wesnothd),
+ #wesnothd_env.Install(fifodir, fifobuilder),
+ ])
+
env.Alias("install-campaignd", env.Clone().Install(bindir, campaignd))
#
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
