mail[Wesnoth-commits] r28765 - /trunk/SConstruct


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by loonycyborg on August 19, 2008 - 13:45:
Author: loonycyborg
Date: Tue Aug 19 12:54:28 2008
New Revision: 28765

URL: http://svn.gna.org/viewcvs/wesnoth?rev=28765&view=rev
Log:
Use env.Command to copy/hardlink binaries to working copy root thus fixing 
bug #11987

Modified:
    trunk/SConstruct

Modified: trunk/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=28765&r1=28764&r2=28765&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Tue Aug 19 12:54:28 2008
@@ -318,18 +318,16 @@
     test_env.Append(CPPDEFINES = "BOOST_TEST_DYN_LINK")
 Export("test_env")
 
-
 SConscript("src/SConscript", build_dir = os.path.join("build", build), 
exports = "env")
 Import(binaries + ["sources"])
 binary_nodes = map(eval, binaries)
 if build == "release" : build_suffix = "" + env["PROGSUFFIX"]
 else                  : build_suffix = "-" + build + env["PROGSUFFIX"]
 from install import HardLink
-map(lambda bin, node: Alias(bin, node, node and HardLink("./" + bin + 
build_suffix, node[0].path)), binaries, binary_nodes)
-env.Alias("all", map(Alias, binaries))
+wc_binaries = [ bin and env.Command(bin[0].name.split(".")[0] + 
build_suffix, bin, HardLink("$TARGET", "$SOURCE")) or None for bin in 
binary_nodes ]
+map(lambda bin, node, wc_bin: Alias(bin, [node, wc_bin]), binaries, 
binary_nodes, wc_binaries)
+all = env.Alias("all", map(Alias, binaries))
 env.Default(map(Alias, env["default_targets"]))
-all = env.Alias("all")
-
 
 #
 # Utility productions (Unix-like systems only)




Related Messages


Powered by MHonArc, Updated Tue Aug 19 14:21:19 2008