[xml-cppdom-checkins] SF.net SVN: xml-cppdom: [560] trunk/SConstruct

[<pat...@us...>]

Revision: 560
          http://svn.sourceforge.net/xml-cppdom/?rev=560&view=rev
Author:   patrickh
Date:     2006-11-07 14:34:22 -0800 (Tue, 07 Nov 2006)

Log Message:
-----------
Added a hack to make the MSVS_VERSION command line option work. SCons 0.96.93
is supposed to have some sort of fix to allow MSVS_VERSION to be set after
the creation of the construction environment, but I cannot figure out how to
make that work.

Modified Paths:
--------------
    trunk/SConstruct

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2006-11-07 22:09:58 UTC (rev 559)
+++ trunk/SConstruct	2006-11-07 22:34:22 UTC (rev 560)
@@ -58,7 +58,11 @@
 option_filename = "config.cache." + platform
 
 if GetPlatform() == "win32":
-   common_env = Environment()
+   if ARGUMENTS.has_key("MSVS_VERSION"):
+      common_env = Environment(MSVS_VERSION = ARGUMENTS["MSVS_VERSION"])
+      common_env['WINDOWS_INSERT_MANIFEST'] = True
+   else:
+      common_env = Environment()
 else:
    common_env = Environment(ENV = os.environ)
 SConsAddons.Builders.registerSubstBuilder(common_env)
@@ -87,9 +91,9 @@
 opts.Add('build_test', 'Build the test programs', 'yes')
 opts.Add(sca_opts.BoolOption('versioning', 
                              'If no then build only libraries and headers without versioning', True))
-if common_env.has_key("MSVS"):
-   opts.Add('MSVS_VERSION', 'Set to specific version of MSVS to use. %s'%str(common_env['MSVS']['VERSIONS']), 
-            common_env['MSVS']['VERSION'])
+#if common_env.has_key("MSVS"):
+#   opts.Add('MSVS_VERSION', 'Set to specific version of MSVS to use. %s'%str(common_env['MSVS']['VERSIONS']), 
+#            common_env['MSVS']['VERSION'])
 
 opts.Process(common_env)
 
@@ -156,7 +160,7 @@
    print "types: ",    variant_helper.variants["type"] 
    print "libtypes: ", variant_helper.variants["libtype"] 
    print "archs: ",    variant_helper.variants["arch"] 
-   
+
    sub_dirs = ['cppdom']
    if common_env['build_test'] == 'yes':
       sub_dirs.append('test')


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.