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: <pat...@us...> - 2011-05-01 16:11:04
|
Revision: 685
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=685&view=rev
Author: patrickh
Date: 2011-05-01 16:10:58 +0000 (Sun, 01 May 2011)
Log Message:
-----------
Tag CppDOM 1.2.0.
Added Paths:
-----------
tags/1.2.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2011-05-01 16:09:09
|
Revision: 684
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=684&view=rev
Author: patrickh
Date: 2011-05-01 16:09:03 +0000 (Sun, 01 May 2011)
Log Message:
-----------
Roll the version to 1.2.0.
Modified Paths:
--------------
branches/1.2/ChangeLog
branches/1.2/cppdom/version.h
branches/1.2/cppdom.spec
Modified: branches/1.2/ChangeLog
===================================================================
--- branches/1.2/ChangeLog 2011-05-01 16:07:55 UTC (rev 683)
+++ branches/1.2/ChangeLog 2011-05-01 16:09:03 UTC (rev 684)
@@ -1,5 +1,7 @@
DATE AUTHOR CHANGE
---------- ----------- -------------------------------------------------------
+[Version 1.2.0 released - 5.1.2011]============================================
+
2011-04-23 patrickh SCons 2.0 is now the minimum required version.
Submitted by Doug McCorkle.
2010-04-14 patrickh Preserve newlines in CDATA.
Modified: branches/1.2/cppdom/version.h
===================================================================
--- branches/1.2/cppdom/version.h 2011-05-01 16:07:55 UTC (rev 683)
+++ branches/1.2/cppdom/version.h 2011-05-01 16:09:03 UTC (rev 684)
@@ -54,8 +54,8 @@
*/
// The major/minor/patch version (up to 3 digits each).
#define CPPDOM_VERSION_MAJOR 1
-#define CPPDOM_VERSION_MINOR 1
-#define CPPDOM_VERSION_PATCH 2
+#define CPPDOM_VERSION_MINOR 2
+#define CPPDOM_VERSION_PATCH 0
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
Modified: branches/1.2/cppdom.spec
===================================================================
--- branches/1.2/cppdom.spec 2011-05-01 16:07:55 UTC (rev 683)
+++ branches/1.2/cppdom.spec 2011-05-01 16:09:03 UTC (rev 684)
@@ -1,6 +1,6 @@
# Spec file for cppdom.
%define name cppdom
-%define version 1.1.2
+%define version 1.2.0
%define release 1
Name: %{name}
@@ -127,6 +127,9 @@
%doc %{_docdir}/cppdom-%{version}/html
%changelog
+* Sun May 01 2011 Patrick Hartling <pa...@pr...> 1.2.0-1
+- Updated to version 1.2.0.
+
* Wed Apr 14 2010 Patrick Hartling <pa...@pr...> 1.1.2-1
- Updated to version 1.1.2.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2011-05-01 16:08:01
|
Revision: 683
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=683&view=rev
Author: patrickh
Date: 2011-05-01 16:07:55 +0000 (Sun, 01 May 2011)
Log Message:
-----------
Roll the version to 1.3.0.
Modified Paths:
--------------
trunk/ChangeLog
trunk/cppdom/version.h
trunk/cppdom.spec
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-05-01 16:05:20 UTC (rev 682)
+++ trunk/ChangeLog 2011-05-01 16:07:55 UTC (rev 683)
@@ -1,5 +1,7 @@
DATE AUTHOR CHANGE
---------- ----------- -------------------------------------------------------
+[Version 1.2.0 released - 5.1.2011]============================================
+
2011-04-23 patrickh SCons 2.0 is now the minimum required version.
Submitted by Doug McCorkle.
2010-04-14 patrickh Preserve newlines in CDATA.
Modified: trunk/cppdom/version.h
===================================================================
--- trunk/cppdom/version.h 2011-05-01 16:05:20 UTC (rev 682)
+++ trunk/cppdom/version.h 2011-05-01 16:07:55 UTC (rev 683)
@@ -54,8 +54,8 @@
*/
// The major/minor/patch version (up to 3 digits each).
#define CPPDOM_VERSION_MAJOR 1
-#define CPPDOM_VERSION_MINOR 1
-#define CPPDOM_VERSION_PATCH 2
+#define CPPDOM_VERSION_MINOR 3
+#define CPPDOM_VERSION_PATCH 0
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
Modified: trunk/cppdom.spec
===================================================================
--- trunk/cppdom.spec 2011-05-01 16:05:20 UTC (rev 682)
+++ trunk/cppdom.spec 2011-05-01 16:07:55 UTC (rev 683)
@@ -1,6 +1,6 @@
# Spec file for cppdom.
%define name cppdom
-%define version 1.1.2
+%define version 1.3.0
%define release 1
Name: %{name}
@@ -127,6 +127,9 @@
%doc %{_docdir}/cppdom-%{version}/html
%changelog
+* Sun May 01 2011 Patrick Hartling <pa...@pr...> 1.3.0-1
+- Updated to version 1.3.0.
+
* Wed Apr 14 2010 Patrick Hartling <pa...@pr...> 1.1.2-1
- Updated to version 1.1.2.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2011-05-01 16:05:26
|
Revision: 682
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=682&view=rev
Author: patrickh
Date: 2011-05-01 16:05:20 +0000 (Sun, 01 May 2011)
Log Message:
-----------
Create a CppDOM 1.2 branch.
Added Paths:
-----------
branches/1.2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2011-05-01 16:04:18
|
Revision: 681
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=681&view=rev
Author: patrickh
Date: 2011-05-01 16:04:06 +0000 (Sun, 01 May 2011)
Log Message:
-----------
Merge changes in from Revision 415 of SConsAddons.
Revision Links:
--------------
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=415&view=rev
Modified Paths:
--------------
trunk/deps/scons-addons/src/SConsAddons/EnvironmentBuilder.py
trunk/deps/scons-addons/src/SConsAddons/Options/WxWidgets.py
Modified: trunk/deps/scons-addons/src/SConsAddons/EnvironmentBuilder.py
===================================================================
--- trunk/deps/scons-addons/src/SConsAddons/EnvironmentBuilder.py 2011-05-01 15:59:54 UTC (rev 680)
+++ trunk/deps/scons-addons/src/SConsAddons/EnvironmentBuilder.py 2011-05-01 16:04:06 UTC (rev 681)
@@ -453,18 +453,19 @@
# ---- MSVC ---- #
def msvc_optimizations(bldr, env):
- if EnvironmentBuilder.NONE == bldr.optLevel:
- return
-
CCFLAGS = []
CXXFLAGS = []
CPPDEFINES = []
- LINKFLAGS = ["/RELEASE"]
+ LINKFLAGS = []
+ if EnvironmentBuilder.NONE == bldr.debugLevel:
+ LINKFLAGS = ["/RELEASE"]
if EnvironmentBuilder.REDUCE_SIZE in bldr.optTags:
CCFLAGS.extend(['/O1'])
else:
- if bldr.optLevel == EnvironmentBuilder.MINIMAL:
+ if bldr.optLevel == EnvironmentBuilder.NONE:
+ CCFLAGS.extend(['/Od'])
+ elif bldr.optLevel == EnvironmentBuilder.MINIMAL:
CCFLAGS.extend(['/Ot', '/Og'])
elif bldr.optLevel == EnvironmentBuilder.STANDARD:
CCFLAGS.append(['/O2'])
@@ -473,7 +474,7 @@
CCFLAGS.append(['/Ox'])
# Fast math
- if EnvironmentBuilder.FAST_MATH in bldr.optTags:
+ if EnvironmentBuilder.FAST_MATH in bldr.optTags and bldr.optLevel != EnvironmentBuilder.NONE:
CCFLAGS.append(['/fp:fast'])
# TODO: Do architecture specific optimizations here
@@ -489,7 +490,7 @@
#print "Calling msvc_debug."
if EnvironmentBuilder.NONE == bldr.debugLevel:
return
- env.AppendUnique(CCFLAGS = ['/Od', '/Ob0', '/Z7'],
+ env.AppendUnique(CCFLAGS = ['/Ob0', '/Z7'],
LINKFLAGS = ['/DEBUG'])
def msvc_warnings(bldr, env):
Modified: trunk/deps/scons-addons/src/SConsAddons/Options/WxWidgets.py
===================================================================
--- trunk/deps/scons-addons/src/SConsAddons/Options/WxWidgets.py 2011-05-01 15:59:54 UTC (rev 680)
+++ trunk/deps/scons-addons/src/SConsAddons/Options/WxWidgets.py 2011-05-01 16:04:06 UTC (rev 681)
@@ -53,6 +53,7 @@
self.available = False
self.useCppPath = useCppPath
self.found_cxxflags = None
+ self.found_frameworks = None
SConsAddons.Options.PackageOption.__init__(self, name, self.baseDirKey, help_text)
# configurable options
@@ -87,6 +88,9 @@
assert self.baseDir
assert self.wxwidgetsconfig_cmd
return
+ else:
+ self.checkRequired("wxwidgets base dir not found");
+ return
# Find cppunit-config and call it to get the other arguments
sys.stdout.write("searching...\n");
@@ -141,6 +145,7 @@
self.found_incs = cfg_cmd_parser.findIncludes(" --cxxflags")
self.found_cxxflags = cfg_cmd_parser.findCXXFlags()
self.found_libs = cfg_cmd_parser.findLibs()
+ self.found_frameworks = cfg_cmd_parser.findFrameworks()
self.found_lib_paths = cfg_cmd_parser.findLibPaths()
# Create list of flags that may be needed later
@@ -187,6 +192,9 @@
if self.found_libs:
env.Append(LIBS = self.found_libs)
+ if self.found_frameworks:
+ env.Append(FRAMEWORKS = self.found_frameworks)
+
if self.found_cxxflags:
env.Append(CPPDEFINES = self.found_cxxflags)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2011-05-01 16:00:00
|
Revision: 680
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=680&view=rev
Author: patrickh
Date: 2011-05-01 15:59:54 +0000 (Sun, 01 May 2011)
Log Message:
-----------
Tag the import of SConsAddons SVN trunk Revision 415.
Revision Links:
--------------
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=415&view=rev
Added Paths:
-----------
vendor/scons-addons/r415/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2011-05-01 15:59:06
|
Revision: 679
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=679&view=rev
Author: patrickh
Date: 2011-05-01 15:58:58 +0000 (Sun, 01 May 2011)
Log Message:
-----------
Update to Revision 415 of the SConsAddons SVN trunk.
Revision Links:
--------------
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=415&view=rev
Modified Paths:
--------------
vendor/scons-addons/current/src/SConsAddons/EnvironmentBuilder.py
vendor/scons-addons/current/src/SConsAddons/Options/WxWidgets.py
Modified: vendor/scons-addons/current/src/SConsAddons/EnvironmentBuilder.py
===================================================================
--- vendor/scons-addons/current/src/SConsAddons/EnvironmentBuilder.py 2011-04-23 22:08:36 UTC (rev 678)
+++ vendor/scons-addons/current/src/SConsAddons/EnvironmentBuilder.py 2011-05-01 15:58:58 UTC (rev 679)
@@ -453,18 +453,19 @@
# ---- MSVC ---- #
def msvc_optimizations(bldr, env):
- if EnvironmentBuilder.NONE == bldr.optLevel:
- return
-
CCFLAGS = []
CXXFLAGS = []
CPPDEFINES = []
- LINKFLAGS = ["/RELEASE"]
+ LINKFLAGS = []
+ if EnvironmentBuilder.NONE == bldr.debugLevel:
+ LINKFLAGS = ["/RELEASE"]
if EnvironmentBuilder.REDUCE_SIZE in bldr.optTags:
CCFLAGS.extend(['/O1'])
else:
- if bldr.optLevel == EnvironmentBuilder.MINIMAL:
+ if bldr.optLevel == EnvironmentBuilder.NONE:
+ CCFLAGS.extend(['/Od'])
+ elif bldr.optLevel == EnvironmentBuilder.MINIMAL:
CCFLAGS.extend(['/Ot', '/Og'])
elif bldr.optLevel == EnvironmentBuilder.STANDARD:
CCFLAGS.append(['/O2'])
@@ -473,7 +474,7 @@
CCFLAGS.append(['/Ox'])
# Fast math
- if EnvironmentBuilder.FAST_MATH in bldr.optTags:
+ if EnvironmentBuilder.FAST_MATH in bldr.optTags and bldr.optLevel != EnvironmentBuilder.NONE:
CCFLAGS.append(['/fp:fast'])
# TODO: Do architecture specific optimizations here
@@ -489,7 +490,7 @@
#print "Calling msvc_debug."
if EnvironmentBuilder.NONE == bldr.debugLevel:
return
- env.AppendUnique(CCFLAGS = ['/Od', '/Ob0', '/Z7'],
+ env.AppendUnique(CCFLAGS = ['/Ob0', '/Z7'],
LINKFLAGS = ['/DEBUG'])
def msvc_warnings(bldr, env):
Modified: vendor/scons-addons/current/src/SConsAddons/Options/WxWidgets.py
===================================================================
--- vendor/scons-addons/current/src/SConsAddons/Options/WxWidgets.py 2011-04-23 22:08:36 UTC (rev 678)
+++ vendor/scons-addons/current/src/SConsAddons/Options/WxWidgets.py 2011-05-01 15:58:58 UTC (rev 679)
@@ -53,6 +53,7 @@
self.available = False
self.useCppPath = useCppPath
self.found_cxxflags = None
+ self.found_frameworks = None
SConsAddons.Options.PackageOption.__init__(self, name, self.baseDirKey, help_text)
# configurable options
@@ -87,6 +88,9 @@
assert self.baseDir
assert self.wxwidgetsconfig_cmd
return
+ else:
+ self.checkRequired("wxwidgets base dir not found");
+ return
# Find cppunit-config and call it to get the other arguments
sys.stdout.write("searching...\n");
@@ -141,6 +145,7 @@
self.found_incs = cfg_cmd_parser.findIncludes(" --cxxflags")
self.found_cxxflags = cfg_cmd_parser.findCXXFlags()
self.found_libs = cfg_cmd_parser.findLibs()
+ self.found_frameworks = cfg_cmd_parser.findFrameworks()
self.found_lib_paths = cfg_cmd_parser.findLibPaths()
# Create list of flags that may be needed later
@@ -187,6 +192,9 @@
if self.found_libs:
env.Append(LIBS = self.found_libs)
+ if self.found_frameworks:
+ env.Append(FRAMEWORKS = self.found_frameworks)
+
if self.found_cxxflags:
env.Append(CPPDEFINES = self.found_cxxflags)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2011-04-23 22:08:43
|
Revision: 678
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=678&view=rev
Author: patrickh
Date: 2011-04-23 22:08:36 +0000 (Sat, 23 Apr 2011)
Log Message:
-----------
Updated the build to work with, and require, SCons 2.0.
Modified Paths:
--------------
trunk/ChangeLog
trunk/SConstruct
trunk/cppdom/SConscript
trunk/test/SConscript
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-04-04 23:46:05 UTC (rev 677)
+++ trunk/ChangeLog 2011-04-23 22:08:36 UTC (rev 678)
@@ -1,5 +1,7 @@
DATE AUTHOR CHANGE
---------- ----------- -------------------------------------------------------
+2011-04-23 patrickh SCons 2.0 is now the minimum required version.
+ Submitted by Doug McCorkle.
2010-04-14 patrickh Preserve newlines in CDATA.
Submitted by: Carsten Neumann
VERSION: 1.1.2
Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct 2011-04-04 23:46:05 UTC (rev 677)
+++ trunk/SConstruct 2011-04-23 22:08:36 UTC (rev 678)
@@ -27,7 +27,7 @@
#------------------------------------------------------------------------------
# Main build setup
#------------------------------------------------------------------------------
-EnsureSConsVersion(0,96)
+EnsureSConsVersion(2,0)
#SourceSignatures('MD5')
#SourceSignatures('timestamp')
SConsignFile('.sconsign.'+GetPlatform())
@@ -43,19 +43,20 @@
buildDir = "build." + platform
option_filename = "config.cache." + platform
+temp_env = dict(ENV = os.environ)
if GetPlatform() == "win32":
- if ARGUMENTS.has_key("MSVS_VERSION"):
- common_env = Environment(MSVS_VERSION = ARGUMENTS["MSVS_VERSION"])
- else:
- common_env = Environment()
- common_env["MSVS"] = {"VERSION" : common_env["MSVS_VERSION"]}
- print "Using MSVS version", common_env["MSVS"]["VERSION"]
-else:
- common_env = Environment(ENV = os.environ)
-SConsAddons.Builders.registerSubstBuilder(common_env)
-common_env["CONFIGUREDIR"] = '.sconf_temp_'+platform
-common_env["CONFIGURELOG"] = 'sconf.log_'+platform
+ if ARGUMENTS.has_key("MSVC_VERSION"):
+ temp_env["MSVC_VERSION"] = ARGUMENTS["MSVC_VERSION"]
+ if ARGUMENTS.has_key("MSVS_ARCH"):
+ temp_env["MSVS_ARCH"] = ARGUMENTS["MSVS_ARCH"]
+ temp_env["TARGET_ARCH"] = ARGUMENTS["MSVS_ARCH"]
+
+ temp_env["MSVS"] = {"VERSION" : temp_env["MSVC_VERSION"]}
+
+temp_env["CONFIGUREDIR"] = '.sconf_temp_'+platform
+temp_env["CONFIGURELOG"] = 'sconf.log_'+platform
+
# Create variant helper and builder
variant_helper = sca_variants.VariantsHelper()
base_bldr = EnvironmentBuilder()
@@ -71,8 +72,12 @@
opts.AddOption(sca_opts.SeparatorOption("\nPackage Options"))
opts.AddOption( cppunit_options )
opts.AddOption( boost_options )
+
base_bldr.addOptions(opts)
variant_helper.addOptions(opts)
+common_env = base_bldr.buildEnvironment(None,None,**temp_env)
+SConsAddons.Builders.registerSubstBuilder(common_env)
+
opts.AddOption(sca_opts.SeparatorOption("\nOther settings"))
opts.Add('prefix', 'Installation prefix', unspecified_prefix)
opts.Add('build_test', 'Build the test programs', 'yes')
@@ -108,7 +113,7 @@
base_bldr.readOptions(common_env)
base_bldr.enableWarnings()
- # Apply any common package options
+ # Apply any common package options
# Update environment for boost options
if boost_options.isAvailable():
boost_options.apply(common_env)
@@ -162,8 +167,8 @@
sub_dirs.append('test')
# ---- 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)
+ for combo in variant_helper.iterate(locals(), base_bldr, common_env):
+ #build_env = base_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)
@@ -195,7 +200,7 @@
# Process subdirectories
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)
+ SConscript(pj(d,'SConscript'), variant_dir=pj(full_build_dir, d), duplicate=0)
# Build up the provides vars for the .fpc files
inst_paths['flagpoll'] = pj(inst_paths['lib'],'flagpoll')
Modified: trunk/cppdom/SConscript
===================================================================
--- trunk/cppdom/SConscript 2011-04-04 23:46:05 UTC (rev 677)
+++ trunk/cppdom/SConscript 2011-04-23 22:08:36 UTC (rev 678)
@@ -27,7 +27,7 @@
if boost_options.isAvailable():
sources.append("SpiritParser.cpp")
-cppdom_lib_env = build_env.Copy()
+cppdom_lib_env = build_env.Clone()
cppdom_lib_env.Append(CPPPATH = [inst_paths['include'],])
if "debug" in combo["type"] or "debugrt" in combo["type"]:
@@ -40,10 +40,10 @@
# NOTE: The [:3] bit used before passing the MSVS_VERSION value to float()
# is to handle the case of Visual C++ Express Edition which appends "Exp"
# to the version number.
- if cppdom_lib_env.has_key('MSVS_VERSION') and float(cppdom_lib_env['MSVS_VERSION'][:3]) >= 8.0:
+ if cppdom_lib_env.has_key('MSVC_VERSION') and float(cppdom_lib_env['MSVC_VERSION'][:3]) >= 8.0:
shlinkcom = [shlinkcom,
'mt.exe -manifest ${TARGET}.manifest -outputresource:$TARGET;2']
- cppdom_shared_lib_env = cppdom_lib_env.Copy()
+ cppdom_shared_lib_env = cppdom_lib_env.Clone()
cppdom_shared_lib_env.AppendUnique(CPPDEFINES = ["CPPDOM_EXPORTS"])
if GetPlatform() == 'darwin':
# TODO: The install name should probably include the installation
@@ -60,7 +60,7 @@
cppdom_shared_lib_env.Install(inst_paths['lib'], cppdom_lib)
if "static" in combo["libtype"]:
- cppdom_static_lib_env = cppdom_lib_env.Copy()
+ cppdom_static_lib_env = cppdom_lib_env.Clone()
cppdom_static_lib = cppdom_static_lib_env.StaticLibrary(cppdom_static_libname, sources)
cppdom_static_lib_env.Install(inst_paths['lib'], cppdom_static_lib)
Modified: trunk/test/SConscript
===================================================================
--- trunk/test/SConscript 2011-04-04 23:46:05 UTC (rev 677)
+++ trunk/test/SConscript 2011-04-23 22:08:36 UTC (rev 678)
@@ -4,7 +4,7 @@
import os
pj = os.path.join
-test_env = build_env.Copy()
+test_env = build_env.Clone()
test_env.Append(CPPPATH = [inst_paths['include'], '#test'],
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: <pat...@us...> - 2011-04-04 23:46:11
|
Revision: 677
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=677&view=rev
Author: patrickh
Date: 2011-04-04 23:46:05 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
MFT [r676]: Added missing #include directives.
Submitted by: Doug McCorkle
Modified Paths:
--------------
branches/1.0/cppdom/cppdom.cpp
branches/1.0/cppdom/ext/OptionRepository.cpp
Modified: branches/1.0/cppdom/cppdom.cpp
===================================================================
--- branches/1.0/cppdom/cppdom.cpp 2011-04-04 23:45:24 UTC (rev 676)
+++ branches/1.0/cppdom/cppdom.cpp 2011-04-04 23:46:05 UTC (rev 677)
@@ -45,6 +45,7 @@
#include <iostream>
#include <fstream>
#include <string>
+#include <iterator>
// needed includes
#include <cppdom/cppdom.h>
Modified: branches/1.0/cppdom/ext/OptionRepository.cpp
===================================================================
--- branches/1.0/cppdom/ext/OptionRepository.cpp 2011-04-04 23:45:24 UTC (rev 676)
+++ branches/1.0/cppdom/ext/OptionRepository.cpp 2011-04-04 23:46:05 UTC (rev 677)
@@ -1,6 +1,7 @@
#include <cppdom/ext/OptionRepository.h>
#include <sstream>
+#include <iterator>
#include <assert.h>
namespace cppdom
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2011-04-04 23:45:30
|
Revision: 676
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=676&view=rev
Author: patrickh
Date: 2011-04-04 23:45:24 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
Added missing #include directives.
Submitted by: Doug McCorkle
Modified Paths:
--------------
trunk/cppdom/cppdom.cpp
trunk/cppdom/ext/OptionRepository.cpp
Modified: trunk/cppdom/cppdom.cpp
===================================================================
--- trunk/cppdom/cppdom.cpp 2010-10-03 17:01:06 UTC (rev 675)
+++ trunk/cppdom/cppdom.cpp 2011-04-04 23:45:24 UTC (rev 676)
@@ -45,6 +45,7 @@
#include <iostream>
#include <fstream>
#include <string>
+#include <iterator>
// needed includes
#include <cppdom/cppdom.h>
Modified: trunk/cppdom/ext/OptionRepository.cpp
===================================================================
--- trunk/cppdom/ext/OptionRepository.cpp 2010-10-03 17:01:06 UTC (rev 675)
+++ trunk/cppdom/ext/OptionRepository.cpp 2011-04-04 23:45:24 UTC (rev 676)
@@ -1,6 +1,7 @@
#include <cppdom/ext/OptionRepository.h>
#include <sstream>
+#include <iterator>
#include <assert.h>
namespace cppdom
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2010-10-03 17:01:12
|
Revision: 675
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=675&view=rev
Author: patrickh
Date: 2010-10-03 17:01:06 +0000 (Sun, 03 Oct 2010)
Log Message:
-----------
Ignore .pyc and .pyo files.
Property Changed:
----------------
trunk/deps/scons-addons/src/SConsAddons/
trunk/deps/scons-addons/src/SConsAddons/Options/
Property changes on: trunk/deps/scons-addons/src/SConsAddons
___________________________________________________________________
Added: svn:ignore
+ *.py?
Property changes on: trunk/deps/scons-addons/src/SConsAddons/Options
___________________________________________________________________
Added: svn:ignore
+ *.py?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2010-10-03 17:00:32
|
Revision: 674
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=674&view=rev
Author: patrickh
Date: 2010-10-03 17:00:26 +0000 (Sun, 03 Oct 2010)
Log Message:
-----------
Merge changes in from Revision 412 of SConsAddons.
Revision Links:
--------------
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=412&view=rev
Modified Paths:
--------------
trunk/deps/scons-addons/src/SConsAddons/EnvironmentBuilder.py
Modified: trunk/deps/scons-addons/src/SConsAddons/EnvironmentBuilder.py
===================================================================
--- trunk/deps/scons-addons/src/SConsAddons/EnvironmentBuilder.py 2010-10-03 16:57:51 UTC (rev 673)
+++ trunk/deps/scons-addons/src/SConsAddons/EnvironmentBuilder.py 2010-10-03 17:00:26 UTC (rev 674)
@@ -29,7 +29,7 @@
class EnvironmentBuilder(object):
""" Builder class for scons environments.
Used to build up an environment based on user settings.
-
+
There are default settings for all levels. These settings can be overriden
through the class interface or through the supported options processing.
"""
@@ -39,22 +39,25 @@
STANDARD = 2
EXTENSIVE = 3
MAXIMUM = 4
-
+
# Opt flags
REDUCE_SIZE = 'reduce_size'
FAST_MATH = 'fast_math'
ARCH_SPEC = 'arch_specific'
-
+
# Warning flags
WARN_AS_ERROR = 'warn_as_error'
WARN_STRICT = 'warn_strict'
-
+
+ #debug tags
+ DISABLE_INLINE = 'disable_inline'
+
# MSVC runtime
MSVC_MT_DLL_RT = "msvc_mt_dll_rt"
MSVC_MT_DBG_DLL_RT = "msvc_mt_dbg_dll_rt"
MSVC_MT_RT = "msvc_mt_rt"
MSVC_MT_DBG_RT = "msvc_mt_dbg_rt"
-
+
# CPU ARCH
AUTODETECT_ARCH = "autodetect_arch"
IA32_ARCH = "ia32"
@@ -67,30 +70,30 @@
def __init__(self):
""" Initialize the class with defaults. """
global default_funcs
- self.debugLevel = EnvironmentBuilder.NONE
+ self.debugLevel = EnvironmentBuilder.NONE
self.debugTags = []
self.optLevel = EnvironmentBuilder.NONE
self.optTags = []
- self.warningLevel = EnvironmentBuilder.MINIMAL
+ self.warningLevel = EnvironmentBuilder.MINIMAL
self.warningTags = []
self.profEnabled = False
self.exceptionsEnabled = True
self.structuredExceptionsEnabled = False
- self.rttiEnabled = True
+ self.rttiEnabled = True
self.cpuArch = None
-
+
# Darwin specific
self.darwinUniversalEnabled = False
self.darwinSdk = ''
-
+
# MSVC specific
self.msvcRuntime = None
-
+
# List of [ [compilers], [platforms], func ]
# If compiler or platform list is empty, then ignore that check
self.funcList = copy.copy(default_funcs)
-
- # Defaults: These levels are applied if the user just enables with no level
+
+ # Defaults: These levels are applied if the user just enables with no level
self.defaultDebugLevel = EnvironmentBuilder.STANDARD
self.defaultOptLevel = EnvironmentBuilder.STANDARD
self.defaultWarningLevel = EnvironmentBuilder.STANDARD
@@ -98,7 +101,7 @@
def clone(self):
return copy.copy(self)
- def buildEnvironment(self, options=None, variant=None, **kw):
+ def buildEnvironment(self, options = None, variant = None, **kw):
""" Build an environment object and apply any options to it.
Takes same parameters as Environment() in SCons.
options - If passed and is instance of SCons.Options.Options, it will
@@ -107,15 +110,15 @@
and available when applying options.
"""
if options and not isinstance(options, Options.Options):
- kw["options"] = options
- new_env = apply(SCons.Environment.Environment, [], kw)
- self.applyToEnvironment(new_env,variant, options)
+ kw["options"] = options
+ new_env = apply(SCons.Environment.Environment, [], kw)
+ self.applyToEnvironment(new_env, variant, options)
return new_env
-
- def applyToEnvironment(self, env, variant=None, options=None):
+
+ def applyToEnvironment(self, env, variant = None, options = None):
""" Apply current builder options to an existing environment.
- Returns env argument.
-
+ Returns env argument.
+
Ex: new_env = bldr.applyToEnvironment(env.Clone())
"""
if variant:
@@ -125,51 +128,51 @@
self._applyOptionsToEnvironment(env)
return env
- def enableDebug(self, level=None, tags=[]):
+ def enableDebug(self, level = None, tags = []):
if not level:
level = self.defaultDebugLevel
self.debugLevel = level
self.debugTags = tags
def disableDebug(self):
- self.enableDebug(level=EnvironmentBuilder.NONE)
-
- def enableOpt(self, level=None, tags=[]):
+ self.enableDebug(level = EnvironmentBuilder.NONE)
+
+ def enableOpt(self, level = None, tags = []):
if not level:
level = self.defaultOptLevel
self.optLevel = level
self.optTags = tags
def disableOpt(self):
self.enableOpt(EnvironmentBuilder.NONE)
-
- def enableProfiling(self, val=True):
+
+ def enableProfiling(self, val = True):
self.profEnabled = val
def disableProfiling(self):
self.enableProfiling(False)
-
- def enableWarnings(self, level=None, tags=[]):
+
+ def enableWarnings(self, level = None, tags = []):
if level is None:
level = self.defaultWarningLevel
self.warningLevel = level
self.warningTags = tags
def disableWarnings(self):
self.enableWarnings(EnvironmentBuilder.NONE)
-
- def enableExceptions(self, val=True):
+
+ def enableExceptions(self, val = True):
self.exceptionsEnabled = val
def disableExceptions(self):
self.enableExceptions(False)
-
- def enableStructuredExceptions(self, val=True):
+
+ def enableStructuredExceptions(self, val = True):
self.structuredExceptionsEnabled = val
def disableStructuredExceptions(self):
self.enableStructuredExceptions(False)
-
- def enableRTTI(self, val=True):
+
+ def enableRTTI(self, val = True):
self.rttiEnabled = val
def disableRTTI(self):
self.enableRTTI(False)
-
- def setCpuArch(self, val=AUTODETECT_ARCH):
+
+ def setCpuArch(self, val = AUTODETECT_ARCH):
if val != EnvironmentBuilder.AUTODETECT_ARCH:
self.cpuArch = val
else:
@@ -180,35 +183,35 @@
self.cpuArch = arch_map.get(GetArch(), EnvironmentBuilder.AUTODETECT_ARCH)
# ---- Darwin specific ----- #
- def darwin_enableUniversalBinaries(self, val=True):
+ def darwin_enableUniversalBinaries(self, val = True):
self.darwinUniversalEnabled = val
def darwin_disableUniversalBinaries(self):
self.darwin_enableUniversalBinaries(False)
def darwin_setSdk(self, val):
self.darwinSdk = val
-
+
# ---- MSVC specific ---- #
def setMsvcRuntime(self, val):
self.msvcRuntime = val
-
+
# ---- Command-line option processing ---- #
def addOptions(self, opts):
""" The EnvironmentBuilder has support for adding command line options to an
option processing object. This object has to be an instance
of SConsAddons.Options. Once the options are added, the user
will be able to set defaults for the environment builder.
-
+
TODO: Add options for tags.
"""
import SConsAddons.Options as sca_opts
-
+
assert isinstance(opts, sca_opts.Options)
- opts.AddOption(sca_opts.SeparatorOption("\nEnvironment Builder Defaults"))
+ opts.AddOption(sca_opts.SeparatorOption("\nEnvironment Builder Defaults"))
opts.AddOption(sca_opts.EnumOption('default_debug_level',
'Default debug level for environment builder.',
- 'standard',
- ['none','minimal','standard','extensive','maximum'],
+ 'standard',
+ ['none', 'minimal', 'standard', 'extensive', 'maximum'],
{'none':EnvironmentBuilder.NONE,
'minimal':EnvironmentBuilder.MINIMAL,
'standard':EnvironmentBuilder.STANDARD,
@@ -216,8 +219,8 @@
'maximum':EnvironmentBuilder.MAXIMUM}))
opts.AddOption(sca_opts.EnumOption('default_opt_level',
'Default optimization level for environment builder.',
- 'standard',
- ['none','minimal','standard','extensive','maximum'],
+ 'standard',
+ ['none', 'minimal', 'standard', 'extensive', 'maximum'],
{'none':EnvironmentBuilder.NONE,
'minimal':EnvironmentBuilder.MINIMAL,
'standard':EnvironmentBuilder.STANDARD,
@@ -230,12 +233,12 @@
'minimal':EnvironmentBuilder.MINIMAL,
'standard':EnvironmentBuilder.STANDARD,
'extensive':EnvironmentBuilder.EXTENSIVE,
- 'maximum':EnvironmentBuilder.MAXIMUM}))
+ 'maximum':EnvironmentBuilder.MAXIMUM}))
if GetPlatform() == "darwin":
opts.Add(sca_opts.BoolOption('darwin_universal',
'Build universal binaries.', False))
opts.Add('darwin_sdk', 'Darwin Platform SDK.', '')
-
+
def readOptions(self, optEnv):
""" Read the processed options from the given environment. """
self.defaultDebugLevel = optEnv["default_debug_level"]
@@ -250,29 +253,29 @@
def _applyOptionsToEnvironment(self, env):
tools = env["TOOLS"]
#print "Using tools: ", tools
-
+
# Find the compilers/builders we are using
c_compiler = env["CC"]
cxx_compiler = env["CXX"]
linker = env["LINK"]
- # one of: ['cygwin','irix','sunos','linux','freebsd','darwin','win32']
+ # one of: ['cygwin', 'irix', 'sunos', 'linux', 'freebsd', 'darwin', 'win32']
platform = GetPlatform()
# Special case for compiler callers like distcc
# XXX: This is a bit of a hack, but it will work for now
- for x in ["distcc",]:
+ for x in ["distcc"]:
if c_compiler.startswith(x):
c_compiler = c_compiler.split()[-1]
if cxx_compiler.startswith(x):
cxx_compiler = cxx_compiler.split()[-1]
if linker.startswith(x):
linker = linker.split()[-1]
-
+
# Based on compiler and platform
for f in self.funcList:
- (compiler_list,platform_list, func) = f
- if (len(compiler_list)==0) or (c_compiler in compiler_list) or (cxx_compiler in compiler_list):
- if (len(platform_list)==0) or (platform in platform_list):
+ (compiler_list, platform_list, func) = f
+ if len(compiler_list) == 0 or c_compiler in compiler_list or cxx_compiler in compiler_list:
+ if len(platform_list) == 0 or platform in platform_list:
func(self, env)
@@ -281,7 +284,7 @@
def gcc_optimizations(bldr, env):
if EnvironmentBuilder.NONE == bldr.optLevel:
return
-
+
CCFLAGS = []
CXXFLAGS = []
CPPDEFINES = []
@@ -293,203 +296,205 @@
CCFLAGS.append('-O1')
elif bldr.optLevel == EnvironmentBuilder.STANDARD:
CCFLAGS.append('-O2')
- elif ((bldr.optLevel == EnvironmentBuilder.EXTENSIVE) or
- (bldr.optLevel == EnvironmentBuilder.MAXIMUM)):
+ elif (bldr.optLevel == EnvironmentBuilder.EXTENSIVE or
+ bldr.optLevel == EnvironmentBuilder.MAXIMUM):
CCFLAGS.append('-O3')
# Fast math
if EnvironmentBuilder.FAST_MATH in bldr.optTags:
CCFLAGS.append('-ffast-math')
-
+
# TODO: Do architecture specific optimizations here
- env.Append(CXXFLAGS=CXXFLAGS, CCFLAGS=CCFLAGS, CPPDEFINES=CPPDEFINES)
+ env.AppendUnique(CXXFLAGS = CXXFLAGS, CCFLAGS = CCFLAGS, CPPDEFINES = CPPDEFINES)
def gcc_debug(bldr, env):
#print "Calling gcc_debug."
if EnvironmentBuilder.NONE == bldr.debugLevel:
return
- env.Append(CCFLAGS = ["-g", "-fno-inline"],
- CXXFLAGS = ["-fno-implicit-inline-templates", "-fno-default-inline"])
+ env.AppendUnique(CCFLAGS = ["-g"])
+ if EnvironmentBuilder.DISABLE_INLINE in bldr.debugTags:
+ env.AppendUnique(CCFLAGS = ["-fno-inline"],
+ CXXFLAGS = ["-fno-implicit-inline-templates", "-fno-default-inline"])
def gcc_warnings(bldr, env):
CCFLAGS = []
-
+
if EnvironmentBuilder.NONE == bldr.warningLevel:
- CCFLAGS.append(['-w',])
+ CCFLAGS.append(['-w'])
elif bldr.warningLevel == EnvironmentBuilder.MINIMAL:
pass
elif bldr.warningLevel == EnvironmentBuilder.STANDARD:
- CCFLAGS.append(['-Wall',])
+ CCFLAGS.append(['-Wall'])
elif bldr.warningLevel == EnvironmentBuilder.EXTENSIVE:
- CCFLAGS.append(['-Wall','-Wextra'])
+ CCFLAGS.append(['-Wall', '-Wextra'])
elif bldr.warningLevel == EnvironmentBuilder.MAXIMUM:
- CCFLAGS.extend(['-Wall','-Wextra'])
+ CCFLAGS.extend(['-Wall', '-Wextra'])
# warnings as errors
if EnvironmentBuilder.WARN_AS_ERROR in bldr.debugTags:
- CCFLAGS.append(['-Werror',])
-
+ CCFLAGS.append(['-Werror'])
+
if EnvironmentBuilder.WARN_STRICT in bldr.debugTags:
- CCFLAGS.append(['-pedantic',])
-
- env.Append(CCFLAGS=CCFLAGS)
-
+ CCFLAGS.append(['-pedantic'])
+
+ env.AppendUnique(CCFLAGS = CCFLAGS)
+
def gcc_misc(bldr, env):
if bldr.profEnabled:
- env.Append(CCFLAGS=["-pg",], LINKFLAGS=['-pg',])
+ env.AppendUnique(CCFLAGS = ["-pg"], LINKFLAGS = ['-pg'])
def gcc_linux_misc(bldr, env):
assert isinstance(bldr, EnvironmentBuilder)
- env.Append(CCFLAGS = ['-pipe',]) # Add pipe to speed up compiles on Linux
+ env.AppendUnique(CCFLAGS = ['-pipe']) # Add pipe to speed up compiles on Linux
if bldr.cpuArch:
if bldr.cpuArch == EnvironmentBuilder.IA32_ARCH:
- env.Append(CCFLAGS = ['-m32'],
- LINKFLAGS = ['-m32'])
+ env.AppendUnique(CCFLAGS = ['-m32'],
+ LINKFLAGS = ['-m32'])
elif bldr.cpuArch == EnvironmentBuilder.X64_ARCH:
- env.Append(CCFLAGS = ['-m64'],
- LINKFLAGS = ['-m64'])
+ env.AppendUnique(CCFLAGS = ['-m64'],
+ LINKFLAGS = ['-m64'])
else:
assert False, "Invalid arch used for Linux gcc."
-def gcc_darwin_misc(bldr,env):
+def gcc_darwin_misc(bldr, env):
assert isinstance(bldr, EnvironmentBuilder)
# We use libtool(1) here instead of ar(1) to ensure that we can build
# static universal binaries.
env['AR'] = 'libtool'
env['ARFLAGS'] = ['-static', '-o']
- env.Append(CCFLAGS = ['-pipe'])
+ env.AppendUnique(CCFLAGS = ['-pipe'])
# XXX: This list should be hard coded. It should contain the architectures
# that have been detected as being valid.
universal_arch_list = ['ppc', 'i386', 'ppc64']
- print os.uname()
if os.uname()[2].split('.')[0] >= '9':
universal_arch_list.append('x64')
if bldr.darwinUniversalEnabled:
for a in universal_arch_list:
- env.Append(CCFLAGS = ['-arch', a], LINKFLAGS = ['-arch', a])
+ env.AppendUniqie(CCFLAGS = ['-arch', a], LINKFLAGS = ['-arch', a])
else:
if bldr.cpuArch != None:
if bldr.cpuArch == EnvironmentBuilder.UNIVERSAL_ARCH:
for a in universal_arch_list:
- env.Append(CCFLAGS = ['-arch', a], LINKFLAGS = ['-arch', a])
+ env.AppendUnique(CCFLAGS = ['-arch', a], LINKFLAGS = ['-arch', a])
elif bldr.cpuArch == EnvironmentBuilder.X64_ARCH:
- env.Append(CCFLAGS = ['-arch', 'x86_64'],
- LINKFLAGS = ['-arch', 'x86_64'])
+ env.AppendUnique(CCFLAGS = ['-arch', 'x86_64'],
+ LINKFLAGS = ['-arch', 'x86_64'])
elif bldr.cpuArch == EnvironmentBuilder.IA32_ARCH:
- env.Append(CCFLAGS = ['-arch', 'i386'],
- LINKFLAGS = ['-arch', 'i386'])
+ env.AppendUnique(CCFLAGS = ['-arch', 'i386'],
+ LINKFLAGS = ['-arch', 'i386'])
elif bldr.cpuArch == EnvironmentBuilder.PPC_ARCH:
- env.Append(CCFLAGS = ['-arch', 'ppc'],
- LINKFLAGS = ['-arch', 'ppc'])
+ env.AppendUnique(CCFLAGS = ['-arch', 'ppc'],
+ LINKFLAGS = ['-arch', 'ppc'])
elif bldr.cpuArch == EnvironmentBuilder.PPC64_ARCH:
- env.Append(CCFLAGS = ['-arch', 'ppc64'],
- LINKFLAGS = ['-arch', 'ppc64'])
+ env.AppendUnique(CCFLAGS = ['-arch', 'ppc64'],
+ LINKFLAGS = ['-arch', 'ppc64'])
else:
assert False, "Invalid arch used for darwin gcc."
if bldr.darwinSdk != '':
- env.Append(CCFLAGS = ['-isysroot', bldr.darwinSdk],
- LINKFLAGS = ['-isysroot', bldr.darwinSdk])
+ env.AppendUnique(CCFLAGS = ['-isysroot', bldr.darwinSdk],
+ LINKFLAGS = ['-isysroot', bldr.darwinSdk])
sdk_re = re.compile('MacOSX(10\..*?)u?\.sdk')
match = sdk_re.search(bldr.darwinSdk)
if match is not None:
min_osx_ver = '-mmacosx-version-min=' + match.group(1)
- env.Append(CCFLAGS = [min_osx_ver], LINKFLAGS = [min_osx_ver])
+ env.AppendUnique(CCFLAGS = [min_osx_ver], LINKFLAGS = [min_osx_ver])
# GCC functions
-default_funcs.append([['gcc','g++'],[],gcc_optimizations])
-default_funcs.append([['gcc','g++'],[],gcc_debug])
-default_funcs.append([['gcc','g++'],[],gcc_warnings])
-default_funcs.append([['gcc','g++'],[],gcc_misc])
-default_funcs.append([['gcc','g++'],['linux'],gcc_linux_misc])
-default_funcs.append([['gcc','g++'],['darwin'],gcc_darwin_misc])
+default_funcs.append([['gcc', 'g++'], [], gcc_optimizations])
+default_funcs.append([['gcc', 'g++'], [], gcc_debug])
+default_funcs.append([['gcc', 'g++'], [], gcc_warnings])
+default_funcs.append([['gcc', 'g++'], [], gcc_misc])
+default_funcs.append([['gcc', 'g++'], ['linux'], gcc_linux_misc])
+default_funcs.append([['gcc', 'g++'], ['darwin'], gcc_darwin_misc])
# ---- Irix ---- #
-# XXX: Irix support is very minimal at this time.
+# XXX: Irix support is very minimal at this time.
# I don't have access to an Irix box anymore and I don't compile
# code for Irix very often. This could be easily extended to support
# many more features (archs, warnings, etc)
def irix_opt(bldr, env):
if EnvironmentBuilder.NONE == bldr.optLevel:
return
-
+
CCFLAGS = []
-
+
if bldr.optLevel == EnvironmentBuilder.MINIMAL:
CCFLAGS.append('-O1')
elif bldr.optLevel == EnvironmentBuilder.STANDARD:
CCFLAGS.append('-O2')
- elif ((bldr.optLevel == EnvironmentBuilder.EXTENSIVE) or
- (bldr.optLevel == EnvironmentBuilder.MAXIMUM)):
+ elif (bldr.optLevel == EnvironmentBuilder.EXTENSIVE or
+ bldr.optLevel == EnvironmentBuilder.MAXIMUM):
CCFLAGS.append('-O3')
# TODO: Do architecture specific optimizations here
- env.Append(CXXFLAGS=CXXFLAGS, CCFLAGS=CCFLAGS, CPPDEFINES=CPPDEFINES)
+ env.AppendUnique(CXXFLAGS = CXXFLAGS, CCFLAGS = CCFLAGS, CPPDEFINES = CPPDEFINES)
def irix_debug(bldr, env):
#print "Calling gcc_debug."
if EnvironmentBuilder.NONE == bldr.debugLevel:
return
- env.Append(CCFLAGS=["-g",])
+ env.AppendUnique(CCFLAGS = ["-g"])
def irix_misc(bldr, env):
CCFLAGS = []
- env.Append(CXXFLAGS=["-mips3","-LANG:std","-n32"])
+ env.AppendUnique(CXXFLAGS = ["-mips3", "-LANG:std", "-n32"])
-default_funcs.append([['cc',],['irix'],irix_opt])
-default_funcs.append([['cc',],['irix'],irix_debug])
-default_funcs.append([['cc',],['irix'],irix_misc])
+default_funcs.append([['cc'], ['irix'], irix_opt])
+default_funcs.append([['cc'], ['irix'], irix_debug])
+default_funcs.append([['cc'], ['irix'], irix_misc])
-# ---- MSVC ---- #
+# ---- MSVC ---- #
def msvc_optimizations(bldr, env):
if EnvironmentBuilder.NONE == bldr.optLevel:
return
-
+
CCFLAGS = []
CXXFLAGS = []
CPPDEFINES = []
- LINKFLAGS = ["/RELEASE",]
+ LINKFLAGS = ["/RELEASE"]
if EnvironmentBuilder.REDUCE_SIZE in bldr.optTags:
CCFLAGS.extend(['/O1'])
else:
if bldr.optLevel == EnvironmentBuilder.MINIMAL:
- CCFLAGS.extend(['/Ot','/Og'])
+ CCFLAGS.extend(['/Ot', '/Og'])
elif bldr.optLevel == EnvironmentBuilder.STANDARD:
CCFLAGS.append(['/O2'])
- elif ((bldr.optLevel == EnvironmentBuilder.EXTENSIVE) or
- (bldr.optLevel == EnvironmentBuilder.MAXIMUM)):
+ elif (bldr.optLevel == EnvironmentBuilder.EXTENSIVE or
+ bldr.optLevel == EnvironmentBuilder.MAXIMUM):
CCFLAGS.append(['/Ox'])
# Fast math
if EnvironmentBuilder.FAST_MATH in bldr.optTags:
CCFLAGS.append(['/fp:fast'])
-
+
# TODO: Do architecture specific optimizations here
- # /arch:SSE/SEE2 /G1 /G2
+ # /arch:SSE/SEE2 /G1 /G2
# /favor
- env.Append(CXXFLAGS=CXXFLAGS, CCFLAGS=CCFLAGS, CPPDEFINES=CPPDEFINES, LINKFLAGS=LINKFLAGS)
+ env.AppendUnique(CXXFLAGS = CXXFLAGS, CCFLAGS = CCFLAGS, CPPDEFINES = CPPDEFINES,
+ LINKFLAGS = LINKFLAGS)
def msvc_debug(bldr, env):
- """ TODO: Update to handle PDB debug database files.
+ """ TODO: Update to handle PDB debug database files.
TODO: Add support for run-time error checking.
"""
#print "Calling msvc_debug."
if EnvironmentBuilder.NONE == bldr.debugLevel:
return
- env.Append(CCFLAGS=['/Od','/Ob0','/Z7'],
- LINKFLAGS=['/DEBUG'])
+ env.AppendUnique(CCFLAGS = ['/Od', '/Ob0', '/Z7'],
+ LINKFLAGS = ['/DEBUG'])
def msvc_warnings(bldr, env):
CCFLAGS = []
-
+
if EnvironmentBuilder.NONE == bldr.warningLevel:
CCFLAGS.append(['/W0'])
if bldr.warningLevel == EnvironmentBuilder.MINIMAL:
@@ -504,36 +509,41 @@
# warnings as errors
if EnvironmentBuilder.WARN_AS_ERROR in bldr.debugTags:
CCFLAGS.append(['/WX'])
-
+
if EnvironmentBuilder.WARN_STRICT in bldr.debugTags:
CCFLAGS.append(['/Za'])
-
- env.Append(CCFLAGS=CCFLAGS)
-
+
+ env.AppendUnique(CCFLAGS = CCFLAGS)
+
def msvc_misc(bldr, env):
# Runtime library
rt_map = { EnvironmentBuilder.MSVC_MT_DLL_RT:'/MD',
EnvironmentBuilder.MSVC_MT_DBG_DLL_RT:'/MDd',
EnvironmentBuilder.MSVC_MT_RT:'/MT',
EnvironmentBuilder.MSVC_MT_DBG_RT:'/MTd'
- }
+ }
if rt_map.has_key(bldr.msvcRuntime):
- env.Append(CCFLAGS=[rt_map[bldr.msvcRuntime]])
+ env.AppendUnique(CCFLAGS = [rt_map[bldr.msvcRuntime]])
# Exception handling
if bldr.exceptionsEnabled:
- if env["MSVS"]["VERSION"] >= "7.1":
+ if env.has_key("MSVC_VERSION"):
+ msvc_version = env["MSVC_VERSION"]
+ else:
+ msvc_version = env["MSVS"]["VERSION"]
+
+ if msvc_version >= "7.1":
if bldr.structuredExceptionsEnabled:
- env.Append(CCFLAGS=['/EHa'])
+ env.AppendUnique(CCFLAGS = ['/EHa'])
else:
- env.Append(CCFLAGS=['/EHsc'])
+ env.AppendUnique(CCFLAGS = ['/EHsc'])
else:
- env.Append(CCFLAGS=['/GX',])
+ env.AppendUnique(CCFLAGS = ['/GX'])
# RTTI
if bldr.rttiEnabled:
- env.Append(CCFLAGS=["/GR"])
-
+ env.AppendUnique(CCFLAGS = ["/GR"])
+
# Default defines
env.AppendUnique(CPPDEFINES = ["_WINDOWS"])
@@ -553,17 +563,17 @@
LINKFLAGS = '/MACHINE:X86')
# MSVC functions
-default_funcs.append([['cl'],[],msvc_optimizations])
-default_funcs.append([['cl'],[],msvc_debug])
-default_funcs.append([['cl'],[],msvc_warnings])
-default_funcs.append([['cl'],[],msvc_misc])
+default_funcs.append([['cl'], [], msvc_optimizations])
+default_funcs.append([['cl'], [], msvc_debug])
+default_funcs.append([['cl'], [], msvc_warnings])
+default_funcs.append([['cl'], [], msvc_misc])
# ---- DEFAULT ---- #
-def default_debug_define(bldr,env):
+def default_debug_define(bldr, env):
if EnvironmentBuilder.NONE != bldr.optLevel and EnvironmentBuilder.NONE == bldr.debugLevel:
- env.Append(CPPDEFINES=["NDEBUG",])
+ env.AppendUnique(CPPDEFINES = ["NDEBUG"])
-default_funcs.append([[],[],default_debug_define])
+default_funcs.append([[], [], default_debug_define])
# ---- Helpers ---- #
@@ -575,10 +585,10 @@
def CheckArch(context, archName):
""" Custom config context check for checking arch in this method. """
context.Message( 'Checking for arch [%s] ...'%archName )
- ret = context.TryCompile("""int main() { return 0; }""",'.c')
+ ret = context.TryCompile("""int main() { return 0; }""", '.c')
context.Result( ret )
return ret
-
+
valid_archs = []
cur_arch = GetArch()
if "ia32" == cur_arch:
@@ -586,10 +596,10 @@
elif "x64" == cur_arch:
valid_archs.append(EnvironmentBuilder.X64_ARCH)
elif "ppc" == cur_arch:
- valid_archs.append(EnvironmentBuilder.PPC_ARCH)
+ valid_archs.append(EnvironmentBuilder.PPC_ARCH)
elif "ppc64" == cur_arch:
- valid_archs.append(EnvironmentBuilder.PPC64_ARCH)
-
+ valid_archs.append(EnvironmentBuilder.PPC64_ARCH)
+
# Only handle case of using Visual C++ or GCC as the compiler for now.
test_env = EnvironmentBuilder().buildEnvironment()
# XXX: This is bad: GCC is not always called 'gcc'. It may also exist as
@@ -607,10 +617,10 @@
EnvironmentBuilder.UNIVERSAL_ARCH]
if os.uname()[2][0] >= '9':
arch_checks.insert(3, EnvironmentBuilder.X64_ARCH)
- elif cur_arch in ["ia32","x64"]: # Check x86 platforms
+ elif cur_arch in ["ia32", "x64"]: # Check x86 platforms
arch_checks = [EnvironmentBuilder.IA32_ARCH,
EnvironmentBuilder.X64_ARCH]
- elif cur_arch in ["ppc","ppc64"]: # Check PowerPC architectures
+ elif cur_arch in ["ppc", "ppc64"]: # Check PowerPC architectures
arch_checks = [EnvironmentBuilder.PPC_ARCH,
EnvironmentBuilder.PPC64_ARCH]
@@ -619,7 +629,7 @@
env_bldr = EnvironmentBuilder()
env_bldr.setCpuArch(test_arch)
conf_env = env_bldr.buildEnvironment()
- conf_ctxt = conf_env.Configure(custom_tests={"CheckArch":CheckArch})
+ conf_ctxt = conf_env.Configure(custom_tests = {"CheckArch":CheckArch})
passed_test = conf_ctxt.CheckArch(test_arch)
conf_ctxt.Finish()
if passed_test:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2010-10-03 16:57:58
|
Revision: 673
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=673&view=rev
Author: patrickh
Date: 2010-10-03 16:57:51 +0000 (Sun, 03 Oct 2010)
Log Message:
-----------
Tag the import of SConsAddons SVN trunk Revision 412.
Revision Links:
--------------
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=412&view=rev
Added Paths:
-----------
vendor/scons-addons/r412/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2010-10-03 16:57:10
|
Revision: 672
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=672&view=rev
Author: patrickh
Date: 2010-10-03 16:57:04 +0000 (Sun, 03 Oct 2010)
Log Message:
-----------
Update to Revision 412 of the SConsAddons SVN trunk.
Revision Links:
--------------
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=412&view=rev
Modified Paths:
--------------
vendor/scons-addons/current/src/SConsAddons/EnvironmentBuilder.py
Modified: vendor/scons-addons/current/src/SConsAddons/EnvironmentBuilder.py
===================================================================
--- vendor/scons-addons/current/src/SConsAddons/EnvironmentBuilder.py 2010-09-04 17:17:59 UTC (rev 671)
+++ vendor/scons-addons/current/src/SConsAddons/EnvironmentBuilder.py 2010-10-03 16:57:04 UTC (rev 672)
@@ -29,7 +29,7 @@
class EnvironmentBuilder(object):
""" Builder class for scons environments.
Used to build up an environment based on user settings.
-
+
There are default settings for all levels. These settings can be overriden
through the class interface or through the supported options processing.
"""
@@ -39,22 +39,25 @@
STANDARD = 2
EXTENSIVE = 3
MAXIMUM = 4
-
+
# Opt flags
REDUCE_SIZE = 'reduce_size'
FAST_MATH = 'fast_math'
ARCH_SPEC = 'arch_specific'
-
+
# Warning flags
WARN_AS_ERROR = 'warn_as_error'
WARN_STRICT = 'warn_strict'
-
+
+ #debug tags
+ DISABLE_INLINE = 'disable_inline'
+
# MSVC runtime
MSVC_MT_DLL_RT = "msvc_mt_dll_rt"
MSVC_MT_DBG_DLL_RT = "msvc_mt_dbg_dll_rt"
MSVC_MT_RT = "msvc_mt_rt"
MSVC_MT_DBG_RT = "msvc_mt_dbg_rt"
-
+
# CPU ARCH
AUTODETECT_ARCH = "autodetect_arch"
IA32_ARCH = "ia32"
@@ -67,30 +70,30 @@
def __init__(self):
""" Initialize the class with defaults. """
global default_funcs
- self.debugLevel = EnvironmentBuilder.NONE
+ self.debugLevel = EnvironmentBuilder.NONE
self.debugTags = []
self.optLevel = EnvironmentBuilder.NONE
self.optTags = []
- self.warningLevel = EnvironmentBuilder.MINIMAL
+ self.warningLevel = EnvironmentBuilder.MINIMAL
self.warningTags = []
self.profEnabled = False
self.exceptionsEnabled = True
self.structuredExceptionsEnabled = False
- self.rttiEnabled = True
+ self.rttiEnabled = True
self.cpuArch = None
-
+
# Darwin specific
self.darwinUniversalEnabled = False
self.darwinSdk = ''
-
+
# MSVC specific
self.msvcRuntime = None
-
+
# List of [ [compilers], [platforms], func ]
# If compiler or platform list is empty, then ignore that check
self.funcList = copy.copy(default_funcs)
-
- # Defaults: These levels are applied if the user just enables with no level
+
+ # Defaults: These levels are applied if the user just enables with no level
self.defaultDebugLevel = EnvironmentBuilder.STANDARD
self.defaultOptLevel = EnvironmentBuilder.STANDARD
self.defaultWarningLevel = EnvironmentBuilder.STANDARD
@@ -98,7 +101,7 @@
def clone(self):
return copy.copy(self)
- def buildEnvironment(self, options=None, variant=None, **kw):
+ def buildEnvironment(self, options = None, variant = None, **kw):
""" Build an environment object and apply any options to it.
Takes same parameters as Environment() in SCons.
options - If passed and is instance of SCons.Options.Options, it will
@@ -107,15 +110,15 @@
and available when applying options.
"""
if options and not isinstance(options, Options.Options):
- kw["options"] = options
- new_env = apply(SCons.Environment.Environment, [], kw)
- self.applyToEnvironment(new_env,variant, options)
+ kw["options"] = options
+ new_env = apply(SCons.Environment.Environment, [], kw)
+ self.applyToEnvironment(new_env, variant, options)
return new_env
-
- def applyToEnvironment(self, env, variant=None, options=None):
+
+ def applyToEnvironment(self, env, variant = None, options = None):
""" Apply current builder options to an existing environment.
- Returns env argument.
-
+ Returns env argument.
+
Ex: new_env = bldr.applyToEnvironment(env.Clone())
"""
if variant:
@@ -125,51 +128,51 @@
self._applyOptionsToEnvironment(env)
return env
- def enableDebug(self, level=None, tags=[]):
+ def enableDebug(self, level = None, tags = []):
if not level:
level = self.defaultDebugLevel
self.debugLevel = level
self.debugTags = tags
def disableDebug(self):
- self.enableDebug(level=EnvironmentBuilder.NONE)
-
- def enableOpt(self, level=None, tags=[]):
+ self.enableDebug(level = EnvironmentBuilder.NONE)
+
+ def enableOpt(self, level = None, tags = []):
if not level:
level = self.defaultOptLevel
self.optLevel = level
self.optTags = tags
def disableOpt(self):
self.enableOpt(EnvironmentBuilder.NONE)
-
- def enableProfiling(self, val=True):
+
+ def enableProfiling(self, val = True):
self.profEnabled = val
def disableProfiling(self):
self.enableProfiling(False)
-
- def enableWarnings(self, level=None, tags=[]):
+
+ def enableWarnings(self, level = None, tags = []):
if level is None:
level = self.defaultWarningLevel
self.warningLevel = level
self.warningTags = tags
def disableWarnings(self):
self.enableWarnings(EnvironmentBuilder.NONE)
-
- def enableExceptions(self, val=True):
+
+ def enableExceptions(self, val = True):
self.exceptionsEnabled = val
def disableExceptions(self):
self.enableExceptions(False)
-
- def enableStructuredExceptions(self, val=True):
+
+ def enableStructuredExceptions(self, val = True):
self.structuredExceptionsEnabled = val
def disableStructuredExceptions(self):
self.enableStructuredExceptions(False)
-
- def enableRTTI(self, val=True):
+
+ def enableRTTI(self, val = True):
self.rttiEnabled = val
def disableRTTI(self):
self.enableRTTI(False)
-
- def setCpuArch(self, val=AUTODETECT_ARCH):
+
+ def setCpuArch(self, val = AUTODETECT_ARCH):
if val != EnvironmentBuilder.AUTODETECT_ARCH:
self.cpuArch = val
else:
@@ -180,35 +183,35 @@
self.cpuArch = arch_map.get(GetArch(), EnvironmentBuilder.AUTODETECT_ARCH)
# ---- Darwin specific ----- #
- def darwin_enableUniversalBinaries(self, val=True):
+ def darwin_enableUniversalBinaries(self, val = True):
self.darwinUniversalEnabled = val
def darwin_disableUniversalBinaries(self):
self.darwin_enableUniversalBinaries(False)
def darwin_setSdk(self, val):
self.darwinSdk = val
-
+
# ---- MSVC specific ---- #
def setMsvcRuntime(self, val):
self.msvcRuntime = val
-
+
# ---- Command-line option processing ---- #
def addOptions(self, opts):
""" The EnvironmentBuilder has support for adding command line options to an
option processing object. This object has to be an instance
of SConsAddons.Options. Once the options are added, the user
will be able to set defaults for the environment builder.
-
+
TODO: Add options for tags.
"""
import SConsAddons.Options as sca_opts
-
+
assert isinstance(opts, sca_opts.Options)
- opts.AddOption(sca_opts.SeparatorOption("\nEnvironment Builder Defaults"))
+ opts.AddOption(sca_opts.SeparatorOption("\nEnvironment Builder Defaults"))
opts.AddOption(sca_opts.EnumOption('default_debug_level',
'Default debug level for environment builder.',
- 'standard',
- ['none','minimal','standard','extensive','maximum'],
+ 'standard',
+ ['none', 'minimal', 'standard', 'extensive', 'maximum'],
{'none':EnvironmentBuilder.NONE,
'minimal':EnvironmentBuilder.MINIMAL,
'standard':EnvironmentBuilder.STANDARD,
@@ -216,8 +219,8 @@
'maximum':EnvironmentBuilder.MAXIMUM}))
opts.AddOption(sca_opts.EnumOption('default_opt_level',
'Default optimization level for environment builder.',
- 'standard',
- ['none','minimal','standard','extensive','maximum'],
+ 'standard',
+ ['none', 'minimal', 'standard', 'extensive', 'maximum'],
{'none':EnvironmentBuilder.NONE,
'minimal':EnvironmentBuilder.MINIMAL,
'standard':EnvironmentBuilder.STANDARD,
@@ -230,12 +233,12 @@
'minimal':EnvironmentBuilder.MINIMAL,
'standard':EnvironmentBuilder.STANDARD,
'extensive':EnvironmentBuilder.EXTENSIVE,
- 'maximum':EnvironmentBuilder.MAXIMUM}))
+ 'maximum':EnvironmentBuilder.MAXIMUM}))
if GetPlatform() == "darwin":
opts.Add(sca_opts.BoolOption('darwin_universal',
'Build universal binaries.', False))
opts.Add('darwin_sdk', 'Darwin Platform SDK.', '')
-
+
def readOptions(self, optEnv):
""" Read the processed options from the given environment. """
self.defaultDebugLevel = optEnv["default_debug_level"]
@@ -250,29 +253,29 @@
def _applyOptionsToEnvironment(self, env):
tools = env["TOOLS"]
#print "Using tools: ", tools
-
+
# Find the compilers/builders we are using
c_compiler = env["CC"]
cxx_compiler = env["CXX"]
linker = env["LINK"]
- # one of: ['cygwin','irix','sunos','linux','freebsd','darwin','win32']
+ # one of: ['cygwin', 'irix', 'sunos', 'linux', 'freebsd', 'darwin', 'win32']
platform = GetPlatform()
# Special case for compiler callers like distcc
# XXX: This is a bit of a hack, but it will work for now
- for x in ["distcc",]:
+ for x in ["distcc"]:
if c_compiler.startswith(x):
c_compiler = c_compiler.split()[-1]
if cxx_compiler.startswith(x):
cxx_compiler = cxx_compiler.split()[-1]
if linker.startswith(x):
linker = linker.split()[-1]
-
+
# Based on compiler and platform
for f in self.funcList:
- (compiler_list,platform_list, func) = f
- if (len(compiler_list)==0) or (c_compiler in compiler_list) or (cxx_compiler in compiler_list):
- if (len(platform_list)==0) or (platform in platform_list):
+ (compiler_list, platform_list, func) = f
+ if len(compiler_list) == 0 or c_compiler in compiler_list or cxx_compiler in compiler_list:
+ if len(platform_list) == 0 or platform in platform_list:
func(self, env)
@@ -281,7 +284,7 @@
def gcc_optimizations(bldr, env):
if EnvironmentBuilder.NONE == bldr.optLevel:
return
-
+
CCFLAGS = []
CXXFLAGS = []
CPPDEFINES = []
@@ -293,203 +296,205 @@
CCFLAGS.append('-O1')
elif bldr.optLevel == EnvironmentBuilder.STANDARD:
CCFLAGS.append('-O2')
- elif ((bldr.optLevel == EnvironmentBuilder.EXTENSIVE) or
- (bldr.optLevel == EnvironmentBuilder.MAXIMUM)):
+ elif (bldr.optLevel == EnvironmentBuilder.EXTENSIVE or
+ bldr.optLevel == EnvironmentBuilder.MAXIMUM):
CCFLAGS.append('-O3')
# Fast math
if EnvironmentBuilder.FAST_MATH in bldr.optTags:
CCFLAGS.append('-ffast-math')
-
+
# TODO: Do architecture specific optimizations here
- env.Append(CXXFLAGS=CXXFLAGS, CCFLAGS=CCFLAGS, CPPDEFINES=CPPDEFINES)
+ env.AppendUnique(CXXFLAGS = CXXFLAGS, CCFLAGS = CCFLAGS, CPPDEFINES = CPPDEFINES)
def gcc_debug(bldr, env):
#print "Calling gcc_debug."
if EnvironmentBuilder.NONE == bldr.debugLevel:
return
- env.Append(CCFLAGS = ["-g", "-fno-inline"],
- CXXFLAGS = ["-fno-implicit-inline-templates", "-fno-default-inline"])
+ env.AppendUnique(CCFLAGS = ["-g"])
+ if EnvironmentBuilder.DISABLE_INLINE in bldr.debugTags:
+ env.AppendUnique(CCFLAGS = ["-fno-inline"],
+ CXXFLAGS = ["-fno-implicit-inline-templates", "-fno-default-inline"])
def gcc_warnings(bldr, env):
CCFLAGS = []
-
+
if EnvironmentBuilder.NONE == bldr.warningLevel:
- CCFLAGS.append(['-w',])
+ CCFLAGS.append(['-w'])
elif bldr.warningLevel == EnvironmentBuilder.MINIMAL:
pass
elif bldr.warningLevel == EnvironmentBuilder.STANDARD:
- CCFLAGS.append(['-Wall',])
+ CCFLAGS.append(['-Wall'])
elif bldr.warningLevel == EnvironmentBuilder.EXTENSIVE:
- CCFLAGS.append(['-Wall','-Wextra'])
+ CCFLAGS.append(['-Wall', '-Wextra'])
elif bldr.warningLevel == EnvironmentBuilder.MAXIMUM:
- CCFLAGS.extend(['-Wall','-Wextra'])
+ CCFLAGS.extend(['-Wall', '-Wextra'])
# warnings as errors
if EnvironmentBuilder.WARN_AS_ERROR in bldr.debugTags:
- CCFLAGS.append(['-Werror',])
-
+ CCFLAGS.append(['-Werror'])
+
if EnvironmentBuilder.WARN_STRICT in bldr.debugTags:
- CCFLAGS.append(['-pedantic',])
-
- env.Append(CCFLAGS=CCFLAGS)
-
+ CCFLAGS.append(['-pedantic'])
+
+ env.AppendUnique(CCFLAGS = CCFLAGS)
+
def gcc_misc(bldr, env):
if bldr.profEnabled:
- env.Append(CCFLAGS=["-pg",], LINKFLAGS=['-pg',])
+ env.AppendUnique(CCFLAGS = ["-pg"], LINKFLAGS = ['-pg'])
def gcc_linux_misc(bldr, env):
assert isinstance(bldr, EnvironmentBuilder)
- env.Append(CCFLAGS = ['-pipe',]) # Add pipe to speed up compiles on Linux
+ env.AppendUnique(CCFLAGS = ['-pipe']) # Add pipe to speed up compiles on Linux
if bldr.cpuArch:
if bldr.cpuArch == EnvironmentBuilder.IA32_ARCH:
- env.Append(CCFLAGS = ['-m32'],
- LINKFLAGS = ['-m32'])
+ env.AppendUnique(CCFLAGS = ['-m32'],
+ LINKFLAGS = ['-m32'])
elif bldr.cpuArch == EnvironmentBuilder.X64_ARCH:
- env.Append(CCFLAGS = ['-m64'],
- LINKFLAGS = ['-m64'])
+ env.AppendUnique(CCFLAGS = ['-m64'],
+ LINKFLAGS = ['-m64'])
else:
assert False, "Invalid arch used for Linux gcc."
-def gcc_darwin_misc(bldr,env):
+def gcc_darwin_misc(bldr, env):
assert isinstance(bldr, EnvironmentBuilder)
# We use libtool(1) here instead of ar(1) to ensure that we can build
# static universal binaries.
env['AR'] = 'libtool'
env['ARFLAGS'] = ['-static', '-o']
- env.Append(CCFLAGS = ['-pipe'])
+ env.AppendUnique(CCFLAGS = ['-pipe'])
# XXX: This list should be hard coded. It should contain the architectures
# that have been detected as being valid.
universal_arch_list = ['ppc', 'i386', 'ppc64']
- print os.uname()
if os.uname()[2].split('.')[0] >= '9':
universal_arch_list.append('x64')
if bldr.darwinUniversalEnabled:
for a in universal_arch_list:
- env.Append(CCFLAGS = ['-arch', a], LINKFLAGS = ['-arch', a])
+ env.AppendUniqie(CCFLAGS = ['-arch', a], LINKFLAGS = ['-arch', a])
else:
if bldr.cpuArch != None:
if bldr.cpuArch == EnvironmentBuilder.UNIVERSAL_ARCH:
for a in universal_arch_list:
- env.Append(CCFLAGS = ['-arch', a], LINKFLAGS = ['-arch', a])
+ env.AppendUnique(CCFLAGS = ['-arch', a], LINKFLAGS = ['-arch', a])
elif bldr.cpuArch == EnvironmentBuilder.X64_ARCH:
- env.Append(CCFLAGS = ['-arch', 'x86_64'],
- LINKFLAGS = ['-arch', 'x86_64'])
+ env.AppendUnique(CCFLAGS = ['-arch', 'x86_64'],
+ LINKFLAGS = ['-arch', 'x86_64'])
elif bldr.cpuArch == EnvironmentBuilder.IA32_ARCH:
- env.Append(CCFLAGS = ['-arch', 'i386'],
- LINKFLAGS = ['-arch', 'i386'])
+ env.AppendUnique(CCFLAGS = ['-arch', 'i386'],
+ LINKFLAGS = ['-arch', 'i386'])
elif bldr.cpuArch == EnvironmentBuilder.PPC_ARCH:
- env.Append(CCFLAGS = ['-arch', 'ppc'],
- LINKFLAGS = ['-arch', 'ppc'])
+ env.AppendUnique(CCFLAGS = ['-arch', 'ppc'],
+ LINKFLAGS = ['-arch', 'ppc'])
elif bldr.cpuArch == EnvironmentBuilder.PPC64_ARCH:
- env.Append(CCFLAGS = ['-arch', 'ppc64'],
- LINKFLAGS = ['-arch', 'ppc64'])
+ env.AppendUnique(CCFLAGS = ['-arch', 'ppc64'],
+ LINKFLAGS = ['-arch', 'ppc64'])
else:
assert False, "Invalid arch used for darwin gcc."
if bldr.darwinSdk != '':
- env.Append(CCFLAGS = ['-isysroot', bldr.darwinSdk],
- LINKFLAGS = ['-isysroot', bldr.darwinSdk])
+ env.AppendUnique(CCFLAGS = ['-isysroot', bldr.darwinSdk],
+ LINKFLAGS = ['-isysroot', bldr.darwinSdk])
sdk_re = re.compile('MacOSX(10\..*?)u?\.sdk')
match = sdk_re.search(bldr.darwinSdk)
if match is not None:
min_osx_ver = '-mmacosx-version-min=' + match.group(1)
- env.Append(CCFLAGS = [min_osx_ver], LINKFLAGS = [min_osx_ver])
+ env.AppendUnique(CCFLAGS = [min_osx_ver], LINKFLAGS = [min_osx_ver])
# GCC functions
-default_funcs.append([['gcc','g++'],[],gcc_optimizations])
-default_funcs.append([['gcc','g++'],[],gcc_debug])
-default_funcs.append([['gcc','g++'],[],gcc_warnings])
-default_funcs.append([['gcc','g++'],[],gcc_misc])
-default_funcs.append([['gcc','g++'],['linux'],gcc_linux_misc])
-default_funcs.append([['gcc','g++'],['darwin'],gcc_darwin_misc])
+default_funcs.append([['gcc', 'g++'], [], gcc_optimizations])
+default_funcs.append([['gcc', 'g++'], [], gcc_debug])
+default_funcs.append([['gcc', 'g++'], [], gcc_warnings])
+default_funcs.append([['gcc', 'g++'], [], gcc_misc])
+default_funcs.append([['gcc', 'g++'], ['linux'], gcc_linux_misc])
+default_funcs.append([['gcc', 'g++'], ['darwin'], gcc_darwin_misc])
# ---- Irix ---- #
-# XXX: Irix support is very minimal at this time.
+# XXX: Irix support is very minimal at this time.
# I don't have access to an Irix box anymore and I don't compile
# code for Irix very often. This could be easily extended to support
# many more features (archs, warnings, etc)
def irix_opt(bldr, env):
if EnvironmentBuilder.NONE == bldr.optLevel:
return
-
+
CCFLAGS = []
-
+
if bldr.optLevel == EnvironmentBuilder.MINIMAL:
CCFLAGS.append('-O1')
elif bldr.optLevel == EnvironmentBuilder.STANDARD:
CCFLAGS.append('-O2')
- elif ((bldr.optLevel == EnvironmentBuilder.EXTENSIVE) or
- (bldr.optLevel == EnvironmentBuilder.MAXIMUM)):
+ elif (bldr.optLevel == EnvironmentBuilder.EXTENSIVE or
+ bldr.optLevel == EnvironmentBuilder.MAXIMUM):
CCFLAGS.append('-O3')
# TODO: Do architecture specific optimizations here
- env.Append(CXXFLAGS=CXXFLAGS, CCFLAGS=CCFLAGS, CPPDEFINES=CPPDEFINES)
+ env.AppendUnique(CXXFLAGS = CXXFLAGS, CCFLAGS = CCFLAGS, CPPDEFINES = CPPDEFINES)
def irix_debug(bldr, env):
#print "Calling gcc_debug."
if EnvironmentBuilder.NONE == bldr.debugLevel:
return
- env.Append(CCFLAGS=["-g",])
+ env.AppendUnique(CCFLAGS = ["-g"])
def irix_misc(bldr, env):
CCFLAGS = []
- env.Append(CXXFLAGS=["-mips3","-LANG:std","-n32"])
+ env.AppendUnique(CXXFLAGS = ["-mips3", "-LANG:std", "-n32"])
-default_funcs.append([['cc',],['irix'],irix_opt])
-default_funcs.append([['cc',],['irix'],irix_debug])
-default_funcs.append([['cc',],['irix'],irix_misc])
+default_funcs.append([['cc'], ['irix'], irix_opt])
+default_funcs.append([['cc'], ['irix'], irix_debug])
+default_funcs.append([['cc'], ['irix'], irix_misc])
-# ---- MSVC ---- #
+# ---- MSVC ---- #
def msvc_optimizations(bldr, env):
if EnvironmentBuilder.NONE == bldr.optLevel:
return
-
+
CCFLAGS = []
CXXFLAGS = []
CPPDEFINES = []
- LINKFLAGS = ["/RELEASE",]
+ LINKFLAGS = ["/RELEASE"]
if EnvironmentBuilder.REDUCE_SIZE in bldr.optTags:
CCFLAGS.extend(['/O1'])
else:
if bldr.optLevel == EnvironmentBuilder.MINIMAL:
- CCFLAGS.extend(['/Ot','/Og'])
+ CCFLAGS.extend(['/Ot', '/Og'])
elif bldr.optLevel == EnvironmentBuilder.STANDARD:
CCFLAGS.append(['/O2'])
- elif ((bldr.optLevel == EnvironmentBuilder.EXTENSIVE) or
- (bldr.optLevel == EnvironmentBuilder.MAXIMUM)):
+ elif (bldr.optLevel == EnvironmentBuilder.EXTENSIVE or
+ bldr.optLevel == EnvironmentBuilder.MAXIMUM):
CCFLAGS.append(['/Ox'])
# Fast math
if EnvironmentBuilder.FAST_MATH in bldr.optTags:
CCFLAGS.append(['/fp:fast'])
-
+
# TODO: Do architecture specific optimizations here
- # /arch:SSE/SEE2 /G1 /G2
+ # /arch:SSE/SEE2 /G1 /G2
# /favor
- env.Append(CXXFLAGS=CXXFLAGS, CCFLAGS=CCFLAGS, CPPDEFINES=CPPDEFINES, LINKFLAGS=LINKFLAGS)
+ env.AppendUnique(CXXFLAGS = CXXFLAGS, CCFLAGS = CCFLAGS, CPPDEFINES = CPPDEFINES,
+ LINKFLAGS = LINKFLAGS)
def msvc_debug(bldr, env):
- """ TODO: Update to handle PDB debug database files.
+ """ TODO: Update to handle PDB debug database files.
TODO: Add support for run-time error checking.
"""
#print "Calling msvc_debug."
if EnvironmentBuilder.NONE == bldr.debugLevel:
return
- env.Append(CCFLAGS=['/Od','/Ob0','/Z7'],
- LINKFLAGS=['/DEBUG'])
+ env.AppendUnique(CCFLAGS = ['/Od', '/Ob0', '/Z7'],
+ LINKFLAGS = ['/DEBUG'])
def msvc_warnings(bldr, env):
CCFLAGS = []
-
+
if EnvironmentBuilder.NONE == bldr.warningLevel:
CCFLAGS.append(['/W0'])
if bldr.warningLevel == EnvironmentBuilder.MINIMAL:
@@ -504,36 +509,41 @@
# warnings as errors
if EnvironmentBuilder.WARN_AS_ERROR in bldr.debugTags:
CCFLAGS.append(['/WX'])
-
+
if EnvironmentBuilder.WARN_STRICT in bldr.debugTags:
CCFLAGS.append(['/Za'])
-
- env.Append(CCFLAGS=CCFLAGS)
-
+
+ env.AppendUnique(CCFLAGS = CCFLAGS)
+
def msvc_misc(bldr, env):
# Runtime library
rt_map = { EnvironmentBuilder.MSVC_MT_DLL_RT:'/MD',
EnvironmentBuilder.MSVC_MT_DBG_DLL_RT:'/MDd',
EnvironmentBuilder.MSVC_MT_RT:'/MT',
EnvironmentBuilder.MSVC_MT_DBG_RT:'/MTd'
- }
+ }
if rt_map.has_key(bldr.msvcRuntime):
- env.Append(CCFLAGS=[rt_map[bldr.msvcRuntime]])
+ env.AppendUnique(CCFLAGS = [rt_map[bldr.msvcRuntime]])
# Exception handling
if bldr.exceptionsEnabled:
- if env["MSVS"]["VERSION"] >= "7.1":
+ if env.has_key("MSVC_VERSION"):
+ msvc_version = env["MSVC_VERSION"]
+ else:
+ msvc_version = env["MSVS"]["VERSION"]
+
+ if msvc_version >= "7.1":
if bldr.structuredExceptionsEnabled:
- env.Append(CCFLAGS=['/EHa'])
+ env.AppendUnique(CCFLAGS = ['/EHa'])
else:
- env.Append(CCFLAGS=['/EHsc'])
+ env.AppendUnique(CCFLAGS = ['/EHsc'])
else:
- env.Append(CCFLAGS=['/GX',])
+ env.AppendUnique(CCFLAGS = ['/GX'])
# RTTI
if bldr.rttiEnabled:
- env.Append(CCFLAGS=["/GR"])
-
+ env.AppendUnique(CCFLAGS = ["/GR"])
+
# Default defines
env.AppendUnique(CPPDEFINES = ["_WINDOWS"])
@@ -553,17 +563,17 @@
LINKFLAGS = '/MACHINE:X86')
# MSVC functions
-default_funcs.append([['cl'],[],msvc_optimizations])
-default_funcs.append([['cl'],[],msvc_debug])
-default_funcs.append([['cl'],[],msvc_warnings])
-default_funcs.append([['cl'],[],msvc_misc])
+default_funcs.append([['cl'], [], msvc_optimizations])
+default_funcs.append([['cl'], [], msvc_debug])
+default_funcs.append([['cl'], [], msvc_warnings])
+default_funcs.append([['cl'], [], msvc_misc])
# ---- DEFAULT ---- #
-def default_debug_define(bldr,env):
+def default_debug_define(bldr, env):
if EnvironmentBuilder.NONE != bldr.optLevel and EnvironmentBuilder.NONE == bldr.debugLevel:
- env.Append(CPPDEFINES=["NDEBUG",])
+ env.AppendUnique(CPPDEFINES = ["NDEBUG"])
-default_funcs.append([[],[],default_debug_define])
+default_funcs.append([[], [], default_debug_define])
# ---- Helpers ---- #
@@ -575,10 +585,10 @@
def CheckArch(context, archName):
""" Custom config context check for checking arch in this method. """
context.Message( 'Checking for arch [%s] ...'%archName )
- ret = context.TryCompile("""int main() { return 0; }""",'.c')
+ ret = context.TryCompile("""int main() { return 0; }""", '.c')
context.Result( ret )
return ret
-
+
valid_archs = []
cur_arch = GetArch()
if "ia32" == cur_arch:
@@ -586,10 +596,10 @@
elif "x64" == cur_arch:
valid_archs.append(EnvironmentBuilder.X64_ARCH)
elif "ppc" == cur_arch:
- valid_archs.append(EnvironmentBuilder.PPC_ARCH)
+ valid_archs.append(EnvironmentBuilder.PPC_ARCH)
elif "ppc64" == cur_arch:
- valid_archs.append(EnvironmentBuilder.PPC64_ARCH)
-
+ valid_archs.append(EnvironmentBuilder.PPC64_ARCH)
+
# Only handle case of using Visual C++ or GCC as the compiler for now.
test_env = EnvironmentBuilder().buildEnvironment()
# XXX: This is bad: GCC is not always called 'gcc'. It may also exist as
@@ -607,10 +617,10 @@
EnvironmentBuilder.UNIVERSAL_ARCH]
if os.uname()[2][0] >= '9':
arch_checks.insert(3, EnvironmentBuilder.X64_ARCH)
- elif cur_arch in ["ia32","x64"]: # Check x86 platforms
+ elif cur_arch in ["ia32", "x64"]: # Check x86 platforms
arch_checks = [EnvironmentBuilder.IA32_ARCH,
EnvironmentBuilder.X64_ARCH]
- elif cur_arch in ["ppc","ppc64"]: # Check PowerPC architectures
+ elif cur_arch in ["ppc", "ppc64"]: # Check PowerPC architectures
arch_checks = [EnvironmentBuilder.PPC_ARCH,
EnvironmentBuilder.PPC64_ARCH]
@@ -619,7 +629,7 @@
env_bldr = EnvironmentBuilder()
env_bldr.setCpuArch(test_arch)
conf_env = env_bldr.buildEnvironment()
- conf_ctxt = conf_env.Configure(custom_tests={"CheckArch":CheckArch})
+ conf_ctxt = conf_env.Configure(custom_tests = {"CheckArch":CheckArch})
passed_test = conf_ctxt.CheckArch(test_arch)
conf_ctxt.Finish()
if passed_test:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2010-09-04 17:18:05
|
Revision: 671
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=671&view=rev
Author: patrickh
Date: 2010-09-04 17:17:59 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
Tag 1.0.3.
Added Paths:
-----------
tags/1.0.3/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2010-09-04 17:17:50
|
Revision: 670
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=670&view=rev
Author: patrickh
Date: 2010-09-04 17:17:44 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
Create the correct tag for 1.0.2.
Added Paths:
-----------
tags/1.0.2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2010-09-04 17:17:22
|
Revision: 669
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=669&view=rev
Author: patrickh
Date: 2010-09-04 17:17:16 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
These tags were created from the wrong part of the 1.0 branch.
Removed Paths:
-------------
tags/1.0.2/
tags/1.0.3/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2010-09-04 17:12:25
|
Revision: 668
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=668&view=rev
Author: patrickh
Date: 2010-09-04 17:12:19 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
Tag version 1.0.3.
Added Paths:
-----------
tags/1.0.3/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2010-09-04 17:11:59
|
Revision: 667
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=667&view=rev
Author: patrickh
Date: 2010-09-04 17:11:53 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
I forgot to tag 1.0.2.
Added Paths:
-----------
tags/1.0.2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2010-09-04 17:10:53
|
Revision: 666
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=666&view=rev
Author: patrickh
Date: 2010-09-04 17:10:47 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
Update the version to 1.0.3.
Modified Paths:
--------------
branches/1.0/ChangeLog
branches/1.0/cppdom/version.h
Modified: branches/1.0/ChangeLog
===================================================================
--- branches/1.0/ChangeLog 2010-09-04 17:07:17 UTC (rev 665)
+++ branches/1.0/ChangeLog 2010-09-04 17:10:47 UTC (rev 666)
@@ -1,5 +1,10 @@
DATE AUTHOR CHANGE
---------- ----------- -------------------------------------------------------
+[Version 1.0.3 released - 9.4.2010]============================================
+
+2010-09-04 patrickh Use std::tr1::unordered_map<T,H> when GCC or Visual C++
+ provides it.
+
[Version 1.0.2 released - 4.14.2010]===========================================
2010-04-14 patrickh Preserve newlines in CDATA.
Modified: branches/1.0/cppdom/version.h
===================================================================
--- branches/1.0/cppdom/version.h 2010-09-04 17:07:17 UTC (rev 665)
+++ branches/1.0/cppdom/version.h 2010-09-04 17:10:47 UTC (rev 666)
@@ -55,7 +55,7 @@
// The major/minor/patch version (up to 3 digits each).
#define CPPDOM_VERSION_MAJOR 1
#define CPPDOM_VERSION_MINOR 0
-#define CPPDOM_VERSION_PATCH 2
+#define CPPDOM_VERSION_PATCH 3
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2010-09-04 17:07:23
|
Revision: 665
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=665&view=rev
Author: patrickh
Date: 2010-09-04 17:07:17 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
Fixed the build when using versions of Visual C++ older than 9.0.
Submitted by: Ryan Pavlik
Modified Paths:
--------------
trunk/cppdom/cppdom.h
Modified: trunk/cppdom/cppdom.h
===================================================================
--- trunk/cppdom/cppdom.h 2010-09-04 17:04:13 UTC (rev 664)
+++ trunk/cppdom/cppdom.h 2010-09-04 17:07:17 UTC (rev 665)
@@ -110,9 +110,12 @@
typedef std::hash_map<TagNameHandle,std::string> TagNameMap_t;
typedef std::hash_map<std::string, TagNameHandle, HashString> NameToTagMap_t;
}
-# endif // # elif defined(__GNUC__) && (__GNUC__ >= 3)
+# else
+# undef CPPDOM_USE_HASH_MAP
+# endif
+#endif
-#else // #if defined(CPPDOM_USE_HASH_MAP)
+#if ! defined(CPPDOM_USE_HASH_MAP)
# include <map>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2010-09-04 17:04:19
|
Revision: 664
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=664&view=rev
Author: patrickh
Date: 2010-09-04 17:04:13 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
Use std::tr1::unordered_map<T,H> with Visual C++ 9.0 and newer. Fall back on
std::map<T> for older versions of Visual C++. This is based on a patch
submitted by Ryan Pavlik.
Modified Paths:
--------------
branches/1.0/cppdom/cppdom.h
Modified: branches/1.0/cppdom/cppdom.h
===================================================================
--- branches/1.0/cppdom/cppdom.h 2010-09-04 16:55:09 UTC (rev 663)
+++ branches/1.0/cppdom/cppdom.h 2010-09-04 17:04:13 UTC (rev 664)
@@ -75,8 +75,15 @@
// Use fastest map available
#if defined(CPPDOM_USE_HASH_MAP)
-# if defined(__GNUC__) && (__GNUC__ >= 4)
-# include <tr1/unordered_map>
+# if defined(__GNUC__) && (__GNUC__ >= 4) || \
+ defined(_MSC_VER) && _MSC_VER >= 1500
+
+# if defined(__GNUC__)
+# include <tr1/unordered_map>
+# else
+# include <unordered_map>
+# endif
+
# include <map>
namespace cppdom
@@ -103,9 +110,12 @@
typedef std::hash_map<TagNameHandle,std::string> TagNameMap_t;
typedef std::hash_map<std::string, TagNameHandle, HashString> NameToTagMap_t;
}
-# endif // # elif defined(__GNUC__) && (__GNUC__ >= 3)
+# else
+# undef CPPDOM_USE_HASH_MAP
+# endif
+#endif
-#else // #if defined(CPPDOM_USE_HASH_MAP)
+#if ! defined(CPPDOM_USE_HASH_MAP)
# include <map>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2010-09-04 16:55:15
|
Revision: 663
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=663&view=rev
Author: patrickh
Date: 2010-09-04 16:55:09 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
Merged the following revisions from the 1.0 branch:
r661: Fixed the Windows build when using SCons 1.3.0.
Submitted by: Ryan Pavlik
r662: Removed build output that has not been relevant for a long time.
Modified Paths:
--------------
trunk/SConstruct
Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct 2010-09-04 16:53:31 UTC (rev 662)
+++ trunk/SConstruct 2010-09-04 16:55:09 UTC (rev 663)
@@ -8,7 +8,6 @@
import os, string, sys, re, glob, copy, types
import os.path
sys.path.insert(0, os.path.join('deps', 'scons-addons', 'src'))
-print "NOTE: The build is currently in development. It needs the SVN trunk version of scons-addons"
import SCons.Environment
import SCons
@@ -49,6 +48,7 @@
common_env = Environment(MSVS_VERSION = ARGUMENTS["MSVS_VERSION"])
else:
common_env = Environment()
+ common_env["MSVS"] = {"VERSION" : common_env["MSVS_VERSION"]}
print "Using MSVS version", common_env["MSVS"]["VERSION"]
else:
common_env = Environment(ENV = os.environ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2010-09-04 16:53:37
|
Revision: 662
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=662&view=rev
Author: patrickh
Date: 2010-09-04 16:53:31 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
Removed build output that has not been relevant for a long time.
Modified Paths:
--------------
branches/1.0/SConstruct
Modified: branches/1.0/SConstruct
===================================================================
--- branches/1.0/SConstruct 2010-09-04 16:53:06 UTC (rev 661)
+++ branches/1.0/SConstruct 2010-09-04 16:53:31 UTC (rev 662)
@@ -8,7 +8,6 @@
import os, string, sys, re, glob, copy, types
import os.path
sys.path.insert(0, os.path.join('deps', 'scons-addons', 'src'))
-print "NOTE: The build is currently in development. It needs the SVN trunk version of scons-addons"
import SCons.Environment
import SCons
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2010-09-04 16:53:12
|
Revision: 661
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=661&view=rev
Author: patrickh
Date: 2010-09-04 16:53:06 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
Fixed the Windows build when using SCons 1.3.0.
Submitted by: Ryan Pavlik
Modified Paths:
--------------
branches/1.0/SConstruct
Modified: branches/1.0/SConstruct
===================================================================
--- branches/1.0/SConstruct 2010-07-23 23:11:39 UTC (rev 660)
+++ branches/1.0/SConstruct 2010-09-04 16:53:06 UTC (rev 661)
@@ -49,6 +49,7 @@
common_env = Environment(MSVS_VERSION = ARGUMENTS["MSVS_VERSION"])
else:
common_env = Environment()
+ common_env["MSVS"] = {"VERSION" : common_env["MSVS_VERSION"]}
print "Using MSVS version", common_env["MSVS"]["VERSION"]
else:
common_env = Environment(ENV = os.environ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
