Menu
▾
▴
xml-cppdom-checkins — CVS commit list
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(76) |
Jun
(1) |
Jul
|
Aug
(13) |
Sep
|
Oct
|
Nov
|
Dec
(9) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(53) |
Feb
(31) |
Mar
|
Apr
(3) |
May
|
Jun
(4) |
Jul
(2) |
Aug
|
Sep
|
Oct
(3) |
Nov
(2) |
Dec
(1) |
| 2004 |
Jan
(5) |
Feb
(52) |
Mar
(23) |
Apr
(40) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
(2) |
Nov
(5) |
Dec
|
| 2005 |
Jan
|
Feb
(5) |
Mar
|
Apr
(8) |
May
(6) |
Jun
(5) |
Jul
|
Aug
(2) |
Sep
|
Oct
(3) |
Nov
|
Dec
(4) |
| 2006 |
Jan
(2) |
Feb
|
Mar
(2) |
Apr
(20) |
May
(2) |
Jun
(31) |
Jul
(30) |
Aug
(20) |
Sep
(1) |
Oct
|
Nov
(14) |
Dec
|
| 2007 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(37) |
Jul
(8) |
Aug
(10) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
(15) |
Apr
(4) |
May
(4) |
Jun
|
Jul
(1) |
Aug
|
Sep
(11) |
Oct
(4) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(9) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(18) |
Aug
(3) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: <al...@us...> - 2006-07-24 13:37:10
|
Revision: 535 Author: allenb Date: 2006-07-24 06:37:05 -0700 (Mon, 24 Jul 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=535&view=rev Log Message: ----------- Use platform specific sconf and sconsign filenames to allow for building cross-platform out of same directory. Modified Paths: -------------- trunk/SConstruct Modified: trunk/SConstruct =================================================================== --- trunk/SConstruct 2006-07-24 00:39:18 UTC (rev 534) +++ trunk/SConstruct 2006-07-24 13:37:05 UTC (rev 535) @@ -51,7 +51,7 @@ EnsureSConsVersion(0,96) #SourceSignatures('MD5') #SourceSignatures('timestamp') -SConsignFile() +SConsignFile('.sconsign.'+GetPlatform()) # Figure out what version of CppDom we're using CPPDOM_VERSION = GetCppDomVersion() @@ -69,6 +69,8 @@ else: common_env = Environment(ENV = os.environ) SConsAddons.Builders.registerSubstBuilder(common_env) +common_env["CONFIGUREDIR"] = '.sconf_temp_'+platform +common_env["CONFIGURELOG"] = 'sconf.log_'+platform # Create variant helper and builder variant_helper = sca_variants.VariantsHelper() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <al...@us...> - 2006-07-24 00:39:23
|
Revision: 534 Author: allenb Date: 2006-07-23 17:39:18 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=534&view=rev Log Message: ----------- Update build to use the new variant builder iterate() method. Modified Paths: -------------- trunk/SConstruct trunk/cppdom/SConscript trunk/test/SConscript trunk/test/suite/SConscript Modified: trunk/SConstruct =================================================================== --- trunk/SConstruct 2006-07-23 23:49:43 UTC (rev 533) +++ trunk/SConstruct 2006-07-24 00:39:18 UTC (rev 534) @@ -123,7 +123,12 @@ variant_helper.readOptions(common_env) base_bldr.readOptions(common_env) base_bldr.enableWarnings() - + + # Apply any common package options + # Update environment for boost options + if boost_options.isAvailable(): + boost_options.apply(common_env) + # If defaulting to instlinks prefix: # - Use symlinks # - Manually set the used prefix to the instlinks of the build dir @@ -147,73 +152,25 @@ base_inst_paths['include'] = pj(base_inst_paths['base'], 'include') print "using prefix: ", base_inst_paths['base'] - # Define the variants to use - # - variant[key] - ([option_list,], is alternative) - variants = variant_helper.variants - - # Return list of combos - # [ {"var":"option", "var2":["op1","op2"], .. } - var_combos = sca_variants.zipVariants(variants) + print "types: ", variant_helper.variants["type"] + print "libtypes: ", variant_helper.variants["libtype"] + print "archs: ", variant_helper.variants["arch"] - print "types: ", variants["type"] - print "libtypes: ", variants["libtype"] - print "archs: ", variants["arch"] + sub_dirs = ['cppdom'] + if common_env['build_test'] == 'yes': + sub_dirs.append('test') - # Apply any common package options - # Update environment for boost options - if boost_options.isAvailable(): - boost_options.apply(common_env) - - # ---- FOR EACH VARIANT ----- # - variant_pass = -1 # Id of the pass, useful for one-time things - for combo in var_combos: - variant_pass += 1 # xxx: standard + # ---- FOR EACH VARIANT ----- # + for combo in variant_helper.iterate(locals(), base_bldr, common_env): + #baseEnv = env_bldr.applyToEnvironment(common_env.Copy(), variant=combo,options=opts) + print " Processing combo: ", ", ".join(['%s:%s'%(i[0],i[1]) for i in combo.iteritems()]) + inst_paths = copy.copy(base_inst_paths) - - # -- Setup Environment builder --- # - env_bldr = base_bldr.clone() - - # Process modifications for variant combo - # xxx: standard - if combo["type"] == "debug": - env_bldr.enableDebug() - env_bldr.setMsvcRuntime(EnvironmentBuilder.MSVC_MT_DBG_DLL_RT) - elif combo["type"] == "optimized": - env_bldr.enableOpt() - env_bldr.setMsvcRuntime(EnvironmentBuilder.MSVC_MT_DLL_RT) - elif combo["type"] == "hybrid": - env_bldr.enableDebug() - env_bldr.setMsvcRuntime(EnvironmentBuilder.MSVC_MT_DLL_RT) - - if "ia32" == combo["arch"]: - env_bldr.setCpuArch(EnvironmentBuilder.IA32_ARCH) - elif "x64" == combo["arch"]: - env_bldr.setCpuArch(EnvironmentBuilder.X64_ARCH) + if GetPlatform() != "win32" and "debug" == combo["type"]: + inst_paths["lib"] = pj(inst_paths["lib"],"debug") + if "x64" == combo["arch"]: inst_paths['lib'] = inst_paths['lib'] + '64' - - - # --- Build environment --- # - baseEnv = env_bldr.applyToEnvironment(common_env.Copy(), variant=combo,options=opts) - - # Determine the build dir for this variant - # xxx: common - dir_parts = ['%s-%s'%(i[0],i[1]) for i in combo.iteritems() if not isinstance(i[1],(types.ListType))] - full_build_dir = pj(buildDir,"--".join(dir_parts)) - # Build up library name and paths to use - # xxx: common - (static_lib_suffix,shared_lib_suffix) = ("","") - if GetPlatform() == "win32": - if combo["type"] == "debug": - (static_lib_suffix,shared_lib_suffix) = ("_d_s","_d") - elif combo["type"] == "optimized": - (static_lib_suffix,shared_lib_suffix) = ("_s","") - elif combo["type"] == "hybrid": - (static_lib_suffix,shared_lib_suffix) = ("_h_s","_h") - else: - if combo["type"] == "debug": - inst_paths["lib"] = pj(inst_paths["lib"],"debug") - cppdom_shared_libname = 'cppdom' + shared_lib_suffix + version_suffix cppdom_static_libname = 'cppdom' + static_lib_suffix + version_suffix @@ -223,16 +180,13 @@ elif "static" in combo["libtype"]: cppdom_app_libname = cppdom_static_libname - Export('baseEnv','inst_paths','opts', 'variant_pass','combo', + Export('build_env','inst_paths','opts', 'variant_pass','combo', 'cppunit_options', 'boost_options', 'cppdom_shared_libname','cppdom_static_libname', 'cppdom_app_libname') - - dirs = ['cppdom'] - if common_env['build_test'] == 'yes': - dirs.append('test') - + # Process subdirectories - for d in dirs: + full_build_dir = pj(buildDir,combo_dir) + for d in sub_dirs: SConscript(pj(d,'SConscript'), build_dir=pj(full_build_dir, d), duplicate=0) # Build up the provides vars for the .fpc files @@ -270,10 +224,10 @@ if combo["type"] != "optimized": name_parts.append(combo["type"]) pc_filename = "-".join(name_parts) + ".fpc" - cppdom_pc = baseEnv.SubstBuilder(pj(inst_paths['pkgconfig'],pc_filename), + cppdom_pc = build_env.SubstBuilder(pj(inst_paths['pkgconfig'],pc_filename), 'cppdom.fpc.in', submap=submap) - baseEnv.AddPostAction (cppdom_pc, Chmod('$TARGET', 0644)) - baseEnv.Depends(cppdom_pc, 'cppdom/version.h') + build_env.AddPostAction (cppdom_pc, Chmod('$TARGET', 0644)) + build_env.Depends(cppdom_pc, 'cppdom/version.h') ## Setup the builder for cppdom-config #if GetPlatform() != 'win32': Modified: trunk/cppdom/SConscript =================================================================== --- trunk/cppdom/SConscript 2006-07-23 23:49:43 UTC (rev 533) +++ trunk/cppdom/SConscript 2006-07-24 00:39:18 UTC (rev 534) @@ -27,7 +27,7 @@ if boost_options.isAvailable(): sources.append("SpiritParser.cpp") -cppdom_lib_env = baseEnv.Copy() +cppdom_lib_env = build_env.Copy() cppdom_lib_env.Append(CPPPATH = [inst_paths['include'],], CPPDEFINES=["CPPDOM_EXPORTS",]) Modified: trunk/test/SConscript =================================================================== --- trunk/test/SConscript 2006-07-23 23:49:43 UTC (rev 533) +++ trunk/test/SConscript 2006-07-24 00:39:18 UTC (rev 534) @@ -4,9 +4,7 @@ import os pj = os.path.join - - -test_env = baseEnv.Copy() +test_env = build_env.Copy() test_env.Append(CPPPATH = [inst_paths['include'], '#test'], LIBPATH = [inst_paths['lib'],], LIBS = [cppdom_app_libname]) Modified: trunk/test/suite/SConscript =================================================================== --- trunk/test/suite/SConscript 2006-07-23 23:49:43 UTC (rev 533) +++ trunk/test/suite/SConscript 2006-07-24 00:39:18 UTC (rev 534) @@ -16,7 +16,7 @@ if boost_options.isAvailable(): sources.append("TestCases/SpiritTest.cpp") -env = baseEnv.Copy() +env = build_env.Copy() env.Append(CPPPATH = [inst_paths['include'], '#test', pj('#test','suite')], LIBPATH = [inst_paths['lib'],], LIBS = [cppdom_app_libname]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <al...@us...> - 2006-07-23 23:49:45
|
Revision: 533 Author: allenb Date: 2006-07-23 16:49:43 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=533&view=rev Log Message: ----------- Further updates to common variant code in scons-addons. Modified Paths: -------------- trunk/SConstruct Modified: trunk/SConstruct =================================================================== --- trunk/SConstruct 2006-07-23 23:01:10 UTC (rev 532) +++ trunk/SConstruct 2006-07-23 23:49:43 UTC (rev 533) @@ -16,6 +16,7 @@ import SConsAddons.Util import SConsAddons.Options as sca_opts import SConsAddons.Variants as sca_variants +import SConsAddons.Builders import SConsAddons.Options.CppUnit import SConsAddons.Options.Boost from SConsAddons.EnvironmentBuilder import EnvironmentBuilder @@ -44,38 +45,10 @@ return 0 -# ------ CUSTOM BUILDERS ------------- # -def CreateConfig(target, source, env): - """ Config script builder - Creates the prefix-config file users use to compile against this library - """ - targets = map(lambda x: str(x), target) - sources = map(lambda x: str(x), source) - - submap = env['submap'] - - # Build each target from its source - for i in range(len(targets)): - print "Generating config file " + targets[i] - contents = open(sources[i], 'r').read() - - # Go through the substitution dictionary and modify the contents read in - # from the source file - for key, value in submap.items(): - contents = re.sub(re.escape(key), value, contents) - - # Write out the target file with the new contents - open(targets[0], 'w').write(contents) - os.chmod(targets[0], 0755) - -def registerConfigBuilder(env): - env["BUILDERS"]["ConfigBuilder"] = Builder(action=Action(CreateConfig, varlist=['submap',])) - - #------------------------------------------------------------------------------ # Main build setup #------------------------------------------------------------------------------ -EnsureSConsVersion(0,94) +EnsureSConsVersion(0,96) #SourceSignatures('MD5') #SourceSignatures('timestamp') SConsignFile() @@ -95,18 +68,10 @@ common_env = Environment() else: common_env = Environment(ENV = os.environ) -registerConfigBuilder(common_env) +SConsAddons.Builders.registerSubstBuilder(common_env) +# Create variant helper and builder variant_helper = sca_variants.VariantsHelper() - - -# Variant setup (get defaults) -default_types = ["debug","optimized"] -if GetPlatform() == "win32": - default_types.append("hybrid") -default_libtypes = ["static","shared"] -default_archs = ["ia32","x64"] - base_bldr = EnvironmentBuilder() # --------------- # @@ -120,11 +85,8 @@ opts.AddOption(sca_opts.SeparatorOption("\nPackage Options")) opts.AddOption( cppunit_options ) opts.AddOption( boost_options ) -# Variant options -opts.AddOption(sca_opts.SeparatorOption("\nBuild Variants")) -opts.Add(sca_opts.ListOption('types','Types of run-times to build.(comma separated list)',default_types,default_types)) -opts.Add(sca_opts.ListOption('libtypes','Library types to build.(comma separated list)',default_libtypes,default_libtypes)) -opts.Add(sca_opts.ListOption('archs','Run-time architectures to build against.(comma separated list)',default_archs,default_archs)) +base_bldr.addOptions(opts) +variant_helper.addOptions(opts) opts.AddOption(sca_opts.SeparatorOption("\nOther settings")) opts.Add('prefix', 'Installation prefix', unspecified_prefix) opts.Add('build_test', 'Build the test programs', 'yes') @@ -133,7 +95,6 @@ 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']) -base_bldr.addOptions(opts) opts.Process(common_env) @@ -159,6 +120,7 @@ pass # -- Common builder settings + variant_helper.readOptions(common_env) base_bldr.readOptions(common_env) base_bldr.enableWarnings() @@ -187,18 +149,15 @@ # Define the variants to use # - variant[key] - ([option_list,], is alternative) - variants = {} - variants["type"] = (common_env["types"], True) - variants["libtype"] = (common_env["libtypes"], False) - variants["arch"] = (common_env["archs"], True) + variants = variant_helper.variants # Return list of combos # [ {"var":"option", "var2":["op1","op2"], .. } var_combos = sca_variants.zipVariants(variants) - print "types: ", common_env["types"] - print "libtypes: ", common_env["libtypes"] - print "archs: ", common_env["archs"] + print "types: ", variants["type"] + print "libtypes: ", variants["libtype"] + print "archs: ", variants["arch"] # Apply any common package options # Update environment for boost options @@ -311,7 +270,7 @@ if combo["type"] != "optimized": name_parts.append(combo["type"]) pc_filename = "-".join(name_parts) + ".fpc" - cppdom_pc = baseEnv.ConfigBuilder(pj(inst_paths['pkgconfig'],pc_filename), + cppdom_pc = baseEnv.SubstBuilder(pj(inst_paths['pkgconfig'],pc_filename), 'cppdom.fpc.in', submap=submap) baseEnv.AddPostAction (cppdom_pc, Chmod('$TARGET', 0644)) baseEnv.Depends(cppdom_pc, 'cppdom/version.h') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <al...@us...> - 2006-07-23 23:01:12
|
Revision: 532 Author: allenb Date: 2006-07-23 16:01:10 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=532&view=rev Log Message: ----------- Begin to use VariantHelper. Modified Paths: -------------- trunk/SConstruct Modified: trunk/SConstruct =================================================================== --- trunk/SConstruct 2006-07-23 21:23:14 UTC (rev 531) +++ trunk/SConstruct 2006-07-23 23:01:10 UTC (rev 532) @@ -97,6 +97,9 @@ common_env = Environment(ENV = os.environ) registerConfigBuilder(common_env) +variant_helper = sca_variants.VariantsHelper() + + # Variant setup (get defaults) default_types = ["debug","optimized"] if GetPlatform() == "win32": This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <al...@us...> - 2006-07-23 21:23:19
|
Revision: 531 Author: allenb Date: 2006-07-23 14:23:14 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=531&view=rev Log Message: ----------- Updated the build to use the new evironment builder command line capabilities. Modified Paths: -------------- trunk/SConstruct trunk/cppdom/cppdom.cpp Modified: trunk/SConstruct =================================================================== --- trunk/SConstruct 2006-07-23 19:48:58 UTC (rev 530) +++ trunk/SConstruct 2006-07-23 21:23:14 UTC (rev 531) @@ -88,24 +88,27 @@ platform = SConsAddons.Util.GetPlatform() unspecified_prefix = "use-instlinks" -#default_libdir = 'lib' +buildDir = "build." + platform +option_filename = "config.cache." + platform if GetPlatform() == "win32": common_env = Environment() else: common_env = Environment(ENV = os.environ) +registerConfigBuilder(common_env) # Variant setup (get defaults) default_types = ["debug","optimized"] if GetPlatform() == "win32": default_types.append("hybrid") default_libtypes = ["static","shared"] -default_archs = ["32","64"] +default_archs = ["ia32","x64"] +base_bldr = EnvironmentBuilder() + # --------------- # # --- OPTIONS --- # # --------------- # -option_filename = "config.cache." + platform opts = sca_opts.Options(files = [option_filename, 'options.custom'], args= ARGUMENTS) @@ -124,11 +127,10 @@ 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)) -opts.Add(sca_opts.BoolOption('universal', 'Build universal binaries (Mac OS X only)',True)) -opts.Add('sdk', 'Platform SDK (Mac OS X only)', '') 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']) +base_bldr.addOptions(opts) opts.Process(common_env) @@ -152,11 +154,11 @@ opts.Save(option_filename, common_env) except LookupError, le: pass - - registerConfigBuilder(common_env) - - buildDir = "build." + platform + # -- Common builder settings + base_bldr.readOptions(common_env) + base_bldr.enableWarnings() + # If defaulting to instlinks prefix: # - Use symlinks # - Manually set the used prefix to the instlinks of the build dir @@ -199,7 +201,7 @@ # Update environment for boost options if boost_options.isAvailable(): boost_options.apply(common_env) - + # ---- FOR EACH VARIANT ----- # variant_pass = -1 # Id of the pass, useful for one-time things for combo in var_combos: @@ -207,35 +209,26 @@ inst_paths = copy.copy(base_inst_paths) # -- Setup Environment builder --- # - env_bldr = EnvironmentBuilder() - # xxx: loop invariant - env_bldr.enableWarnings(EnvironmentBuilder.MINIMAL) - + env_bldr = base_bldr.clone() + # Process modifications for variant combo # xxx: standard if combo["type"] == "debug": env_bldr.enableDebug() env_bldr.setMsvcRuntime(EnvironmentBuilder.MSVC_MT_DBG_DLL_RT) elif combo["type"] == "optimized": - env_bldr.enableOpt(EnvironmentBuilder.STANDARD) + env_bldr.enableOpt() env_bldr.setMsvcRuntime(EnvironmentBuilder.MSVC_MT_DLL_RT) elif combo["type"] == "hybrid": env_bldr.enableDebug() env_bldr.setMsvcRuntime(EnvironmentBuilder.MSVC_MT_DLL_RT) - if "32" == combo["arch"]: + if "ia32" == combo["arch"]: env_bldr.setCpuArch(EnvironmentBuilder.IA32_ARCH) - elif "64" == combo["arch"]: + elif "x64" == combo["arch"]: env_bldr.setCpuArch(EnvironmentBuilder.X64_ARCH) inst_paths['lib'] = inst_paths['lib'] + '64' - # xxx: loop invariant - if common_env["universal"] == True: - env_bldr.darwin_enableUniversalBinaries(); - - # xxx: loop invariant - if common_env["sdk"] != "": - env_bldr.darwin_setSdk(common_env["sdk"]) # --- Build environment --- # baseEnv = env_bldr.applyToEnvironment(common_env.Copy(), variant=combo,options=opts) @@ -266,7 +259,7 @@ if "shared" in combo["libtype"]: cppdom_app_libname = cppdom_shared_libname elif "static" in combo["libtype"]: - cppdom_app_libname = cppdom_static_libname, sources + cppdom_app_libname = cppdom_static_libname Export('baseEnv','inst_paths','opts', 'variant_pass','combo', 'cppunit_options', 'boost_options', @@ -287,9 +280,9 @@ provides += "_%s"%combo["type"] arch = "noarch" - if "32" == combo["arch"]: + if "ia32" == combo["arch"]: arch = "i386" - elif "64" == combo["arch"]: + elif "x64" == combo["arch"]: arch = "x86_64" # - Define a builder for the cppdom.pc file Modified: trunk/cppdom/cppdom.cpp =================================================================== --- trunk/cppdom/cppdom.cpp 2006-07-23 19:48:58 UTC (rev 530) +++ trunk/cppdom/cppdom.cpp 2006-07-23 21:23:14 UTC (rev 531) @@ -111,6 +111,8 @@ // Remove escaping from xml text std::string removeXmlEscaping(const std::string& data, bool isCdata) { + cppdom::ignore_unused_variable_warning(isCdata); + std::string ret_str; for(std::string::size_type i = 0; i < data.size(); ++i) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <al...@us...> - 2006-07-23 19:49:02
|
Revision: 530 Author: allenb Date: 2006-07-23 12:48:58 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=530&view=rev Log Message: ----------- - Update to using 'darwin' platform - Mark areas that are potential for generalization Modified Paths: -------------- trunk/SConstruct Modified: trunk/SConstruct =================================================================== --- trunk/SConstruct 2006-07-23 17:47:33 UTC (rev 529) +++ trunk/SConstruct 2006-07-23 19:48:58 UTC (rev 530) @@ -95,14 +95,16 @@ else: common_env = Environment(ENV = os.environ) -# Default variants +# Variant setup (get defaults) default_types = ["debug","optimized"] if GetPlatform() == "win32": default_types.append("hybrid") default_libtypes = ["static","shared"] default_archs = ["32","64"] - + +# --------------- # # --- OPTIONS --- # +# --------------- # option_filename = "config.cache." + platform opts = sca_opts.Options(files = [option_filename, 'options.custom'], args= ARGUMENTS) @@ -112,17 +114,16 @@ opts.AddOption(sca_opts.SeparatorOption("\nPackage Options")) opts.AddOption( cppunit_options ) opts.AddOption( boost_options ) +# Variant options opts.AddOption(sca_opts.SeparatorOption("\nBuild Variants")) opts.Add(sca_opts.ListOption('types','Types of run-times to build.(comma separated list)',default_types,default_types)) opts.Add(sca_opts.ListOption('libtypes','Library types to build.(comma separated list)',default_libtypes,default_libtypes)) opts.Add(sca_opts.ListOption('archs','Run-time architectures to build against.(comma separated list)',default_archs,default_archs)) opts.AddOption(sca_opts.SeparatorOption("\nOther settings")) opts.Add('prefix', 'Installation prefix', unspecified_prefix) -#opts.Add('libdir', 'Library installation directory under <prefix>', default_libdir) 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)) -opts.Add('MakeDist', 'If true, make the distribution packages as part of the build', 'no') opts.Add(sca_opts.BoolOption('universal', 'Build universal binaries (Mac OS X only)',True)) opts.Add('sdk', 'Platform SDK (Mac OS X only)', '') if common_env.has_key("MSVS"): @@ -164,7 +165,7 @@ common_env['INSTALL'] = symlinkInstallFunc common_env['prefix'] = pj( Dir('.').get_abspath(), buildDir, 'instlinks') - # Setup installation paths + # --- Setup installation paths --- # base_inst_paths = {} base_inst_paths['base'] = os.path.abspath(common_env['prefix']) base_inst_paths['lib'] = pj(base_inst_paths['base'], 'lib') @@ -185,6 +186,10 @@ variants["type"] = (common_env["types"], True) variants["libtype"] = (common_env["libtypes"], False) variants["arch"] = (common_env["archs"], True) + + # Return list of combos + # [ {"var":"option", "var2":["op1","op2"], .. } + var_combos = sca_variants.zipVariants(variants) print "types: ", common_env["types"] print "libtypes: ", common_env["libtypes"] @@ -194,23 +199,20 @@ # Update environment for boost options if boost_options.isAvailable(): boost_options.apply(common_env) - - # Return list of combos - # [ {"var":"option", "var2":["op1","op2"], .. } - var_combos = sca_variants.zipVariants(variants) # ---- FOR EACH VARIANT ----- # variant_pass = -1 # Id of the pass, useful for one-time things for combo in var_combos: - variant_pass += 1 + variant_pass += 1 # xxx: standard inst_paths = copy.copy(base_inst_paths) # -- Setup Environment builder --- # - env_bldr = EnvironmentBuilder() - #env_bldr.enableWarnings(EnvironmentBuilder.MAXIMUM) + env_bldr = EnvironmentBuilder() + # xxx: loop invariant env_bldr.enableWarnings(EnvironmentBuilder.MINIMAL) # Process modifications for variant combo + # xxx: standard if combo["type"] == "debug": env_bldr.enableDebug() env_bldr.setMsvcRuntime(EnvironmentBuilder.MSVC_MT_DBG_DLL_RT) @@ -227,9 +229,11 @@ env_bldr.setCpuArch(EnvironmentBuilder.X64_ARCH) inst_paths['lib'] = inst_paths['lib'] + '64' + # xxx: loop invariant if common_env["universal"] == True: env_bldr.darwin_enableUniversalBinaries(); + # xxx: loop invariant if common_env["sdk"] != "": env_bldr.darwin_setSdk(common_env["sdk"]) @@ -237,10 +241,12 @@ baseEnv = env_bldr.applyToEnvironment(common_env.Copy(), variant=combo,options=opts) # Determine the build dir for this variant + # xxx: common dir_parts = ['%s-%s'%(i[0],i[1]) for i in combo.iteritems() if not isinstance(i[1],(types.ListType))] full_build_dir = pj(buildDir,"--".join(dir_parts)) # Build up library name and paths to use + # xxx: common (static_lib_suffix,shared_lib_suffix) = ("","") if GetPlatform() == "win32": if combo["type"] == "debug": This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <al...@us...> - 2006-07-23 17:47:36
|
Revision: 529 Author: allenb Date: 2006-07-23 10:47:33 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=529&view=rev Log Message: ----------- Use the new variant code being moved to scons-addons. Modified Paths: -------------- trunk/SConstruct Modified: trunk/SConstruct =================================================================== --- trunk/SConstruct 2006-07-21 19:28:27 UTC (rev 528) +++ trunk/SConstruct 2006-07-23 17:47:33 UTC (rev 529) @@ -15,6 +15,7 @@ import SCons import SConsAddons.Util import SConsAddons.Options as sca_opts +import SConsAddons.Variants as sca_variants import SConsAddons.Options.CppUnit import SConsAddons.Options.Boost from SConsAddons.EnvironmentBuilder import EnvironmentBuilder @@ -42,60 +43,7 @@ os.symlink(pj(os.getcwd(), source), dest) return 0 -def zipVariants(variantMap): - """ This method takes a map of variants and items within each variant and returns - a list of all combinations of ways that the variants can be combined. - - The input format is: - { key : ([option_list,], is_alternative), } - - option_list is a list of all items for this variant. - - is_alternative is a flag saying wether we just need to choose one item or if all - items can be in the same variant combination - - The return format is: - [ {"var":"option", "var2":["op1","op2"]}, .. } - - Each entry in the list is a dictionary that fully specfies a combination of - variant keys and associated items. - """ - - # List of (key,[varlist,]) - alt_items = [ (i[0],i[1][0]) for i in variantMap.iteritems() if i[1][1] == True] - always_items = [ (i[0],i[1][0]) for i in variantMap.iteritems() if i[1][1] == False] - assert len(alt_items) + len(always_items) == len(variantMap) - alt_item_sizes = [len(i[1]) for i in alt_items] # Length of the alt lists - - # Build up list of - # [ (key,'option"), (key2,"option"), ...] - cur_combos=[[]] - for variant in alt_items: - new_combos = [] - variant_key = variant[0] - option_list = variant[1] - for option in option_list: - for i in cur_combos: - new_combos.append(i+[(variant_key,option)]) - cur_combos = new_combos - - #print cur_combos - - # Now turn the list of combo lists into a list of - # combo dictionaries - ret_combos = [] - for c in cur_combos: - combo = {} - for i in c: - combo[i[0]] = i[1] - for i in always_items: - combo[i[0]] = i[1] - ret_combos.append(combo) - - #import pprint - #pprint.pprint(ret_combos) - - return ret_combos - # ------ CUSTOM BUILDERS ------------- # def CreateConfig(target, source, env): """ Config script builder @@ -123,33 +71,7 @@ def registerConfigBuilder(env): env["BUILDERS"]["ConfigBuilder"] = Builder(action=Action(CreateConfig, varlist=['submap',])) -# --- Platform specific environment factory methods --- # -def BuildIRIXEnvironment(): - "Builds a base environment for other modules to build on set up for IRIX" - global optimize, profile, builders - CXXFLAGS = ['-n32', '-mips3', '-LANG:std', '-w2'] - LINKFLAGS = CXXFLAGS - - # Enable profiling? - if profile != 'no': - CXXFLAGS.extend([]) - LINKFLAGS.extend([]) - - # Debug or optimize build? - if optimize != 'no': - CXXFLAGS.extend(['-DNDEBUG', '-O2']) - else: - CXXFLAGS.extend(['-D_DEBUG', '-g', '-gslim']) - - return Environment( - ENV = os.environ, - CXXFLAGS = CXXFLAGS, - LINKFLAGS = LINKFLAGS - ) - - - #------------------------------------------------------------------------------ # Main build setup #------------------------------------------------------------------------------ @@ -275,7 +197,7 @@ # Return list of combos # [ {"var":"option", "var2":["op1","op2"], .. } - var_combos = zipVariants(variants) + var_combos = sca_variants.zipVariants(variants) # ---- FOR EACH VARIANT ----- # variant_pass = -1 # Id of the pass, useful for one-time things @@ -312,11 +234,7 @@ env_bldr.darwin_setSdk(common_env["sdk"]) # --- Build environment --- # - if GetPlatform() == 'irix': - baseEnv = BuildIRIXEnvironment() - opts.Apply(baseEnv) - else: - baseEnv = env_bldr.applyToEnvironment(common_env.Copy(), variant=combo,options=opts) + baseEnv = env_bldr.applyToEnvironment(common_env.Copy(), variant=combo,options=opts) # Determine the build dir for this variant dir_parts = ['%s-%s'%(i[0],i[1]) for i in combo.iteritems() if not isinstance(i[1],(types.ListType))] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <al...@us...> - 2006-07-21 19:28:31
|
Revision: 528 Author: allenb Date: 2006-07-21 12:28:27 -0700 (Fri, 21 Jul 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=528&view=rev Log Message: ----------- Fix up repository. Added Paths: ----------- trunk/ Removed Paths: ------------- branches/import_trunk/ Copied: trunk (from rev 526, branches/import_trunk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <al...@us...> - 2006-07-21 19:27:18
|
Revision: 527 Author: allenb Date: 2006-07-21 12:27:14 -0700 (Fri, 21 Jul 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=527&view=rev Log Message: ----------- Fix up repository. Removed Paths: ------------- trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <al...@us...> - 2006-07-21 19:22:14
|
Revision: 526 Author: allenb Date: 2006-07-21 12:22:11 -0700 (Fri, 21 Jul 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=526&view=rev Log Message: ----------- Fix up repository. Added Paths: ----------- branches/import_trunk/ Removed Paths: ------------- trunk/cppdom/ Copied: branches/import_trunk (from rev 525, trunk/cppdom) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: Allen B. <al...@us...> - 2006-07-21 16:16:20
|
allenb 2006/07/21 09:16:20 PDT
Modified files:
. SConstruct
Added files:
. cppdom.fpc.in
Log:
Updated the build to generate flagpoll .fpc files.
Revision Changes Path
1.64 +55 -44 cppdom/SConstruct
1.1 +19 -0 cppdom/cppdom.fpc.in (new)
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/SConstruct.diff?r1=1.63&r2=1.64&diff_format=h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/cppdom.fpc.in?rev=1.1&content-type=text/plain
|
|
From: Allen B. <al...@us...> - 2006-07-21 13:44:35
|
allenb 2006/07/21 06:44:34 PDT
Modified files:
. SConstruct
vc7 cppdom.sln cppdom.vcproj
Log:
Update build to not build the pc and config files in the local source directory.
Revision Changes Path
1.63 +6 -7 cppdom/SConstruct
1.7 +7 -7 cppdom/vc7/cppdom.sln
1.13 +28 -2 cppdom/vc7/cppdom.vcproj
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/SConstruct.diff?r1=1.62&r2=1.63&diff_format=h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/vc7/cppdom.sln.diff?r1=1.6&r2=1.7&diff_format=h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/vc7/cppdom.vcproj.diff?r1=1.12&r2=1.13&diff_format=h
|
|
From: Allen B. <al...@us...> - 2006-07-21 12:44:46
|
allenb 2006/07/21 05:44:44 PDT
Modified files:
test/suite runner.cpp
Log:
Fix compile error in main runner. Included wrong header file. I have no idea how this worked.
Revision Changes Path
1.6 +3 -3 cppdom/test/suite/runner.cpp
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/test/suite/runner.cpp.diff?r1=1.5&r2=1.6&diff_format=h
|
|
From: Patrick H. <pat...@us...> - 2006-07-14 16:01:29
|
patrickh 2006/07/14 09:01:27 PDT
Modified files: (Branch: releng-0-6)
. ChangeLog cppdom.spec
Log:
Prep for the 0.6.5 release.
Revision Changes Path
1.38.2.10 +1 -0 cppdom/ChangeLog
1.4.2.5 +1 -1 cppdom/cppdom.spec
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/ChangeLog.diff?r1=1.38.2.9&r2=1.38.2.10&diff_format=h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/cppdom.spec.diff?r1=1.4.2.4&r2=1.4.2.5&diff_format=h
|
|
From: Patrick H. <pat...@us...> - 2006-07-14 16:00:55
|
patrickh 2006/07/14 09:00:54 PDT
Modified files: (Branch: releng-0-6)
. ChangeLog README
Added files: (Branch: releng-0-6)
vc8 cppdom.sln cppdom.vcproj
Log:
Added support for targeting 64-bit Windows.
Revision Changes Path
1.38.2.9 +1 -0 cppdom/ChangeLog
1.8.2.2 +30 -5 cppdom/README
1.1.2.1 +37 -0 cppdom/vc8/cppdom.sln (new)
1.1.2.1 +713 -0 cppdom/vc8/cppdom.vcproj (new)
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/ChangeLog.diff?r1=1.38.2.8&r2=1.38.2.9&diff_format=h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/README.diff?r1=1.8.2.1&r2=1.8.2.2&diff_format=h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/vc8/cppdom.sln?rev=1.1.2.1&content-type=text/plain
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/vc8/cppdom.vcproj?rev=1.1.2.1&content-type=text/plain
|
|
From: Patrick H. <pat...@us...> - 2006-07-13 13:42:29
|
patrickh 2006/07/13 06:42:26 PDT
Modified files:
cppdom/ext OptionRepository.h
Log:
Fixed build errors when using Visual C++ 7.0.
Revision Changes Path
1.6 +12 -1 cppdom/cppdom/ext/OptionRepository.h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/cppdom/ext/OptionRepository.h.diff?r1=1.5&r2=1.6&diff_format=h
|
|
From: Patrick H. <pat...@us...> - 2006-07-13 13:25:41
|
patrickh 2006/07/13 06:25:41 PDT
Modified files:
cppdom config.h version.h
Log:
Implemented automatic linking when building with Visual C++. Unlike other
projects' use of automatic linking, this feature is optional. It is
enabled by defining CPPDOM_AUTO_LINK and/or CPPDOM_DYN_LINK. If
CPPDOM_AUTO_LINK is defined without CPPDOM_DYN_LINK, then the static
version of the debug or release library is used for linking. Otherwise, the
dynamic version is used.
The reason that I made this optional is largely for backwards compatibility
with existing uses of CppDOM. If automatic linking were not optional, a
user-level build that was not updated to define CPPDOM_DYN_LINK would end
up linking against both the static and dynamic library, thus resulting in
multiply defined symbols at link time. Removing the test to determine if
CPPDOM_AUTO_LINK is defined would result in this library behaving the way
that all others that I have seen that use automatic linking.
Bumped version to 0.7.6.
Revision Changes Path
1.14 +39 -3 cppdom/cppdom/config.h
1.25 +3 -3 cppdom/cppdom/version.h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/cppdom/config.h.diff?r1=1.13&r2=1.14&diff_format=h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/cppdom/version.h.diff?r1=1.24&r2=1.25&diff_format=h
|
|
From: Patrick H. <pat...@us...> - 2006-07-13 13:25:41
|
patrickh 2006/07/13 06:25:41 PDT
Modified files:
. ChangeLog
Log:
Implemented automatic linking when building with Visual C++. Unlike other
projects' use of automatic linking, this feature is optional. It is
enabled by defining CPPDOM_AUTO_LINK and/or CPPDOM_DYN_LINK. If
CPPDOM_AUTO_LINK is defined without CPPDOM_DYN_LINK, then the static
version of the debug or release library is used for linking. Otherwise, the
dynamic version is used.
The reason that I made this optional is largely for backwards compatibility
with existing uses of CppDOM. If automatic linking were not optional, a
user-level build that was not updated to define CPPDOM_DYN_LINK would end
up linking against both the static and dynamic library, thus resulting in
multiply defined symbols at link time. Removing the test to determine if
CPPDOM_AUTO_LINK is defined would result in this library behaving the way
that all others that I have seen that use automatic linking.
Bumped version to 0.7.6.
Revision Changes Path
1.50 +2 -0 cppdom/ChangeLog
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/ChangeLog.diff?r1=1.49&r2=1.50&diff_format=h
|
|
From: Patrick H. <pat...@us...> - 2006-07-13 13:19:09
|
patrickh 2006/07/13 06:19:08 PDT
Modified files:
. ChangeLog
cppdom cppdom.cpp cppdom.h version.h SConscript
vc7 cppdom.vcproj
Removed files:
cppdom version.cpp
Log:
Moved the declaration of cppdom::getVersion() out of version.h and into
cppdom.h (the implementation of cppdom::getVersion() has been moved to
cppdom.cpp). In so doing, version.h now only contains preprocessor symbol
definitions and thus does not require config.h. This is needed so that
config.h can include version.h to set up the automatic linking stuff on
Windows.
Revision Changes Path
1.49 +5 -3 cppdom/ChangeLog
1.25 +0 -1 cppdom/cppdom/SConscript
1.58 +37 -3 cppdom/cppdom/cppdom.cpp
1.91 +5 -2 cppdom/cppdom/cppdom.h
1.4 +0 -76 cppdom/cppdom/version.cpp (dead)
1.24 +2 -12 cppdom/cppdom/version.h
1.12 +0 -3 cppdom/vc7/cppdom.vcproj
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/ChangeLog.diff?r1=1.48&r2=1.49&diff_format=h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/cppdom/SConscript.diff?r1=1.24&r2=1.25&diff_format=h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/cppdom/cppdom.cpp.diff?r1=1.57&r2=1.58&diff_format=h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/cppdom/cppdom.h.diff?r1=1.90&r2=1.91&diff_format=h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/cppdom/version.cpp?rev=&content-type=text/plain
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/cppdom/version.h.diff?r1=1.23&r2=1.24&diff_format=h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/vc7/cppdom.vcproj.diff?r1=1.11&r2=1.12&diff_format=h
|
|
From: Patrick H. <pat...@us...> - 2006-07-12 22:52:08
|
patrickh 2006/07/12 15:52:07 PDT
Modified files: (Branch: releng-0-6)
. ChangeLog
Log:
Implemented automatic linking when building with Visual C++. Unlike other
projects' use of automatic linking, this feature is optional. It is
enabled by defining CPPDOM_AUTO_LINK and/or CPPDOM_DYN_LINK. If
CPPDOM_AUTO_LINK is defined without CPPDOM_DYN_LINK, then the static
version of the debug or release library is used for linking. Otherwise, the
dynamic version is used.
The reason that I made this optional is largely for backwards compatibility
with existing uses of CppDOM. If automatic linking were not optional, a
user-level build that was not updated to define CPPDOM_DYN_LINK would end
up linking against both the static and dynamic library, thus resulting in
multiply defined symbols at link time. Removing the test to determine if
CPPDOM_AUTO_LINK is defined would result in this library behaving the way
that all others that I have seen that use automatic linking.
Revision Changes Path
1.38.2.8 +2 -0 cppdom/ChangeLog
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/ChangeLog.diff?r1=1.38.2.7&r2=1.38.2.8&diff_format=h
|
|
From: Patrick H. <pat...@us...> - 2006-07-12 22:52:07
|
patrickh 2006/07/12 15:52:07 PDT
Modified files: (Branch: releng-0-6)
cppdom config.h
Log:
Implemented automatic linking when building with Visual C++. Unlike other
projects' use of automatic linking, this feature is optional. It is
enabled by defining CPPDOM_AUTO_LINK and/or CPPDOM_DYN_LINK. If
CPPDOM_AUTO_LINK is defined without CPPDOM_DYN_LINK, then the static
version of the debug or release library is used for linking. Otherwise, the
dynamic version is used.
The reason that I made this optional is largely for backwards compatibility
with existing uses of CppDOM. If automatic linking were not optional, a
user-level build that was not updated to define CPPDOM_DYN_LINK would end
up linking against both the static and dynamic library, thus resulting in
multiply defined symbols at link time. Removing the test to determine if
CPPDOM_AUTO_LINK is defined would result in this library behaving the way
that all others that I have seen that use automatic linking.
Revision Changes Path
1.11.4.1 +26 -4 cppdom/cppdom/config.h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/cppdom/config.h.diff?r1=1.11&r2=1.11.4.1&diff_format=h
|
|
From: Allen B. <al...@us...> - 2006-07-11 20:09:19
|
allenb 2006/07/11 13:09:19 PDT
Modified files:
. ChangeLog
cppdom config.h cppdom.h
cppdom/ext OptionRepository.h
Log:
Add missing symbols to DLL exports.
Revision Changes Path
1.48 +1 -0 cppdom/ChangeLog
1.13 +6 -4 cppdom/cppdom/config.h
1.90 +7 -7 cppdom/cppdom/cppdom.h
1.5 +1 -1 cppdom/cppdom/ext/OptionRepository.h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/ChangeLog.diff?r1=1.47&r2=1.48&diff_format=h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/cppdom/config.h.diff?r1=1.12&r2=1.13&diff_format=h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/cppdom/cppdom.h.diff?r1=1.89&r2=1.90&diff_format=h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/cppdom/ext/OptionRepository.h.diff?r1=1.4&r2=1.5&diff_format=h
|
|
From: Allen B. <al...@us...> - 2006-07-10 22:04:32
|
allenb 2006/07/10 15:04:32 PDT
Modified files:
cppdom SConscript
Log:
Fix bug in way I called Append.
Revision Changes Path
1.24 +1 -1 cppdom/cppdom/SConscript
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/cppdom/SConscript.diff?r1=1.23&r2=1.24&diff_format=h
|
|
From: Allen B. <al...@us...> - 2006-07-06 13:31:22
|
allenb 2006/07/06 06:31:21 PDT
Modified files:
. SConstruct
Log:
Added more comments about how zipVariants magic works.
Revision Changes Path
1.62 +20 -2 cppdom/SConstruct
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/SConstruct.diff?r1=1.61&r2=1.62&diff_format=h
|
|
From: Allen B. <al...@us...> - 2006-07-06 13:18:10
|
allenb 2006/07/06 06:18:09 PDT
Modified files:
. SConstruct
test SConscript
test/suite SConscript
Log:
Keep better track of what library applications should link against for each variant.
Revision Changes Path
1.61 +7 -1 cppdom/SConstruct
1.18 +3 -1 cppdom/test/SConscript
1.14 +1 -1 cppdom/test/suite/SConscript
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/SConstruct.diff?r1=1.60&r2=1.61&diff_format=h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/test/SConscript.diff?r1=1.17&r2=1.18&diff_format=h
http://xml-cppdom.cvs.sourceforge.net/xml-cppdom/cppdom/test/suite/SConscript.diff?r1=1.13&r2=1.14&diff_format=h
|
