mail[Wesnoth-commits] r33944 - in /trunk: packaging/windows/SConscript scons/gettext.py scons/install.py scons/python_devel.py src/SConscript


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

Header


Content

Posted by loonycyborg on March 20, 2009 - 21:49:
Author: loonycyborg
Date: Fri Mar 20 21:49:23 2009
New Revision: 33944

URL: http://svn.gna.org/viewcvs/wesnoth?rev=33944&view=rev
Log:
Use env.AddMethod to add custom methods.

Modified:
    trunk/packaging/windows/SConscript
    trunk/scons/gettext.py
    trunk/scons/install.py
    trunk/scons/python_devel.py
    trunk/src/SConscript

Modified: trunk/packaging/windows/SConscript
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/packaging/windows/SConscript?rev=33944&r1=33943&r2=33944&view=diff
==============================================================================
--- trunk/packaging/windows/SConscript (original)
+++ trunk/packaging/windows/SConscript Fri Mar 20 21:49:23 2009
@@ -34,5 +34,4 @@
 
     env.Alias("windows-installer", [files, "#/Wesnoth.nsi"], "makensis 
${SOURCES[-1]}")
 
-from SCons.Script.SConscript import SConsEnvironment
-SConsEnvironment.WindowsInstaller = WindowsInstaller
+env.AddMethod(WindowsInstaller)

Modified: trunk/scons/gettext.py
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/scons/gettext.py?rev=33944&r1=33943&r2=33944&view=diff
==============================================================================
--- trunk/scons/gettext.py (original)
+++ trunk/scons/gettext.py Fri Mar 20 21:49:23 2009
@@ -43,8 +43,7 @@
             return env.MsgMerge(target, source)
         else:
             return env.MsgInit(target, source)
-    from SCons.Script.SConscript import SConsEnvironment
-    SConsEnvironment.MsgInitMerge = MsgInitMerge
+    env.AddMethod(MsgInitMerge)
 
     env["PO4A_GETTEXTIZE"] = WhereIs("po4a-gettextize")
     po4a_gettextize = Builder(

Modified: trunk/scons/install.py
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/scons/install.py?rev=33944&r1=33943&r2=33944&view=diff
==============================================================================
--- trunk/scons/install.py (original)
+++ trunk/scons/install.py Fri Mar 20 21:49:23 2009
@@ -102,10 +102,8 @@
         env.Alias("install-" + component, install)
 
 def generate(env):
-    #env.AddMethod(InstallWithSuffix)
-    from SCons.Script.SConscript import SConsEnvironment
-    SConsEnvironment.InstallBinary = InstallBinary
-    SConsEnvironment.InstallData = InstallData
+    env.AddMethod(InstallBinary)
+    env.AddMethod(InstallData)
 
     
env.Append(BUILDERS={'InstallFiltered':Builder(action=InstallFilteredHook, 
target_factory=Dir, source_factory=Dir)})
 

Modified: trunk/scons/python_devel.py
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/scons/python_devel.py?rev=33944&r1=33943&r2=33944&view=diff
==============================================================================
--- trunk/scons/python_devel.py (original)
+++ trunk/scons/python_devel.py Fri Mar 20 21:49:23 2009
@@ -10,8 +10,7 @@
     return env.SharedLibrary(target, source, SHLIBPREFIX='', 
SHLIBSUFFIX=distutils.sysconfig.get_config_var("SO"), **kv)
 
 def generate(env):
-    from SCons.Script.SConscript import SConsEnvironment
-    SConsEnvironment.PythonExtension = PythonExtension
+    env.AddMethod(PythonExtension)
 
 def CheckPython(context):
     env = context.env

Modified: trunk/src/SConscript
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/SConscript?rev=33944&r1=33943&r2=33944&view=diff
==============================================================================
--- trunk/src/SConscript (original)
+++ trunk/src/SConscript Fri Mar 20 21:49:23 2009
@@ -302,8 +302,8 @@
     exec target + " = bin"
     Export(target)
 
-from SCons.Script.SConscript import SConsEnvironment
-SConsEnvironment.WesnothProgram = WesnothProgram
+env.AddMethod(WesnothProgram)
+test_env.AddMethod(WesnothProgram)
 
 game_cpp = env.Object("game.cpp", EXTRA_DEFINE = not env["pool_alloc"] and 
"DISABLE_POOL_ALLOC" or None);
 




Related Messages


Powered by MHonArc, Updated Fri Mar 20 23:20:31 2009