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...> - 2009-11-21 15:56:16
|
Revision: 635
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=635&view=rev
Author: patrickh
Date: 2009-11-21 15:56:09 +0000 (Sat, 21 Nov 2009)
Log Message:
-----------
Added a missing #include in order for EOF to be defined.
Modified Paths:
--------------
trunk/cppdom/xmltokenizer.cpp
Modified: trunk/cppdom/xmltokenizer.cpp
===================================================================
--- trunk/cppdom/xmltokenizer.cpp 2009-03-02 15:11:45 UTC (rev 634)
+++ trunk/cppdom/xmltokenizer.cpp 2009-11-21 15:56:09 UTC (rev 635)
@@ -43,6 +43,7 @@
*/
// needed includes
+#include <cstdio>
#include "cppdom.h"
#include "xmltokenizer.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2009-03-02 15:11:50
|
Revision: 634
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=634&view=rev
Author: patrickh
Date: 2009-03-02 15:11:45 +0000 (Mon, 02 Mar 2009)
Log Message:
-----------
Roll the trunk version to 1.1.0.
Modified Paths:
--------------
trunk/cppdom/version.h
trunk/cppdom.spec
Modified: trunk/cppdom/version.h
===================================================================
--- trunk/cppdom/version.h 2009-03-02 15:08:15 UTC (rev 633)
+++ trunk/cppdom/version.h 2009-03-02 15:11:45 UTC (rev 634)
@@ -54,7 +54,7 @@
*/
// The major/minor/patch version (up to 3 digits each).
#define CPPDOM_VERSION_MAJOR 1
-#define CPPDOM_VERSION_MINOR 0
+#define CPPDOM_VERSION_MINOR 1
#define CPPDOM_VERSION_PATCH 0
//--------------------------------------------------------------------------
Modified: trunk/cppdom.spec
===================================================================
--- trunk/cppdom.spec 2009-03-02 15:08:15 UTC (rev 633)
+++ trunk/cppdom.spec 2009-03-02 15:11:45 UTC (rev 634)
@@ -1,6 +1,6 @@
# Spec file for cppdom.
%define name cppdom
-%define version 1.0.0
+%define version 1.1.0
%define release 1
Name: %{name}
@@ -127,6 +127,9 @@
%doc %{_docdir}/cppdom-%{version}/html
%changelog
+* Mon Mar 02 2009 Patrick Hartling <pat...@pr...> 1.1.0-1
+- Updated to version 1.1.0.
+
* Mon Mar 02 2009 Patrick Hartling <pat...@pr...> 1.0.0-1
- Updated to version 1.0.0.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2009-03-02 15:08:24
|
Revision: 633
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=633&view=rev
Author: patrickh
Date: 2009-03-02 15:08:15 +0000 (Mon, 02 Mar 2009)
Log Message:
-----------
Tag the 1.0.0 release.
Added Paths:
-----------
tags/1.0.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2009-03-02 15:07:31
|
Revision: 632
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=632&view=rev
Author: patrickh
Date: 2009-03-02 15:07:20 +0000 (Mon, 02 Mar 2009)
Log Message:
-----------
Create a branch for CppDOM 1.0 patches, bug fixes, etc.
Added Paths:
-----------
branches/1.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2009-03-02 15:06:51
|
Revision: 631
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=631&view=rev
Author: patrickh
Date: 2009-03-02 15:06:42 +0000 (Mon, 02 Mar 2009)
Log Message:
-----------
Since 0.7.10 was releaseed, the only changes have been to the build system.
As such, it seems to me that this code is stable and not likely to undergo
any major changes. That spells "one-point-oh" to me.
Modified Paths:
--------------
trunk/ChangeLog
trunk/cppdom/version.h
trunk/cppdom.spec
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-08-31 14:20:23 UTC (rev 630)
+++ trunk/ChangeLog 2009-03-02 15:06:42 UTC (rev 631)
@@ -1,5 +1,7 @@
DATE AUTHOR CHANGE
---------- ----------- -------------------------------------------------------
+[Version 1.0.0 released - 3.2.2009]============================================
+
2007-08-01 patrickh Updated for SConsAddons changes. On Windows, the
build formerly called "hybrid" is now the "debug"
build. The DLL is installed in lib\debug. The build
Modified: trunk/cppdom/version.h
===================================================================
--- trunk/cppdom/version.h 2007-08-31 14:20:23 UTC (rev 630)
+++ trunk/cppdom/version.h 2009-03-02 15:06:42 UTC (rev 631)
@@ -53,9 +53,9 @@
* <major><minor><patch>. Each part has exactly 3 digits.
*/
// The major/minor/patch version (up to 3 digits each).
-#define CPPDOM_VERSION_MAJOR 0
-#define CPPDOM_VERSION_MINOR 7
-#define CPPDOM_VERSION_PATCH 10
+#define CPPDOM_VERSION_MAJOR 1
+#define CPPDOM_VERSION_MINOR 0
+#define CPPDOM_VERSION_PATCH 0
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
Modified: trunk/cppdom.spec
===================================================================
--- trunk/cppdom.spec 2007-08-31 14:20:23 UTC (rev 630)
+++ trunk/cppdom.spec 2009-03-02 15:06:42 UTC (rev 631)
@@ -1,6 +1,6 @@
# Spec file for cppdom.
%define name cppdom
-%define version 0.7.10
+%define version 1.0.0
%define release 1
Name: %{name}
@@ -127,6 +127,9 @@
%doc %{_docdir}/cppdom-%{version}/html
%changelog
+* Mon Mar 02 2009 Patrick Hartling <pat...@pr...> 1.0.0-1
+- Updated to version 1.0.0.
+
* Wed Aug 01 2007 Patrick Hartling <pa...@in...> 0.7.10-1
- Updated to version 0.7.10.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dsh...@us...> - 2007-08-31 14:36:34
|
Revision: 630
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=630&view=rev
Author: dshipton
Date: 2007-08-31 07:20:23 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
Use the right call to get the header info.
Modified Paths:
--------------
trunk/SConstruct
Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct 2007-08-31 12:56:14 UTC (rev 629)
+++ trunk/SConstruct 2007-08-31 14:20:23 UTC (rev 630)
@@ -34,7 +34,7 @@
SConsignFile('.sconsign.'+GetPlatform())
# Figure out what version of CppDom we're using
-CPPDOM_VERSION = sca_utils.getVersionFromHeader('CPPDOM', 'cppdom/version.h')
+CPPDOM_VERSION = SConsAddons.Util.GetVersionFromHeader('CPPDOM', 'cppdom/version.h')
cppdom_version_str = '%i.%i.%i' % CPPDOM_VERSION
Export('CPPDOM_VERSION')
print 'Building CppDom Version: %s' % cppdom_version_str
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dsh...@us...> - 2007-08-31 12:56:17
|
Revision: 629
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=629&view=rev
Author: dshipton
Date: 2007-08-31 05:56:14 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
SConstruct clean-up. Updated to use the new scons-addons.
Modified Paths:
--------------
trunk/SConstruct
Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct 2007-08-04 11:06:52 UTC (rev 628)
+++ trunk/SConstruct 2007-08-31 12:56:14 UTC (rev 629)
@@ -25,18 +25,6 @@
Export('GetPlatform')
pj = os.path.join
-# ------ HELPER METHODS -------- #
-def GetCppDomVersion():
- """Gets the CppDom version from cppdom/version.h.
- Returns version as tuple (major,minor,patch)
- """
- contents = open('cppdom/version.h', 'r').read()
- major = re.compile('.*(#define *CPPDOM_VERSION_MAJOR *(\d+)).*', re.DOTALL).sub(r'\2', contents)
- minor = re.compile('.*(#define *CPPDOM_VERSION_MINOR *(\d+)).*', re.DOTALL).sub(r'\2', contents)
- patch = re.compile('.*(#define *CPPDOM_VERSION_PATCH *(\d+)).*', re.DOTALL).sub(r'\2', contents)
- return (int(major), int(minor), int(patch))
-
-
#------------------------------------------------------------------------------
# Main build setup
#------------------------------------------------------------------------------
@@ -46,12 +34,12 @@
SConsignFile('.sconsign.'+GetPlatform())
# Figure out what version of CppDom we're using
-CPPDOM_VERSION = GetCppDomVersion()
+CPPDOM_VERSION = sca_utils.getVersionFromHeader('CPPDOM', 'cppdom/version.h')
cppdom_version_str = '%i.%i.%i' % CPPDOM_VERSION
Export('CPPDOM_VERSION')
print 'Building CppDom Version: %s' % cppdom_version_str
-platform = SConsAddons.Util.GetPlatform()
+platform = GetPlatform()
unspecified_prefix = "use-instlinks"
buildDir = "build." + platform
option_filename = "config.cache." + platform
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2007-08-04 11:06:50
|
Revision: 628
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=628&view=rev
Author: patrickh
Date: 2007-08-04 04:06:52 -0700 (Sat, 04 Aug 2007)
Log Message:
-----------
Use a static version of SConsAddons (r319) for this tagged release.
Added Paths:
-----------
tags/0.7.10/deps/scons-addons/
tags/0.7.10/deps/scons-addons/AUTHORS
tags/0.7.10/deps/scons-addons/COPYING
tags/0.7.10/deps/scons-addons/ChangeLog
tags/0.7.10/deps/scons-addons/README
tags/0.7.10/deps/scons-addons/TODO
tags/0.7.10/deps/scons-addons/src/
tags/0.7.10/deps/scons-addons/src/SConsAddons/
tags/0.7.10/deps/scons-addons/src/SConsAddons/AutoDist.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Builders.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/EnvironmentBuilder.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/Boost.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/Cal3D.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/CppDom.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/CppUnit.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/FlagPollBasedOption.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/GMTL.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/OSG.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/OpenSG.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/OpenSG2.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/Options.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/OptionsTest.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/Plexus.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/PyJuggler.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/Pyste.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/SDL.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/VRJuggler/
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/VRJuggler/JugglerCommon.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/VRJuggler/VRJ.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/VRJuggler/Vapor.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/VRJuggler/__init__.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/VTK.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/WxWidgets.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/Xerces.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/Zipios.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Options/__init__.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Util.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/Variants.py
tags/0.7.10/deps/scons-addons/src/SConsAddons/__init__.py
tags/0.7.10/deps/scons-addons/templates/
tags/0.7.10/deps/scons-addons/templates/__init__.py
tags/0.7.10/deps/scons-addons/templates/code.py
Property Changed:
----------------
tags/0.7.10/deps/
Property changes on: tags/0.7.10/deps
___________________________________________________________________
Name: svn:externals
- scons-addons https://realityforge.vrsource.org/svn/scons-addons/trunk/scons-addons
Added: tags/0.7.10/deps/scons-addons/AUTHORS
===================================================================
--- tags/0.7.10/deps/scons-addons/AUTHORS (rev 0)
+++ tags/0.7.10/deps/scons-addons/AUTHORS 2007-08-04 11:06:52 UTC (rev 628)
@@ -0,0 +1,4 @@
+Allen Bierbaum <al...@vr...>
+Josh Brown <br...@ia...>
+Ben Scott <bs...@vr...>
+
Added: tags/0.7.10/deps/scons-addons/COPYING
===================================================================
--- tags/0.7.10/deps/scons-addons/COPYING (rev 0)
+++ tags/0.7.10/deps/scons-addons/COPYING 2007-08-04 11:06:52 UTC (rev 628)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Added: tags/0.7.10/deps/scons-addons/ChangeLog
===================================================================
--- tags/0.7.10/deps/scons-addons/ChangeLog (rev 0)
+++ tags/0.7.10/deps/scons-addons/ChangeLog 2007-08-04 11:06:52 UTC (rev 628)
@@ -0,0 +1,78 @@
+DATE AUTHOR CHANGE
+---------- ------------ -------------------------------------------------------
+2006-07-05 allenb Significant refactoring of Options code.
+ Options object interface is not simplified and more
+ flexible for adding options to environments.
+ Add ListOption, SeparatorOption.
+ NEW VERSION: 0.1.0
+2006-07-02 allenb Added BooleanOption.
+2005-08-18 allenb Pyste Option: Added cache environment flag and param.
+2005-08-18 allenb OpenSG Options:
+ - Minimize calls to osg-config
+ - Capture defines
+ - Add flag for putting options in cpppath
+2005-07-30 allenb Make OpenSG option smarter about handling opts
+ and libs. Delay calling osg-config until necessary.
+2005-05-13 allenb Added a couple of globs to utils to test out.
+2005-04-14 allenb Moved over to subversion.
+2004-11-17 allenb Added utility method to get a relative path
+ from a known path and base directory.
+2004-11-10 allenb Refactored AutoDist to make better use of FileBundles.
+ Now packages can have multiple file bundles and
+ files bundles can have their own install prefix.
+ Fix relative path handling with FileBundles.
+2004-09-24 allenb Updated Boost python to get more info from python
+ about current version, libs, etc. This allows building
+ with 2.2 or 2.3 (or future versions hopefully).
+2004-05-31 allenb Added option to updateEnv for boost and vapor options
+ to explicitly tell it to update CPPPATH with include
+ paths.
+2004-04-16 allenb Removed auto-creation of install alias in AutoDist.
+ This was causing problems when multiple packages
+ install to the same prefix.
+2004-04-14 allenb Added RPM packager.
+2004-04-14 allenb Added support for packagers.
+2004-04-13 allenb Refactor AutoDist to make it handle files and prefixes
+ better.
+2004-03-25 allenb Require param to boost option stating wether to use
+ debug and multi-threaded libraries. This should help
+ avoid problems that occur if you just let the defaults
+ get used.
+2004-03-09 allenb Updated pyste builder to scons 0.95
+2004-03-06 allenb Updated the autodist factory methods for libs and
+ programs to use the package environment by default.
+2004-03-06 allenb Add smarter search for boost include path.
+2004-02-27 allenb Added OpenSG option set.
+2004-02-25 allenb Updated Options code so options with multiple keys
+ could have help text per option.
+ Fixed boost option to work with the new boost build.
+2003-12-30 allenb Fixed problem with boost/filesystem/operations.hpp in
+ Boost options class.
+2003-12-22 allenb Added FileBundle object for installing sets of files
+ within a package.
+ NEW VERSION: 0.0.10
+2003-11-20 allenb Added new util methods for getting paths in SConscripts
+ NEW VERSION: 0.0.9
+2003-11-19 allenb Fixed bug in pyste option when script does not exist.
+2003-11-10 allenb Added builder for package config scripts.
+2003-11-10 allenb Removed global Prefix() method replacing it with
+ storing the prefix in the autodist package instead.
+2003-10-?? allenb Added support for Pyste
+2003-09-09 allenb Added install prefixes to all AutoDist packages.
+ NEW VERSION 0.0.8
+2003-09-09 allenb Added isBuilt interface.
+ Fixed bug that prevented libraries from building in
+ build directories
+ NEW VERSION 0.0.7
+ allenb major refactoring of system
+ NEW VERSION 0.0.6
+ NEW VERSION 0.0.5
+ NEW VERSION 0.0.4
+ NEW VERSION 0.0.3
+ NEW VERSION 0.0.2
+2003-08-22 allenb Initial version
+ NEW VERSION 0.0.1
+2003-08-22 allenb Added initial implementation of Options addon.
+ NEW VERSION 0.1.0
+
+
Added: tags/0.7.10/deps/scons-addons/README
===================================================================
--- tags/0.7.10/deps/scons-addons/README (rev 0)
+++ tags/0.7.10/deps/scons-addons/README 2007-08-04 11:06:52 UTC (rev 628)
@@ -0,0 +1,81 @@
+o------------------------------------------------------------------------------o
+|Scons-addons
+|
+o------------------------------------------------------------------------------o
+
+o------------------------------------------------------------------------------o
+| What is it?
+o------------------------------------------------------------------------------o
+
+This project is a collection of addons for the scons build system.
+
+See: http://www.scons.org
+
+o------------------------------------------------------------------------------o
+| Why does this project exist? Why not just put this all in SCons?
+o------------------------------------------------------------------------------o
+There are two answers for this question:
+
+First, this allows for a place to test new addon capabilities that *may* end up
+in scons in the long term for all I know.
+
+Second, SCons doesn't have to be a kitchen sink of everything under the sun.
+Many things can be written as addons to SCons that are distributed and used
+separately. That is where this project comes in.
+
+o------------------------------------------------------------------------------o
+| Requirements
+o------------------------------------------------------------------------------o
+
+We generally require the latest released version of scons. Some addons may require the CVS version though.
+
+o------------------------------------------------------------------------------o
+| Installation
+o------------------------------------------------------------------------------o
+
+To install system-wide:
+cd scons-addons/src
+cp -r SconsAddons /path/to/python/lib/site-packages/
+
+If you do not want scons-addons installed in a standard location for python files you
+will need to set your PYTHONPATH variable to reflect where it is installed at.
+For example:
+
+(bash)
+export PYTHONPATH=/home/username/scons-addons/src
+
+(csh based shells)
+setenv PYTHONPATH /home/username/scons-addons/src
+
+o------------------------------------------------------------------------------o
+| Documentation
+o------------------------------------------------------------------------------o
+
+o------------------------------------------------------------------------------o
+| License: GPL
+o------------------------------------------------------------------------------o
+
+This file is part of scons-addons.
+
+Scons-addons is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+Scons-addons is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with scons-addons; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+o------------------------------------------------------------------------------o
+| Questions
+o------------------------------------------------------------------------------o
+
+ Please feel free to email comments, questions, suggestions, etc to
+
+ sco...@re...
Property changes on: tags/0.7.10/deps/scons-addons/README
___________________________________________________________________
Name: svn:eol-style
+ native
Added: tags/0.7.10/deps/scons-addons/TODO
===================================================================
--- tags/0.7.10/deps/scons-addons/TODO (rev 0)
+++ tags/0.7.10/deps/scons-addons/TODO 2007-08-04 11:06:52 UTC (rev 628)
@@ -0,0 +1,7 @@
+- Option handling must be improved
+
+There is a problem with the way options and build environments interact in scons-addons. For example consider how an option should validate and set itself if we are using debug runtimes and compile flags vs. using optimized run-times.
+
+We do not have a good way to take this into account to know what the correct way to use this is.
+
+Release.
Added: tags/0.7.10/deps/scons-addons/src/SConsAddons/AutoDist.py
===================================================================
--- tags/0.7.10/deps/scons-addons/src/SConsAddons/AutoDist.py (rev 0)
+++ tags/0.7.10/deps/scons-addons/src/SConsAddons/AutoDist.py 2007-08-04 11:06:52 UTC (rev 628)
@@ -0,0 +1,1061 @@
+"""
+AutoDist
+
+Automatic distribution builder and packager for SCons.
+
+"""
+############################################################## autodist-cpr beg
+#
+# AutoDist - Automatic distribution builder and packager for
+# SCons-based builds
+# AutoDist is (C) Copyright 2002 by Ben Scott
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+# -----------------------------------------------------------------
+# File: $RCSfile$
+# Date modified: $Date: 2006-11-30 10:56:55 -0600 (Thu, 30 Nov 2006) $
+# Version: $Revision: 248 $
+# -----------------------------------------------------------------
+############################################################## autodist-cpr end
+
+__version__ = '0.2.1'
+__author__ = 'Ben Scott and Allen Bierbaum'
+
+
+import os
+from os import path
+import stat
+import re
+
+import SCons.Defaults
+import SCons.Environment
+import SCons.Node.FS
+import SCons.Util
+import types
+import re
+import time
+import glob
+import shutil
+
+pj = os.path.join
+
+
+# SCons shorthand mappings
+Action = SCons.Action.Action
+Builder = SCons.Builder.Builder
+Environment = SCons.Environment.Environment
+File = SCons.Node.FS.default_fs.File
+Value = SCons.Node.Python.Value
+
+config_script_contents = ""
+
+class InstallableFile:
+ """ Class to wrap any installable file. ex. progs, libs, headers, docs, etc """
+ def __init__(self, fileNode, prefix=""):
+ """ fileNode - The scons node for the file.
+ prefix - The prefix to use for the file (munus the package/bundle prefix)
+ """
+ assert isinstance(fileNode, SCons.Node.Node), "Installable file called with non file node: [%s]"%str(fileNode)
+ self.fileNode = fileNode
+ self.prefix = prefix
+
+ def __str__(self):
+ """ an installable file's string representation is its prefix/name."""
+ if prefix:
+ return path.join(prefix, str(fileNode))
+ else:
+ return str(fileNode)
+
+ def getFileNode(self):
+ return self.fileNode
+
+ def getPrefix(self):
+ return self.prefix
+
+
+class Header(InstallableFile):
+ """ This class is meant to wrap a header file to install. """
+ def __init__(self, fileNode, prefix=""):
+ InstallableFile.__init__(self, fileNode, prefix)
+
+
+class FileBundle:
+ """ Wrapper class for a group of files to bundle together to install, archive, etc.
+
+ This class provides a method to hold a group of files together with their destination
+ structure information. Then it can be used to call install builders to setup an
+ install where needed.
+
+ One area of note is prefix handling. To allow maximum flexibility there are
+ several prefixes used.
+
+ When built, a prefix is passed as a base prefix (build_prefix)
+ The file bundle has a prefix (bundle_prefix).
+ Each bundled file has a prefix (file.prefix added when files is added).
+ If path to the added file has a prefix it is added on as well.
+
+ Final file location: build.prefix/bundle.prefix/passed_prefix/file.prefix/file.name
+ """
+
+ def __init__(self, bundlePrefix=""):
+ """
+ Construct file bundle object.
+ """
+ self.files = [] # Installable files of class InstallableFile
+ self.bundlePrefix = bundlePrefix
+ self.built = False
+
+ def addFiles(self, files, prefix = "", useRelPath=True):
+ """
+ Add these files to the list of installable files.
+ The list can either be string file names or File() nodes.
+ files - List of files to add to bundle.
+ prefix - A common prefix to use for all installed files (beyond the bundle prefix)
+ useRelPath - If true, append the relative path in the file to
+ the prefix to get the real full install path.
+ """
+ if not SCons.Util.is_List(files):
+ files = [files]
+
+ for f in files: # For all files
+ local_dir_prefix = ""
+ # If we are a string filename create file object
+ if not isinstance(f, SCons.Node.FS.Base):
+ f = File(f)
+ if useRelPath:
+ local_dir_prefix = str(f.dir)
+ install_file = InstallableFile(f, pj(prefix, local_dir_prefix))
+ self.files.append(install_file) # Append it on
+
+ def getFiles(self):
+ return self.files
+
+ def buildInstall(self, env=None, installPrefix="", ignoreBuilt=False):
+ """
+ Calls install builder to setup the installation of the packaged files.
+ Installs all files using the env environment under prefix.
+ NOTE: file is installed into: installPrefix/bundle.prefix/passed_prefix/file.prefix/file.name
+
+ NOTE: Whatever the current directly is when this is called is the directory
+ used for the builder command associated with this assembly.
+
+ Returns list of the Install() targets.
+ ifgnoreBuilt - If true, just rebuild for the given environment and don't test/set the built flag.
+ """
+ if not ignoreBuilt:
+ assert not self.built
+ self.built = True
+
+ # Clone the base environment if we have one
+ if env:
+ env = env.Copy()
+ else:
+ env = Environment()
+
+ ret_targets = []
+
+ # Install the files from the bundle
+ common_prefix = pj(installPrefix, self.bundlePrefix)
+ name = common_prefix
+ if hasattr(self,"name"):
+ name = self.name
+ #print "FileBundle-[%s]: buildInstall: "%name
+
+ for f in self.files:
+ fnode = f.getFileNode()
+ target_dir = path.join(installPrefix, self.bundlePrefix, f.getPrefix())
+ #print " file:[%s] --> target dir: [%s]"%(str(fnode),target_dir)
+ inst_tgt = env.Install(target_dir, fnode)
+ ret_targets.append(inst_tgt)
+
+ return ret_targets
+
+
+# ############################################################################ #
+# ASSEMBLIES
+# ############################################################################ #
+class _Assembly:
+ """ Base class for all assembly types that can be managed by a package.
+ This is an abstract type that provides common functionality and interface for all assemblies.
+ """
+ def __init__(self, pkg, baseEnv, prefix=""):
+ """
+ Constructs a new Assembly object with the given name within the given
+ environment.
+ """
+ self.package = pkg # The package object we belong to
+ self.built = False; # Flag set once we have been built
+ self.installPrefix = prefix; # Default install prefix
+
+ # Clone the base environment if we have one
+ if baseEnv:
+ self.env = baseEnv.Copy()
+ else:
+ self.env = Environment()
+
+ def setInstallPrefix(self, prefix):
+ self.installPrefix = prefix
+
+ def getInstallPrefix(self):
+ return self.installPrefix
+
+ def isBuilt(self):
+ return self.built
+
+ def build(self):
+ """
+ Sets up the build targets for this assembly.
+ May only be called once.
+ NOTE: Whatever the current directly is when this is called is the directory
+ used for the builder command associated with this assembly.
+ """
+
+ # Now actually do the build
+ self._buildImpl()
+ self.built = True;
+
+
+
+class FileBundleAssembly(_Assembly):
+ """ Wrapper class for a group of files to manage in an assembly for packaging.
+
+ One area of note is prefix handling. To allow maximum flexibility there
+ are several used prefixes.
+
+ The file bundle has a prefix (this is relative to the package prefix).
+ Each bundled file has a prefix (added when files is added).
+ If path to the added file has a prefix it is added on as well.
+
+ Final file location: package.prefix/filebundle.prefix/added.prefix/file.prefix/file_name
+ """
+
+ def __init__(self, pkg, baseEnv, prefix=""):
+ """
+ Construct file bundle object.
+ prefix - Prefix to install the files (relative to package)
+ pkg - The package this bundle is a part of
+ baseEnv - The environment that this bundle should be included in
+ """
+ print "WARNING: Usage of FileBundleAssembly is deprecated."
+ _Assembly.__init__(self, pkg, baseEnv, prefix)
+
+ self.files = [] # Installable files of class InstallableFile
+ self.built = False # Flag set once we have been built
+
+ def addFiles(self, files, prefix = None):
+ """
+ Add these files to the list of installable files. They will be installed as:
+ package.prefix/self.prefix/prefix/file_prefix. The list must come
+ in as strings as they are processed through File().
+ files - List of filenames (file nodes should also work)
+ """
+ if not SCons.Util.is_List(files):
+ files = [files]
+
+ for fn in files: # For all filenames
+ local_dir_prefix = ""
+ if not isinstance(fn, SCons.Node.FS.Base): # If we are a string filename, then get our local prefix
+ local_dir_prefix = os.path.dirname(fn)
+ f = InstallableFile( File(fn), pj(prefix, local_dir_prefix)) # Create new installable file
+ self.files.append(f) # Append it on
+
+ def getInstallableFiles(self):
+ return self.files
+
+ def isBuilt(self):
+ return self.built;
+
+ def build(self):
+ """
+ Sets up the build and install targets for this file bundle.
+ May only be called once.
+ NOTE: Whatever the current directly is when this is called is the directory
+ used for the builder command associated with this assembly.
+ """
+ # Add files to the package file bundle
+ fb = self.package.createFileBundle()
+
+ for f in self.files:
+ fnode = f.getFileNode()
+ fb.addFiles(fnode, f.getPrefix())
+
+ self.built = True;
+
+
+
+class _CodeAssembly(_Assembly):
+ """
+ Base type for assemblys that are based on "code".
+
+ This "abstract" class provides common functionality for Program,
+ StaticLibrary, and SharedLibrary. You don't want to instantiate this class
+ directly. It is meant to be private.
+ """
+
+ def __init__(self, filename, pkg, baseEnv, prefix=""):
+ """
+ Constructs a new Assembly object with the given name within the given
+ environment.
+ """
+ _Assembly.__init__(self, pkg, baseEnv, prefix)
+
+ assert isinstance(filename, str), "Passed a filename that is not a string. %s"%filename
+ self.fileNode = File(filename)
+ self.sources = []
+ self.includes = []
+ self.libs = []
+ self.libpaths = []
+ self.headers = []
+
+ def addSources(self, sources):
+ """
+ Adds the given list of source files into this assembly. The list must come
+ in as strings as they are processed through File().
+ """
+ # Use File() to figure out the absolute path to the file
+ srcs = map(File, sources)
+ # Add these sources into the mix
+ self.sources.extend(srcs)
+
+ def addHeaders(self, headers, prefix = None):
+ """
+ Adds the given list of distribution header files into this assembly. These
+ headers will be installed to self.package.prefix/include/prefix/file_prefix. The list must come
+ in as strings as they are processed through File().
+ """
+ for fn in headers: # For all filenames in headers
+ hdr = Header( File(fn), prefix) # Create new header rep
+ self.headers.append(hdr) # Append it on
+
+ def addIncludes(self, includes):
+ """
+ Adds in the given list of include directories that this assembly will use
+ while compiling.
+ """
+ self.includes.extend(includes)
+
+ def addLibs(self, libs):
+ """
+ Adds in the given list of libraries directories that this assembly will
+ link with.
+ """
+ self.libs.extend(libs)
+
+ def addLibPaths(self, libpaths):
+ """
+ Adds in the given list of library directories that this assembly will use
+ to find libraries while linking.
+ """
+ self.libpaths.extend(libpaths)
+
+ def getHeaders(self):
+ return self.headers
+
+ def getSources(self):
+ return self.sources
+
+ def isBuilt(self):
+ return self.built;
+
+ def getFilename(self):
+ return str(self.fileNode)
+
+ def getAbsFilePath(self):
+ return self.fileNode.get_abspath()
+
+ def build(self):
+ """
+ Sets up the build and install targets for this assembly.
+ May only be called once.
+ NOTE: Whatever the current directly is when this is called is the directory
+ used for the builder command associated with this assembly.
+ """
+ # Setup the environment for the build
+ self.env.Append(CPPPATH = self.includes,
+ LIBPATH = self.libpaths,
+ LIBS = self.libs)
+
+ # Now actually do the build
+ self._buildImpl()
+ self.built = True;
+
+
+class Library(_CodeAssembly):
+ """
+ This "abstract" class provides common functionality for StaticLibrary and
+ SharedLibrary. You don't want to instantiate this class directly. It is
+ meant to be private.
+ """
+
+ def __init__(self, libname, pkg, baseEnv, builderNames, installPrefix):
+ """
+ Creates a new library builder for a library of the given name.
+ pkg - The package we are a part of
+ baseEnv - The base environemnt to use
+ builderNames - The names of the builders to use for building the libary: ex. 'SharedLibrary'
+ installPrefix - Prefix (relative to the standard install path) to install this library
+ """
+ _CodeAssembly.__init__(self, libname, pkg, baseEnv, installPrefix)
+
+ if type(builderNames) is types.StringType:
+ self.builder_names = [ builderNames ]
+ else:
+ self.builder_names = builderNames
+
+ def _buildImpl(self):
+ """
+ Sets up the build dependencies and the install.
+ """
+
+ fb = self.package.createFileBundle()
+
+ # Setup build and install for each built library
+ # Use get_abspath() with fileNode so we get the path into the build_dir and not src dir
+ # Only build libraries if we have sources
+ if len(self.sources) > 0:
+ for lib_builder in self.builder_names:
+ lib_filepath = self.fileNode.get_abspath()
+ lib = self.env.__dict__[lib_builder](lib_filepath, self.sources)
+
+ # Lib to file bundle
+ fb.addFiles(lib, self.installPrefix, False)
+
+ # Install the headers in the source list
+ for h in self.headers:
+ headerNode = h.getFileNode()
+ fb.addFiles(headerNode, pj('include', h.getPrefix()) )
+
+
+class SharedLibrary(Library):
+ """ Sets up Library assembly with 'SharedLibrary' builder."""
+ def __init__(self, libname, pkg, baseEnv = None, installPrefix='lib'):
+ Library.__init__(self, libname, pkg, baseEnv, 'SharedLibrary', installPrefix)
+
+class StaticLibrary(Library):
+ """ Sets up Library assembly with 'StaticLibrary' builder """
+ def __init__(self, libname, pkg, baseEnv = None, installPrefix='lib'):
+ Library.__init__(self, libname, pkg, baseEnv, 'StaticLibrary', installPrefix)
+
+class StaticAndSharedLibrary(Library):
+ """ Sets up Library assembly with both 'StaticLibrary' and 'SharedLibrary' builders. """
+ def __init__(self, libname, pkg, baseEnv = None, installPrefix='lib'):
+ Library.__init__(self, libname, pkg, baseEnv, ['StaticLibrary', 'SharedLibrary'], installPrefix)
+
+
+class Program(_CodeAssembly):
+ """
+ This object knows how to build (and install) an executable program from a
+ given set of sources.
+ """
+ def __init__(self, progname, pkg, baseEnv = None, installPrefix='bin'):
+ """
+ Creates a new program builder for a program of the given name.
+ """
+ _CodeAssembly.__init__(self, progname, pkg, baseEnv, installPrefix)
+
+ def _buildImpl(self):
+ """
+ Sets up the build dependencies and the install.
+ """
+ # Build rule
+ prog = self.env.Program(self.fileNode, source = self.sources)
+
+ # Add executable to file bundle
+ fb = self.package.createFileBundle()
+ fb.addFiles(prog, self.installPrefix, False)
+
+ # Install the binary
+ #inst_prefix = self.package.prefix
+ #if self.installPrefix:
+ # inst_prefix = pj(inst_prefix, self.installPrefix)
+ #self.env.Install(inst_prefix, prog)
+
+
+class Package:
+ """
+ A package defines a collection of distributables including programs and
+ libraries. The Package class provides the ability to build, install, and
+ package up distributions of your project.
+
+ A package object provides an interface to add libraries, programs, headers,
+ and support files to a single unit that can be installed. It also shares
+ an environment across all these different units to build.
+
+ The package contains assemblies (objects that encapsulate things to build)
+ and a FileBundle (which holds all the files that could be installed or handled).
+
+ When assemblies are built, they should add any installable files to the package file bundle.
+ """
+
+ def __init__(self, name, version, prefix='/usr/local', baseEnv = None, description= None):
+ """
+ Creates a new package with the given name and version, where version is in
+ the form of <major>.<minor>.<patch> (e.g 1.12.0)
+ """
+ self.name = name
+ self.prefix = prefix
+ self.assemblies = []
+ self.fileBundles = [FileBundle(),] # File bundle for all files
+ self.extra_dist = []
+ self.description = description
+ self.packagers = []
+ self.distDir = "dist" # Path to the dist directory to use
+
+ if not self.description:
+ self.description = self.name + " Package"
+
+ if baseEnv:
+ self.env = baseEnv.Copy()
+ else:
+ self.env = Environment()
+
+ if type(version) is types.TupleType:
+ (self.version_major, self.version_minor, self.version_patch) = version;
+ else:
+ re_matches = re.match(r'^(\d+)\.(\d+)\.(\d+)$', version)
+ self.version_major = int(re_matches.group(1))
+ self.version_minor = int(re_matches.group(2))
+ self.version_patch = int(re_matches.group(3))
+
+ def getName(self):
+ return self.name
+
+ def getVersionMajor(self):
+ return self.version_major
+
+ def getVersionMinor(self):
+ return self.version_minor
+
+ def getVersionPatch(self):
+ return self.version_patch
+
+ def getFullVersion(self):
+ return ".".join( (str(self.version_major), str(self.version_minor), str(self.version_patch)) )
+
+ def getAssemblies(self):
+ return self.assemblies
+
+ def getExtraDist(self):
+ return self.extra_dist
+
+ def getFileBundles(self):
+ return self.fileBundles
+
+ def getEnv(self):
+ " Get the common pakcage environment. "
+ return self.env
+
+ def setDistDir(self, path):
+ " Set the prefix for distribution/packaged files. "
+ self.distDir = path
+
+ def getDistDir(self):
+ return self.distDir
+
+ def addPackager(self, packager):
+ " Add a new packager. Sets the packager to point to this package. "
+ packager.setPackage(self)
+ self.packagers.append(packager)
+
+ # ###### Assembly factory methods ####### #
+ def createSharedLibrary(self, name, baseEnv = None, installPrefix='lib'):
+ """
+ Creates a new shared library of the given name as a part of this package.
+ The library will be built within the given environment.
+ """
+ if not baseEnv:
+ baseEnv = self.env
+ lib = SharedLibrary(name, self, baseEnv, installPrefix)
+ self.assemblies.append(lib)
+ return lib
+
+ def createStaticLibrary(self, name, baseEnv = None, installPrefix='lib'):
+ """
+ Creates a new static library of the given name as a part of this package.
+ The library will be built within the given environment.
+ """
+ if not baseEnv:
+ baseEnv = self.env
+ lib = StaticLibrary(name, self, baseEnv, installPrefix)
+ self.assemblies.append(lib)
+ return lib
+
+ def createStaticAndSharedLibrary(self, name, baseEnv = None, installPrefix='lib'):
+ """
+ Creates new static and shared library of the given name as a part of this package.
+ The library will be built within the given environment.
+ """
+ if not baseEnv:
+ baseEnv = self.env
+ lib = StaticAndSharedLibrary(name, self, baseEnv, installPrefix)
+ self.assemblies.append(lib)
+ return lib
+
+ def createProgram(self, name, baseEnv = None, installPrefix='bin'):
+ """
+ Creates a new executable program of the given name as a part of this
+ package. The program will be built within the given environment.
+ """
+ if not baseEnv:
+ baseEnv = self.env
+ prog = Program(name, self, baseEnv, installPrefix)
+ self.assemblies.append(prog)
+ return prog
+
+ def createFileBundleAssembly(self, prefix, baseEnv = None):
+ """ Creates a new FileBundle object as part of this package. """
+ bundle = FileBundleAssembly(pkg = self, baseEnv = baseEnv, prefix=prefix)
+ self.assemblies.append(bundle)
+ return bundle
+
+ def createFileBundle(self, bundlePrefix=""):
+ """ Creates a new file bundle to use with this package. """
+ fb = FileBundle(bundlePrefix)
+ self.fileBundles.append(fb)
+ return fb
+
+ def createConfigAction(self, target, source, env):
+ """ Called as action of config script builder """
+ global config_script_contents
+
+ new_contents = config_script_contents
+ value_dict = source[0].value # Get dictionary from the value node
+
+ all_lib_names = [os.path.basename(l.getAbsFilePath()) for l in self.assemblies if isinstance(l,Library)]
+ lib_names = []
+ for l in all_lib_names:
+ if not lib_names.count(l):
+ lib_names.append(l)
+ inc_paths = [pj(self.prefix,'include'),]
+ cflags = " ".join(["-I"+p for p in inc_paths])
+ if value_dict["extraCflags"] != None:
+ cflags = cflags + " " + value_dict["extraCflags"]
+ lib_paths = [pj(self.prefix,'lib'),]
+ if value_dict["extraIncPaths"] != None:
+ cflags = cflags + " ".join([" -I"+l for l in value_dict["extraIncPaths"]])
+
+ # Extend varDict with local settings
+ varDict = {}
+ if value_dict["varDict"] != None:
+ varDict = value_dict["varDict"]
+
+ varDict["Libs"] = " ".join(["-L"+l for l in lib_paths])
+ if value_dict["extraLibPath"] != None:
+ varDict["Libs"] += " " + " ".join(["-L"+l for l in value_dict["extraLibPath"]])
+ if len(lib_names):
+ varDict["Libs"] += " " + " ".join(["-l"+l for l in lib_names])
+ if value_dict["extraLibs"]!=None:
+ varDict["Libs"] = varDict["Libs"] + " " + " ".join(["-l"+l for l in value_dict["extraLibs"]])
+ varDict["Cflags"] = cflags
+ varDict["Version"] = self.getFullVersion()
+ varDict["Name"] = self.name
+ varDict["Description"] = self.description
+ varDict["Prefix"] = self.prefix
+
+ # Create the new content
+ txt = "# config script generated for %s at %s\n" % (self.name, time.asctime())
+ txt = txt + '# values: %s\n'%(source[0].get_contents(),)
+
+ for k,v in value_dict["varDict"].items():
+ if SCons.Util.is_String(v):
+ txt = txt + 'vars["%s"] = "%s"\n' % (k,v)
+ else:
+ txt = txt + 'vars["%s"] = %s\n' % (k,v)
+
+ # Find and replace the replacable content
+ cut_re = re.compile(r'(?<=# -- BEGIN CUT --\n).*?(?=# -- END CUT --)', re.DOTALL)
+ new_contents = cut_re.sub(txt,config_script_contents)
+
+ # Create and write out the new file (setting it executable)
+ fname = str(target[0])
+ f = open(str(target[0]), 'w')
+ f.write(new_contents)
+ f.close()
+ os.chmod(fname, stat.S_IREAD|stat.S_IEXEC|stat.S_IWUSR) # Set the file options
+
+ return 0 # Successful build
+
+ def createConfigScript(self, name, installDir='bin', varDict = None,
+ extraIncPaths=None, extraLibs=None, extraLibPaths=None, extraCflags=None):
+ """ Adds a config script to the given package installation.
+ varDict - Dictionary of extra variables to define.
+ """
+
+ if not self.env['BUILDERS'].has_key("PackageConfigScript"):
+ cfg_builder = Builder(action = Action(self.createConfigAction,
+ lambda t,s,e: "Create config script for %s package: %s"%(self.name, t[0])) )
+ self.env.Append(BUILDERS = {"PackageConfigScript" : cfg_builder})
+
+ value_dict = {}
+ value_dict["prefix"] = self.prefix
+ value_dict["extraIncPaths"] = extraIncPaths
+ value_dict["extraLibs"] = extraLibs
+ value_dict["extraLibPath"] = extraLibPaths
+ value_dict["extraCflags"] = extraCflags
+
+ value_dict["varDict"] = varDict
+ self.env.PackageConfigScript(target = pj(installDir, name), source = Value(value_dict))
+
+ # May need to delay doing this until a later build stage so that all libs, headers, etc are
+ # setup and ready to go in this package.
+
+
+ def addExtraDist(self, files, exclude=[]):
+ """
+ Adds in the given files to the distribution of this package. If a
+ directory is encountered in the file list, it is recursively added. Files
+ whose names are in the exclude list are not added to the list.
+ """
+ for file in files:
+ assert isinstance(file, str), "file was not of correct type."
+ # Make sure to skip files in the exclude list
+ if not file in exclude:
+ # If the file is a directory, recurse on it
+ if os.path.isdir(str(file)):
+ self.addExtraDist(os.listdir(str(file)), exclude)
+ # If the file is not a directory, add in the extra dist list
+ else:
+ self.extra_dist.append(file)
+
+
+ def build(self, install = True):
+ """
+ Sets up the build and install for this package. This will build all
+ assemblies contained therein that have not already been built and set
+ up the standard filebundle install.
+ """
+ for assembly in self.assemblies:
+ if not assembly.isBuilt():
+ assembly.build()
+
+ # Build the file bundles for this package
+ if install:
+ for fb in self.fileBundles:
+ fb.buildInstall(self.env, self.prefix)
+ #self.env.Alias('install', self.prefix)
+
+ # Setup all packagers
+ for p in self.packagers:
+ p.build()
+
+
+# ############################################# #
+# PACKAGERS
+# ############################################# #
+
+class Packager:
+ """ Base class for all packagers in the system.
+ A packager is responsible for packaging a package into a distributable form (rpm, etc).
+ T...
[truncated message content] |
|
From: <pat...@us...> - 2007-08-04 11:04:50
|
Revision: 627
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=627&view=rev
Author: patrickh
Date: 2007-08-04 04:04:52 -0700 (Sat, 04 Aug 2007)
Log Message:
-----------
Tag the 0.7.10 release.
Added Paths:
-----------
tags/0.7.10/
Copied: tags/0.7.10 (from rev 626, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2007-08-01 22:59:30
|
Revision: 626
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=626&view=rev
Author: patrickh
Date: 2007-08-01 15:59:33 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Avoid hard-coding compiler and linker flags in the .fpc file. Removed
hard-coded path quoting as it causes problems on non-Windows platforms. The
quoting is now done by the SConstruct file.
Modified Paths:
--------------
trunk/SConstruct
trunk/cppdom.fpc.in
Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct 2007-08-01 15:37:52 UTC (rev 625)
+++ trunk/SConstruct 2007-08-01 22:59:33 UTC (rev 626)
@@ -145,6 +145,13 @@
include_dir = pj(base_inst_paths['base'], 'include')
base_inst_paths['includePrefix'] = pj( base_inst_paths['flagpollPrefix'], 'include')
+ if GetPlatform() == "win32":
+ base_inst_paths["include_path_flag"] = "/I"
+ base_inst_paths["lib_path_flag"] = "/LIBPATH:"
+ else:
+ base_inst_paths["include_path_flag"] = "-I"
+ base_inst_paths["lib_path_flag"] = "-L"
+
if common_env['versioning']:
version_suffix = "-%s_%s_%s" % CPPDOM_VERSION
@@ -181,7 +188,11 @@
if "debug" == combo["type"]:
inst_paths["lib"] = pj(inst_paths["lib"],"debug")
inst_paths['libPrefix'] = pj(inst_paths['libPrefix'],'debug')
-
+
+ if GetPlatform() == 'win32':
+ inst_paths["libPrefix"] = '"%s"' % inst_paths["libPrefix"]
+ inst_paths["includePrefix"] = '"%s"' % inst_paths["includePrefix"]
+
cppdom_shared_libname = 'cppdom' + shared_lib_suffix + version_suffix
cppdom_static_libname = 'cppdom' + static_lib_suffix + version_suffix
@@ -240,10 +251,12 @@
'@prefix@' : inst_paths['flagpollPrefix'],
'@exec_prefix@' : '${prefix}',
'@cppdom_cxxflags@' : cppdom_cxxflags,
+ '@include_path_flag@' : inst_paths['include_path_flag'],
'@includedir@' : inst_paths['includePrefix'],
'@cppdom_extra_cxxflags@' : '',
'@cppdom_extra_include_dirs@' : '',
'@cppdom_libs@' : cppdom_libs,
+ '@lib_path_flag@' : inst_paths['lib_path_flag'],
'@libdir@' : inst_paths['libPrefix'],
'@arch@' : arch,
'@version@' : cppdom_version_str
Modified: trunk/cppdom.fpc.in
===================================================================
--- trunk/cppdom.fpc.in 2007-08-01 15:37:52 UTC (rev 625)
+++ trunk/cppdom.fpc.in 2007-08-01 22:59:33 UTC (rev 626)
@@ -1,8 +1,8 @@
exec_prefix=@exec_prefix@
cxxflags=@cppdom_cxxflags@
-includedir=@includedir@
+includedir=@include_path_flag@@includedir@
libs=@cppdom_libs@
-libdir=@libdir@
+libdir=@lib_path_flag@@libdir@
Name: XML CppDom
Provides: @provides@
@@ -10,7 +10,7 @@
Description: A C++ based XML loader and writer with an internal DOM representation.
URL: http://xml-cppdom.sf.net
Requires:
-Libs: -L"${libdir}" ${libs}
-Cflags: -I"${includedir}"
+Libs: ${libdir} ${libs}
+Cflags: ${includedir}
Arch: @arch@
prefix: @prefix@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2007-08-01 15:37:50
|
Revision: 625
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=625&view=rev
Author: patrickh
Date: 2007-08-01 08:37:52 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Note a to-do item for Mac OS X.
Modified Paths:
--------------
trunk/cppdom/SConscript
Modified: trunk/cppdom/SConscript
===================================================================
--- trunk/cppdom/SConscript 2007-08-01 15:22:38 UTC (rev 624)
+++ trunk/cppdom/SConscript 2007-08-01 15:37:52 UTC (rev 625)
@@ -46,6 +46,8 @@
cppdom_shared_lib_env = cppdom_lib_env.Copy()
cppdom_shared_lib_env.AppendUnique(CPPDEFINES = ["CPPDOM_EXPORTS"])
if GetPlatform() == 'darwin':
+ # TODO: The install name should probably include the installation
+ # prefix.
cppdom_shared_lib_env.Append(
LINKFLAGS = ['-install_name', 'lib%s.dylib' % cppdom_shared_libname,
'-Wl,-compatibility_version,%i.%i' % \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2007-08-01 15:22:35
|
Revision: 624
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=624&view=rev
Author: patrickh
Date: 2007-08-01 08:22:38 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Note recent changes and roll the version to 0.7.10.
Modified Paths:
--------------
trunk/ChangeLog
trunk/cppdom/version.h
trunk/cppdom.spec
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-08-01 15:22:12 UTC (rev 623)
+++ trunk/ChangeLog 2007-08-01 15:22:38 UTC (rev 624)
@@ -1,5 +1,13 @@
DATE AUTHOR CHANGE
---------- ----------- -------------------------------------------------------
+2007-08-01 patrickh Updated for SConsAddons changes. On Windows, the
+ build formerly called "hybrid" is now the "debug"
+ build. The DLL is installed in lib\debug. The build
+ formerly called "debug" is now the "debugrt" build (to
+ indicate that it is linked against the Visual C++ debug
+ runtime). The library is still named with "_d".
+ VERSION: 0.7.10
+2007-07-25 patrickh Fixed empty comment processing bug.
2007-07-06 patrickh Fixed build issues on Mac OS X.
VERSION: 0.7.9
2007-06-26 patrickh Made many build fixes and improvements on Windows.
Modified: trunk/cppdom/version.h
===================================================================
--- trunk/cppdom/version.h 2007-08-01 15:22:12 UTC (rev 623)
+++ trunk/cppdom/version.h 2007-08-01 15:22:38 UTC (rev 624)
@@ -55,7 +55,7 @@
// The major/minor/patch version (up to 3 digits each).
#define CPPDOM_VERSION_MAJOR 0
#define CPPDOM_VERSION_MINOR 7
-#define CPPDOM_VERSION_PATCH 9
+#define CPPDOM_VERSION_PATCH 10
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
Modified: trunk/cppdom.spec
===================================================================
--- trunk/cppdom.spec 2007-08-01 15:22:12 UTC (rev 623)
+++ trunk/cppdom.spec 2007-08-01 15:22:38 UTC (rev 624)
@@ -1,6 +1,6 @@
# Spec file for cppdom.
%define name cppdom
-%define version 0.7.9
+%define version 0.7.10
%define release 1
Name: %{name}
@@ -127,6 +127,9 @@
%doc %{_docdir}/cppdom-%{version}/html
%changelog
+* Wed Aug 01 2007 Patrick Hartling <pa...@in...> 0.7.10-1
+- Updated to version 0.7.10.
+
* Fri Jul 06 2007 Patrick Hartling <pa...@in...> 0.7.9-1
- Updated to version 0.7.9.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2007-08-01 15:22:09
|
Revision: 623
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=623&view=rev
Author: patrickh
Date: 2007-08-01 08:22:12 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
There is no longer an "_h" variant on Windows.
Modified Paths:
--------------
trunk/cppdom/config.h
Modified: trunk/cppdom/config.h
===================================================================
--- trunk/cppdom/config.h 2007-08-01 15:06:44 UTC (rev 622)
+++ trunk/cppdom/config.h 2007-08-01 15:22:12 UTC (rev 623)
@@ -88,12 +88,8 @@
# define CPPDOM_DEBUG
# endif
-# if defined(CPPDOM_DEBUG)
-# if defined(_DEBUG)
-# define CPPDOM_LIB_RT_OPT "_d"
-# else
-# define CPPDOM_LIB_RT_OPT "_h"
-# endif
+# if defined(CPPDOM_DEBUG) && defined(_DEBUG)
+# define CPPDOM_LIB_RT_OPT "_d"
# else
# define CPPDOM_LIB_RT_OPT ""
# endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2007-08-01 15:06:42
|
Revision: 622
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=622&view=rev
Author: patrickh
Date: 2007-08-01 08:06:44 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Append the "64" suffix to the lib installatino path before tacking on the
"debug" subdirectory. Installing to lib/debug64 doesn't make a lot of sense
to me.
Modified Paths:
--------------
trunk/SConstruct
Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct 2007-08-01 15:03:55 UTC (rev 621)
+++ trunk/SConstruct 2007-08-01 15:06:44 UTC (rev 622)
@@ -175,12 +175,12 @@
inst_paths = copy.copy(base_inst_paths)
inst_paths['libPrefix'] = pj(inst_paths['flagpollPrefix'], 'lib')
+ if "x64" == combo["arch"]:
+ inst_paths['lib'] = inst_paths['lib'] + '64'
+ inst_paths['libPrefix'] = inst_paths['libPrefix'] + '64'
if "debug" == combo["type"]:
inst_paths["lib"] = pj(inst_paths["lib"],"debug")
inst_paths['libPrefix'] = pj(inst_paths['libPrefix'],'debug')
- if "x64" == combo["arch"]:
- inst_paths['lib'] = inst_paths['lib'] + '64'
- inst_paths['libPrefix'] = inst_paths['libPrefix'] + '64'
cppdom_shared_libname = 'cppdom' + shared_lib_suffix + version_suffix
cppdom_static_libname = 'cppdom' + static_lib_suffix + version_suffix
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2007-08-01 15:03:52
|
Revision: 621
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=621&view=rev
Author: patrickh
Date: 2007-08-01 08:03:55 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Added information about the joys of building on Windows.
Modified Paths:
--------------
trunk/README
Modified: trunk/README
===================================================================
--- trunk/README 2007-07-31 22:22:18 UTC (rev 620)
+++ trunk/README 2007-08-01 15:03:55 UTC (rev 621)
@@ -30,6 +30,45 @@
type 'scons install' to install on the system
type 'scons install prefix=$HOME/software' to install in your account
+Windows
+=======
+
+CppDOM can be compiled with Visual C++ 6.0 and newer. However, SCons tries to
+be smart and pick the version of Visual C++ that it thinks you should use
+(always--or almost always--the newest version). To override this, use the
+MSVS_VERSION command line option. For example, to force compilation with
+Visual C++ 7.0 (from Visual Studio .NET 2002), run the following:
+
+ scons MSVS_VERSION=7.0
+
+Let's say we want to use Visual C++ 8.0 (from Visual Studio 8) instead. In
+that case, run the following:
+
+ scons MSVS_VERSION=8.0
+
+If there is only one version of Visual Studio installed, SCons will find it,
+and using the MSVS_VERSION argument is unnecessary.
+
+64-bit Windows
+==============
+
+To build a 64-bit version of CppDOM on Windows, Visual Studio 2005 (also
+known as Visual Studio 8) must be used, and it must be run on a 64-bit
+Windows installation. The trick, however, is that the 32-bit version of
+Python must be used. Otherwise, SCons will not find the Visual Studio
+installation because it looks in the wrong place in the Registry and in
+"C:\Program Files\Microsoft Visual Studio 8" instead of in
+"C:\Program Files (x86)\Microsoft Visual Studio 8".
+
+So, to build both the 32-bit and the 64-bit versions of CppDOM, run the
+following:
+
+ scons MSVS_VERSION=8.0
+
+To build only the 64-bit version, run the following:
+
+ scons MSVS_VERSION=8.0 var_arch=x64
+
Mac OS X
========
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2007-07-31 22:22:15
|
Revision: 620
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=620&view=rev
Author: patrickh
Date: 2007-07-31 15:22:18 -0700 (Tue, 31 Jul 2007)
Log Message:
-----------
Fixed the build to work with naming convention changes in SConsAddons.
Modified Paths:
--------------
trunk/SConstruct
trunk/cppdom/SConscript
Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct 2007-07-25 22:02:45 UTC (rev 619)
+++ trunk/SConstruct 2007-07-31 22:22:18 UTC (rev 620)
@@ -175,7 +175,7 @@
inst_paths = copy.copy(base_inst_paths)
inst_paths['libPrefix'] = pj(inst_paths['flagpollPrefix'], 'lib')
- if GetPlatform() != "win32" and "debug" == combo["type"]:
+ if "debug" == combo["type"]:
inst_paths["lib"] = pj(inst_paths["lib"],"debug")
inst_paths['libPrefix'] = pj(inst_paths['libPrefix'],'debug')
if "x64" == combo["arch"]:
@@ -227,7 +227,7 @@
cppdom_libs = ''
cppdom_cxxflags = '/DCPPDOM_AUTO_LINK'
- if "debug" in combo["type"] or "hybrid" in combo["type"]:
+ if "debug" in combo["type"] or "debugrt" in combo["type"]:
cppdom_cxxflags += ' /DCPPDOM_DEBUG'
if "shared" in combo["libtype"]:
cppdom_cxxflags += ' /DCPPDOM_DYN_LINK'
@@ -251,7 +251,7 @@
# Setup the builder for cppdom.fpc
# XXX: This generates multiple cppdom*.fpc files instead of putting all
- # the variation of debug/optimized/hybrid and static/shared into one
+ # the variation of debug/optimized/debugrt and static/shared into one
# architecture-specific file!
name_parts = ['cppdom',cppdom_version_str,arch]
if combo["type"] != "optimized":
Modified: trunk/cppdom/SConscript
===================================================================
--- trunk/cppdom/SConscript 2007-07-25 22:02:45 UTC (rev 619)
+++ trunk/cppdom/SConscript 2007-07-31 22:22:18 UTC (rev 620)
@@ -30,7 +30,7 @@
cppdom_lib_env = build_env.Copy()
cppdom_lib_env.Append(CPPPATH = [inst_paths['include'],])
-if "debug" in combo["type"] or "hybrid" in combo["type"]:
+if "debug" in combo["type"] or "debugrt" in combo["type"]:
cppdom_lib_env.AppendUnique(CPPDEFINES = ["CPPDOM_DEBUG"])
# If should not do static only, then create static and shared libraries
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2007-07-25 22:02:43
|
Revision: 619
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=619&view=rev
Author: patrickh
Date: 2007-07-25 15:02:45 -0700 (Wed, 25 Jul 2007)
Log Message:
-----------
Fixed a bug where a comment containing only whitespace would result in the
parser getting stuck in an infinite loop.
Modified Paths:
--------------
trunk/cppdom/xmlparser.cpp
trunk/cppdom/xmlparser.h
Modified: trunk/cppdom/xmlparser.cpp
===================================================================
--- trunk/cppdom/xmlparser.cpp 2007-07-16 13:09:26 UTC (rev 618)
+++ trunk/cppdom/xmlparser.cpp 2007-07-25 22:02:45 UTC (rev 619)
@@ -293,14 +293,22 @@
// comment follows
case '!':
- this->parseComment(context);
+ {
+ // Consume the -- part of the comment opening string.
+ ++mTokenizer;
- // get next token
- ++mTokenizer;
- token1 = *mTokenizer;
+ // needed to correctly handle <!---->
+ Token temp_token(mTokenizer->getGeneric().substr(2));
+ mTokenizer.putBack(temp_token);
+ this->parseComment(context);
- // parse again, until we encounter some useful data
- again = true;
+ // get next token
+ ++mTokenizer;
+ token1 = *mTokenizer;
+
+ // parse again, until we encounter some useful data
+ again = true;
+ }
break;
default:
Modified: trunk/cppdom/xmlparser.h
===================================================================
--- trunk/cppdom/xmlparser.h 2007-07-16 13:09:26 UTC (rev 618)
+++ trunk/cppdom/xmlparser.h 2007-07-25 22:02:45 UTC (rev 619)
@@ -74,7 +74,11 @@
/** parses an xml tag attribute list */
bool parseAttributes(Attributes& attr);
- /** parses a <!-- --> comment */
+ /**
+ * parses a <!-- --> comment
+ *
+ * @pre The <!-- part of the comment has already been consumed.
+ */
void parseComment(ContextPtr& context);
protected:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2007-07-16 13:09:24
|
Revision: 618
http://svn.sourceforge.net/xml-cppdom/?rev=618&view=rev
Author: aronb
Date: 2007-07-16 06:09:26 -0700 (Mon, 16 Jul 2007)
Log Message:
-----------
Quote paths for use on windows.
Modified Paths:
--------------
trunk/cppdom.fpc.in
Modified: trunk/cppdom.fpc.in
===================================================================
--- trunk/cppdom.fpc.in 2007-07-07 01:25:46 UTC (rev 617)
+++ trunk/cppdom.fpc.in 2007-07-16 13:09:26 UTC (rev 618)
@@ -10,7 +10,7 @@
Description: A C++ based XML loader and writer with an internal DOM representation.
URL: http://xml-cppdom.sf.net
Requires:
-Libs: -L${libdir} ${libs}
-Cflags: -I${includedir}
+Libs: -L"${libdir}" ${libs}
+Cflags: -I"${includedir}"
Arch: @arch@
prefix: @prefix@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2007-07-07 01:25:43
|
Revision: 617
http://svn.sourceforge.net/xml-cppdom/?rev=617&view=rev
Author: patrickh
Date: 2007-07-06 18:25:46 -0700 (Fri, 06 Jul 2007)
Log Message:
-----------
Use a static version of SConsAddons r305.
Added Paths:
-----------
tags/0.7.9/deps/scons-addons/
tags/0.7.9/deps/scons-addons/AUTHORS
tags/0.7.9/deps/scons-addons/COPYING
tags/0.7.9/deps/scons-addons/ChangeLog
tags/0.7.9/deps/scons-addons/README
tags/0.7.9/deps/scons-addons/TODO
tags/0.7.9/deps/scons-addons/src/
tags/0.7.9/deps/scons-addons/src/SConsAddons/
tags/0.7.9/deps/scons-addons/src/SConsAddons/AutoDist.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Builders.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/EnvironmentBuilder.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/Boost.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/Cal3D.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/CppDom.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/CppUnit.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/FlagPollBasedOption.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/GMTL.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/OSG.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/OpenSG.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/OpenSG2.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/Options.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/OptionsTest.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/Plexus.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/PyJuggler.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/Pyste.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/SDL.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/VRJuggler/
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/VRJuggler/JugglerCommon.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/VRJuggler/VRJ.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/VRJuggler/Vapor.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/VRJuggler/__init__.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/VTK.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/WxWidgets.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/Xerces.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/Zipios.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Options/__init__.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Util.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/Variants.py
tags/0.7.9/deps/scons-addons/src/SConsAddons/__init__.py
tags/0.7.9/deps/scons-addons/templates/
tags/0.7.9/deps/scons-addons/templates/__init__.py
tags/0.7.9/deps/scons-addons/templates/code.py
Property Changed:
----------------
tags/0.7.9/deps/
Property changes on: tags/0.7.9/deps
___________________________________________________________________
Name: svn:externals
- scons-addons https://realityforge.vrsource.org/svn/scons-addons/trunk/scons-addons
Added: tags/0.7.9/deps/scons-addons/AUTHORS
===================================================================
--- tags/0.7.9/deps/scons-addons/AUTHORS (rev 0)
+++ tags/0.7.9/deps/scons-addons/AUTHORS 2007-07-07 01:25:46 UTC (rev 617)
@@ -0,0 +1,4 @@
+Allen Bierbaum <al...@vr...>
+Josh Brown <br...@ia...>
+Ben Scott <bs...@vr...>
+
Added: tags/0.7.9/deps/scons-addons/COPYING
===================================================================
--- tags/0.7.9/deps/scons-addons/COPYING (rev 0)
+++ tags/0.7.9/deps/scons-addons/COPYING 2007-07-07 01:25:46 UTC (rev 617)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Added: tags/0.7.9/deps/scons-addons/ChangeLog
===================================================================
--- tags/0.7.9/deps/scons-addons/ChangeLog (rev 0)
+++ tags/0.7.9/deps/scons-addons/ChangeLog 2007-07-07 01:25:46 UTC (rev 617)
@@ -0,0 +1,78 @@
+DATE AUTHOR CHANGE
+---------- ------------ -------------------------------------------------------
+2006-07-05 allenb Significant refactoring of Options code.
+ Options object interface is not simplified and more
+ flexible for adding options to environments.
+ Add ListOption, SeparatorOption.
+ NEW VERSION: 0.1.0
+2006-07-02 allenb Added BooleanOption.
+2005-08-18 allenb Pyste Option: Added cache environment flag and param.
+2005-08-18 allenb OpenSG Options:
+ - Minimize calls to osg-config
+ - Capture defines
+ - Add flag for putting options in cpppath
+2005-07-30 allenb Make OpenSG option smarter about handling opts
+ and libs. Delay calling osg-config until necessary.
+2005-05-13 allenb Added a couple of globs to utils to test out.
+2005-04-14 allenb Moved over to subversion.
+2004-11-17 allenb Added utility method to get a relative path
+ from a known path and base directory.
+2004-11-10 allenb Refactored AutoDist to make better use of FileBundles.
+ Now packages can have multiple file bundles and
+ files bundles can have their own install prefix.
+ Fix relative path handling with FileBundles.
+2004-09-24 allenb Updated Boost python to get more info from python
+ about current version, libs, etc. This allows building
+ with 2.2 or 2.3 (or future versions hopefully).
+2004-05-31 allenb Added option to updateEnv for boost and vapor options
+ to explicitly tell it to update CPPPATH with include
+ paths.
+2004-04-16 allenb Removed auto-creation of install alias in AutoDist.
+ This was causing problems when multiple packages
+ install to the same prefix.
+2004-04-14 allenb Added RPM packager.
+2004-04-14 allenb Added support for packagers.
+2004-04-13 allenb Refactor AutoDist to make it handle files and prefixes
+ better.
+2004-03-25 allenb Require param to boost option stating wether to use
+ debug and multi-threaded libraries. This should help
+ avoid problems that occur if you just let the defaults
+ get used.
+2004-03-09 allenb Updated pyste builder to scons 0.95
+2004-03-06 allenb Updated the autodist factory methods for libs and
+ programs to use the package environment by default.
+2004-03-06 allenb Add smarter search for boost include path.
+2004-02-27 allenb Added OpenSG option set.
+2004-02-25 allenb Updated Options code so options with multiple keys
+ could have help text per option.
+ Fixed boost option to work with the new boost build.
+2003-12-30 allenb Fixed problem with boost/filesystem/operations.hpp in
+ Boost options class.
+2003-12-22 allenb Added FileBundle object for installing sets of files
+ within a package.
+ NEW VERSION: 0.0.10
+2003-11-20 allenb Added new util methods for getting paths in SConscripts
+ NEW VERSION: 0.0.9
+2003-11-19 allenb Fixed bug in pyste option when script does not exist.
+2003-11-10 allenb Added builder for package config scripts.
+2003-11-10 allenb Removed global Prefix() method replacing it with
+ storing the prefix in the autodist package instead.
+2003-10-?? allenb Added support for Pyste
+2003-09-09 allenb Added install prefixes to all AutoDist packages.
+ NEW VERSION 0.0.8
+2003-09-09 allenb Added isBuilt interface.
+ Fixed bug that prevented libraries from building in
+ build directories
+ NEW VERSION 0.0.7
+ allenb major refactoring of system
+ NEW VERSION 0.0.6
+ NEW VERSION 0.0.5
+ NEW VERSION 0.0.4
+ NEW VERSION 0.0.3
+ NEW VERSION 0.0.2
+2003-08-22 allenb Initial version
+ NEW VERSION 0.0.1
+2003-08-22 allenb Added initial implementation of Options addon.
+ NEW VERSION 0.1.0
+
+
Added: tags/0.7.9/deps/scons-addons/README
===================================================================
--- tags/0.7.9/deps/scons-addons/README (rev 0)
+++ tags/0.7.9/deps/scons-addons/README 2007-07-07 01:25:46 UTC (rev 617)
@@ -0,0 +1,81 @@
+o------------------------------------------------------------------------------o
+|Scons-addons
+|
+o------------------------------------------------------------------------------o
+
+o------------------------------------------------------------------------------o
+| What is it?
+o------------------------------------------------------------------------------o
+
+This project is a collection of addons for the scons build system.
+
+See: http://www.scons.org
+
+o------------------------------------------------------------------------------o
+| Why does this project exist? Why not just put this all in SCons?
+o------------------------------------------------------------------------------o
+There are two answers for this question:
+
+First, this allows for a place to test new addon capabilities that *may* end up
+in scons in the long term for all I know.
+
+Second, SCons doesn't have to be a kitchen sink of everything under the sun.
+Many things can be written as addons to SCons that are distributed and used
+separately. That is where this project comes in.
+
+o------------------------------------------------------------------------------o
+| Requirements
+o------------------------------------------------------------------------------o
+
+We generally require the latest released version of scons. Some addons may require the CVS version though.
+
+o------------------------------------------------------------------------------o
+| Installation
+o------------------------------------------------------------------------------o
+
+To install system-wide:
+cd scons-addons/src
+cp -r SconsAddons /path/to/python/lib/site-packages/
+
+If you do not want scons-addons installed in a standard location for python files you
+will need to set your PYTHONPATH variable to reflect where it is installed at.
+For example:
+
+(bash)
+export PYTHONPATH=/home/username/scons-addons/src
+
+(csh based shells)
+setenv PYTHONPATH /home/username/scons-addons/src
+
+o------------------------------------------------------------------------------o
+| Documentation
+o------------------------------------------------------------------------------o
+
+o------------------------------------------------------------------------------o
+| License: GPL
+o------------------------------------------------------------------------------o
+
+This file is part of scons-addons.
+
+Scons-addons is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+Scons-addons is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with scons-addons; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+o------------------------------------------------------------------------------o
+| Questions
+o------------------------------------------------------------------------------o
+
+ Please feel free to email comments, questions, suggestions, etc to
+
+ sco...@re...
Property changes on: tags/0.7.9/deps/scons-addons/README
___________________________________________________________________
Name: svn:eol-style
+ native
Added: tags/0.7.9/deps/scons-addons/TODO
===================================================================
--- tags/0.7.9/deps/scons-addons/TODO (rev 0)
+++ tags/0.7.9/deps/scons-addons/TODO 2007-07-07 01:25:46 UTC (rev 617)
@@ -0,0 +1,7 @@
+- Option handling must be improved
+
+There is a problem with the way options and build environments interact in scons-addons. For example consider how an option should validate and set itself if we are using debug runtimes and compile flags vs. using optimized run-times.
+
+We do not have a good way to take this into account to know what the correct way to use this is.
+
+Release.
Added: tags/0.7.9/deps/scons-addons/src/SConsAddons/AutoDist.py
===================================================================
--- tags/0.7.9/deps/scons-addons/src/SConsAddons/AutoDist.py (rev 0)
+++ tags/0.7.9/deps/scons-addons/src/SConsAddons/AutoDist.py 2007-07-07 01:25:46 UTC (rev 617)
@@ -0,0 +1,1061 @@
+"""
+AutoDist
+
+Automatic distribution builder and packager for SCons.
+
+"""
+############################################################## autodist-cpr beg
+#
+# AutoDist - Automatic distribution builder and packager for
+# SCons-based builds
+# AutoDist is (C) Copyright 2002 by Ben Scott
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+# -----------------------------------------------------------------
+# File: $RCSfile$
+# Date modified: $Date: 2006-11-30 10:56:55 -0600 (Thu, 30 Nov 2006) $
+# Version: $Revision: 248 $
+# -----------------------------------------------------------------
+############################################################## autodist-cpr end
+
+__version__ = '0.2.1'
+__author__ = 'Ben Scott and Allen Bierbaum'
+
+
+import os
+from os import path
+import stat
+import re
+
+import SCons.Defaults
+import SCons.Environment
+import SCons.Node.FS
+import SCons.Util
+import types
+import re
+import time
+import glob
+import shutil
+
+pj = os.path.join
+
+
+# SCons shorthand mappings
+Action = SCons.Action.Action
+Builder = SCons.Builder.Builder
+Environment = SCons.Environment.Environment
+File = SCons.Node.FS.default_fs.File
+Value = SCons.Node.Python.Value
+
+config_script_contents = ""
+
+class InstallableFile:
+ """ Class to wrap any installable file. ex. progs, libs, headers, docs, etc """
+ def __init__(self, fileNode, prefix=""):
+ """ fileNode - The scons node for the file.
+ prefix - The prefix to use for the file (munus the package/bundle prefix)
+ """
+ assert isinstance(fileNode, SCons.Node.Node), "Installable file called with non file node: [%s]"%str(fileNode)
+ self.fileNode = fileNode
+ self.prefix = prefix
+
+ def __str__(self):
+ """ an installable file's string representation is its prefix/name."""
+ if prefix:
+ return path.join(prefix, str(fileNode))
+ else:
+ return str(fileNode)
+
+ def getFileNode(self):
+ return self.fileNode
+
+ def getPrefix(self):
+ return self.prefix
+
+
+class Header(InstallableFile):
+ """ This class is meant to wrap a header file to install. """
+ def __init__(self, fileNode, prefix=""):
+ InstallableFile.__init__(self, fileNode, prefix)
+
+
+class FileBundle:
+ """ Wrapper class for a group of files to bundle together to install, archive, etc.
+
+ This class provides a method to hold a group of files together with their destination
+ structure information. Then it can be used to call install builders to setup an
+ install where needed.
+
+ One area of note is prefix handling. To allow maximum flexibility there are
+ several prefixes used.
+
+ When built, a prefix is passed as a base prefix (build_prefix)
+ The file bundle has a prefix (bundle_prefix).
+ Each bundled file has a prefix (file.prefix added when files is added).
+ If path to the added file has a prefix it is added on as well.
+
+ Final file location: build.prefix/bundle.prefix/passed_prefix/file.prefix/file.name
+ """
+
+ def __init__(self, bundlePrefix=""):
+ """
+ Construct file bundle object.
+ """
+ self.files = [] # Installable files of class InstallableFile
+ self.bundlePrefix = bundlePrefix
+ self.built = False
+
+ def addFiles(self, files, prefix = "", useRelPath=True):
+ """
+ Add these files to the list of installable files.
+ The list can either be string file names or File() nodes.
+ files - List of files to add to bundle.
+ prefix - A common prefix to use for all installed files (beyond the bundle prefix)
+ useRelPath - If true, append the relative path in the file to
+ the prefix to get the real full install path.
+ """
+ if not SCons.Util.is_List(files):
+ files = [files]
+
+ for f in files: # For all files
+ local_dir_prefix = ""
+ # If we are a string filename create file object
+ if not isinstance(f, SCons.Node.FS.Base):
+ f = File(f)
+ if useRelPath:
+ local_dir_prefix = str(f.dir)
+ install_file = InstallableFile(f, pj(prefix, local_dir_prefix))
+ self.files.append(install_file) # Append it on
+
+ def getFiles(self):
+ return self.files
+
+ def buildInstall(self, env=None, installPrefix="", ignoreBuilt=False):
+ """
+ Calls install builder to setup the installation of the packaged files.
+ Installs all files using the env environment under prefix.
+ NOTE: file is installed into: installPrefix/bundle.prefix/passed_prefix/file.prefix/file.name
+
+ NOTE: Whatever the current directly is when this is called is the directory
+ used for the builder command associated with this assembly.
+
+ Returns list of the Install() targets.
+ ifgnoreBuilt - If true, just rebuild for the given environment and don't test/set the built flag.
+ """
+ if not ignoreBuilt:
+ assert not self.built
+ self.built = True
+
+ # Clone the base environment if we have one
+ if env:
+ env = env.Copy()
+ else:
+ env = Environment()
+
+ ret_targets = []
+
+ # Install the files from the bundle
+ common_prefix = pj(installPrefix, self.bundlePrefix)
+ name = common_prefix
+ if hasattr(self,"name"):
+ name = self.name
+ #print "FileBundle-[%s]: buildInstall: "%name
+
+ for f in self.files:
+ fnode = f.getFileNode()
+ target_dir = path.join(installPrefix, self.bundlePrefix, f.getPrefix())
+ #print " file:[%s] --> target dir: [%s]"%(str(fnode),target_dir)
+ inst_tgt = env.Install(target_dir, fnode)
+ ret_targets.append(inst_tgt)
+
+ return ret_targets
+
+
+# ############################################################################ #
+# ASSEMBLIES
+# ############################################################################ #
+class _Assembly:
+ """ Base class for all assembly types that can be managed by a package.
+ This is an abstract type that provides common functionality and interface for all assemblies.
+ """
+ def __init__(self, pkg, baseEnv, prefix=""):
+ """
+ Constructs a new Assembly object with the given name within the given
+ environment.
+ """
+ self.package = pkg # The package object we belong to
+ self.built = False; # Flag set once we have been built
+ self.installPrefix = prefix; # Default install prefix
+
+ # Clone the base environment if we have one
+ if baseEnv:
+ self.env = baseEnv.Copy()
+ else:
+ self.env = Environment()
+
+ def setInstallPrefix(self, prefix):
+ self.installPrefix = prefix
+
+ def getInstallPrefix(self):
+ return self.installPrefix
+
+ def isBuilt(self):
+ return self.built
+
+ def build(self):
+ """
+ Sets up the build targets for this assembly.
+ May only be called once.
+ NOTE: Whatever the current directly is when this is called is the directory
+ used for the builder command associated with this assembly.
+ """
+
+ # Now actually do the build
+ self._buildImpl()
+ self.built = True;
+
+
+
+class FileBundleAssembly(_Assembly):
+ """ Wrapper class for a group of files to manage in an assembly for packaging.
+
+ One area of note is prefix handling. To allow maximum flexibility there
+ are several used prefixes.
+
+ The file bundle has a prefix (this is relative to the package prefix).
+ Each bundled file has a prefix (added when files is added).
+ If path to the added file has a prefix it is added on as well.
+
+ Final file location: package.prefix/filebundle.prefix/added.prefix/file.prefix/file_name
+ """
+
+ def __init__(self, pkg, baseEnv, prefix=""):
+ """
+ Construct file bundle object.
+ prefix - Prefix to install the files (relative to package)
+ pkg - The package this bundle is a part of
+ baseEnv - The environment that this bundle should be included in
+ """
+ print "WARNING: Usage of FileBundleAssembly is deprecated."
+ _Assembly.__init__(self, pkg, baseEnv, prefix)
+
+ self.files = [] # Installable files of class InstallableFile
+ self.built = False # Flag set once we have been built
+
+ def addFiles(self, files, prefix = None):
+ """
+ Add these files to the list of installable files. They will be installed as:
+ package.prefix/self.prefix/prefix/file_prefix. The list must come
+ in as strings as they are processed through File().
+ files - List of filenames (file nodes should also work)
+ """
+ if not SCons.Util.is_List(files):
+ files = [files]
+
+ for fn in files: # For all filenames
+ local_dir_prefix = ""
+ if not isinstance(fn, SCons.Node.FS.Base): # If we are a string filename, then get our local prefix
+ local_dir_prefix = os.path.dirname(fn)
+ f = InstallableFile( File(fn), pj(prefix, local_dir_prefix)) # Create new installable file
+ self.files.append(f) # Append it on
+
+ def getInstallableFiles(self):
+ return self.files
+
+ def isBuilt(self):
+ return self.built;
+
+ def build(self):
+ """
+ Sets up the build and install targets for this file bundle.
+ May only be called once.
+ NOTE: Whatever the current directly is when this is called is the directory
+ used for the builder command associated with this assembly.
+ """
+ # Add files to the package file bundle
+ fb = self.package.createFileBundle()
+
+ for f in self.files:
+ fnode = f.getFileNode()
+ fb.addFiles(fnode, f.getPrefix())
+
+ self.built = True;
+
+
+
+class _CodeAssembly(_Assembly):
+ """
+ Base type for assemblys that are based on "code".
+
+ This "abstract" class provides common functionality for Program,
+ StaticLibrary, and SharedLibrary. You don't want to instantiate this class
+ directly. It is meant to be private.
+ """
+
+ def __init__(self, filename, pkg, baseEnv, prefix=""):
+ """
+ Constructs a new Assembly object with the given name within the given
+ environment.
+ """
+ _Assembly.__init__(self, pkg, baseEnv, prefix)
+
+ assert isinstance(filename, str), "Passed a filename that is not a string. %s"%filename
+ self.fileNode = File(filename)
+ self.sources = []
+ self.includes = []
+ self.libs = []
+ self.libpaths = []
+ self.headers = []
+
+ def addSources(self, sources):
+ """
+ Adds the given list of source files into this assembly. The list must come
+ in as strings as they are processed through File().
+ """
+ # Use File() to figure out the absolute path to the file
+ srcs = map(File, sources)
+ # Add these sources into the mix
+ self.sources.extend(srcs)
+
+ def addHeaders(self, headers, prefix = None):
+ """
+ Adds the given list of distribution header files into this assembly. These
+ headers will be installed to self.package.prefix/include/prefix/file_prefix. The list must come
+ in as strings as they are processed through File().
+ """
+ for fn in headers: # For all filenames in headers
+ hdr = Header( File(fn), prefix) # Create new header rep
+ self.headers.append(hdr) # Append it on
+
+ def addIncludes(self, includes):
+ """
+ Adds in the given list of include directories that this assembly will use
+ while compiling.
+ """
+ self.includes.extend(includes)
+
+ def addLibs(self, libs):
+ """
+ Adds in the given list of libraries directories that this assembly will
+ link with.
+ """
+ self.libs.extend(libs)
+
+ def addLibPaths(self, libpaths):
+ """
+ Adds in the given list of library directories that this assembly will use
+ to find libraries while linking.
+ """
+ self.libpaths.extend(libpaths)
+
+ def getHeaders(self):
+ return self.headers
+
+ def getSources(self):
+ return self.sources
+
+ def isBuilt(self):
+ return self.built;
+
+ def getFilename(self):
+ return str(self.fileNode)
+
+ def getAbsFilePath(self):
+ return self.fileNode.get_abspath()
+
+ def build(self):
+ """
+ Sets up the build and install targets for this assembly.
+ May only be called once.
+ NOTE: Whatever the current directly is when this is called is the directory
+ used for the builder command associated with this assembly.
+ """
+ # Setup the environment for the build
+ self.env.Append(CPPPATH = self.includes,
+ LIBPATH = self.libpaths,
+ LIBS = self.libs)
+
+ # Now actually do the build
+ self._buildImpl()
+ self.built = True;
+
+
+class Library(_CodeAssembly):
+ """
+ This "abstract" class provides common functionality for StaticLibrary and
+ SharedLibrary. You don't want to instantiate this class directly. It is
+ meant to be private.
+ """
+
+ def __init__(self, libname, pkg, baseEnv, builderNames, installPrefix):
+ """
+ Creates a new library builder for a library of the given name.
+ pkg - The package we are a part of
+ baseEnv - The base environemnt to use
+ builderNames - The names of the builders to use for building the libary: ex. 'SharedLibrary'
+ installPrefix - Prefix (relative to the standard install path) to install this library
+ """
+ _CodeAssembly.__init__(self, libname, pkg, baseEnv, installPrefix)
+
+ if type(builderNames) is types.StringType:
+ self.builder_names = [ builderNames ]
+ else:
+ self.builder_names = builderNames
+
+ def _buildImpl(self):
+ """
+ Sets up the build dependencies and the install.
+ """
+
+ fb = self.package.createFileBundle()
+
+ # Setup build and install for each built library
+ # Use get_abspath() with fileNode so we get the path into the build_dir and not src dir
+ # Only build libraries if we have sources
+ if len(self.sources) > 0:
+ for lib_builder in self.builder_names:
+ lib_filepath = self.fileNode.get_abspath()
+ lib = self.env.__dict__[lib_builder](lib_filepath, self.sources)
+
+ # Lib to file bundle
+ fb.addFiles(lib, self.installPrefix, False)
+
+ # Install the headers in the source list
+ for h in self.headers:
+ headerNode = h.getFileNode()
+ fb.addFiles(headerNode, pj('include', h.getPrefix()) )
+
+
+class SharedLibrary(Library):
+ """ Sets up Library assembly with 'SharedLibrary' builder."""
+ def __init__(self, libname, pkg, baseEnv = None, installPrefix='lib'):
+ Library.__init__(self, libname, pkg, baseEnv, 'SharedLibrary', installPrefix)
+
+class StaticLibrary(Library):
+ """ Sets up Library assembly with 'StaticLibrary' builder """
+ def __init__(self, libname, pkg, baseEnv = None, installPrefix='lib'):
+ Library.__init__(self, libname, pkg, baseEnv, 'StaticLibrary', installPrefix)
+
+class StaticAndSharedLibrary(Library):
+ """ Sets up Library assembly with both 'StaticLibrary' and 'SharedLibrary' builders. """
+ def __init__(self, libname, pkg, baseEnv = None, installPrefix='lib'):
+ Library.__init__(self, libname, pkg, baseEnv, ['StaticLibrary', 'SharedLibrary'], installPrefix)
+
+
+class Program(_CodeAssembly):
+ """
+ This object knows how to build (and install) an executable program from a
+ given set of sources.
+ """
+ def __init__(self, progname, pkg, baseEnv = None, installPrefix='bin'):
+ """
+ Creates a new program builder for a program of the given name.
+ """
+ _CodeAssembly.__init__(self, progname, pkg, baseEnv, installPrefix)
+
+ def _buildImpl(self):
+ """
+ Sets up the build dependencies and the install.
+ """
+ # Build rule
+ prog = self.env.Program(self.fileNode, source = self.sources)
+
+ # Add executable to file bundle
+ fb = self.package.createFileBundle()
+ fb.addFiles(prog, self.installPrefix, False)
+
+ # Install the binary
+ #inst_prefix = self.package.prefix
+ #if self.installPrefix:
+ # inst_prefix = pj(inst_prefix, self.installPrefix)
+ #self.env.Install(inst_prefix, prog)
+
+
+class Package:
+ """
+ A package defines a collection of distributables including programs and
+ libraries. The Package class provides the ability to build, install, and
+ package up distributions of your project.
+
+ A package object provides an interface to add libraries, programs, headers,
+ and support files to a single unit that can be installed. It also shares
+ an environment across all these different units to build.
+
+ The package contains assemblies (objects that encapsulate things to build)
+ and a FileBundle (which holds all the files that could be installed or handled).
+
+ When assemblies are built, they should add any installable files to the package file bundle.
+ """
+
+ def __init__(self, name, version, prefix='/usr/local', baseEnv = None, description= None):
+ """
+ Creates a new package with the given name and version, where version is in
+ the form of <major>.<minor>.<patch> (e.g 1.12.0)
+ """
+ self.name = name
+ self.prefix = prefix
+ self.assemblies = []
+ self.fileBundles = [FileBundle(),] # File bundle for all files
+ self.extra_dist = []
+ self.description = description
+ self.packagers = []
+ self.distDir = "dist" # Path to the dist directory to use
+
+ if not self.description:
+ self.description = self.name + " Package"
+
+ if baseEnv:
+ self.env = baseEnv.Copy()
+ else:
+ self.env = Environment()
+
+ if type(version) is types.TupleType:
+ (self.version_major, self.version_minor, self.version_patch) = version;
+ else:
+ re_matches = re.match(r'^(\d+)\.(\d+)\.(\d+)$', version)
+ self.version_major = int(re_matches.group(1))
+ self.version_minor = int(re_matches.group(2))
+ self.version_patch = int(re_matches.group(3))
+
+ def getName(self):
+ return self.name
+
+ def getVersionMajor(self):
+ return self.version_major
+
+ def getVersionMinor(self):
+ return self.version_minor
+
+ def getVersionPatch(self):
+ return self.version_patch
+
+ def getFullVersion(self):
+ return ".".join( (str(self.version_major), str(self.version_minor), str(self.version_patch)) )
+
+ def getAssemblies(self):
+ return self.assemblies
+
+ def getExtraDist(self):
+ return self.extra_dist
+
+ def getFileBundles(self):
+ return self.fileBundles
+
+ def getEnv(self):
+ " Get the common pakcage environment. "
+ return self.env
+
+ def setDistDir(self, path):
+ " Set the prefix for distribution/packaged files. "
+ self.distDir = path
+
+ def getDistDir(self):
+ return self.distDir
+
+ def addPackager(self, packager):
+ " Add a new packager. Sets the packager to point to this package. "
+ packager.setPackage(self)
+ self.packagers.append(packager)
+
+ # ###### Assembly factory methods ####### #
+ def createSharedLibrary(self, name, baseEnv = None, installPrefix='lib'):
+ """
+ Creates a new shared library of the given name as a part of this package.
+ The library will be built within the given environment.
+ """
+ if not baseEnv:
+ baseEnv = self.env
+ lib = SharedLibrary(name, self, baseEnv, installPrefix)
+ self.assemblies.append(lib)
+ return lib
+
+ def createStaticLibrary(self, name, baseEnv = None, installPrefix='lib'):
+ """
+ Creates a new static library of the given name as a part of this package.
+ The library will be built within the given environment.
+ """
+ if not baseEnv:
+ baseEnv = self.env
+ lib = StaticLibrary(name, self, baseEnv, installPrefix)
+ self.assemblies.append(lib)
+ return lib
+
+ def createStaticAndSharedLibrary(self, name, baseEnv = None, installPrefix='lib'):
+ """
+ Creates new static and shared library of the given name as a part of this package.
+ The library will be built within the given environment.
+ """
+ if not baseEnv:
+ baseEnv = self.env
+ lib = StaticAndSharedLibrary(name, self, baseEnv, installPrefix)
+ self.assemblies.append(lib)
+ return lib
+
+ def createProgram(self, name, baseEnv = None, installPrefix='bin'):
+ """
+ Creates a new executable program of the given name as a part of this
+ package. The program will be built within the given environment.
+ """
+ if not baseEnv:
+ baseEnv = self.env
+ prog = Program(name, self, baseEnv, installPrefix)
+ self.assemblies.append(prog)
+ return prog
+
+ def createFileBundleAssembly(self, prefix, baseEnv = None):
+ """ Creates a new FileBundle object as part of this package. """
+ bundle = FileBundleAssembly(pkg = self, baseEnv = baseEnv, prefix=prefix)
+ self.assemblies.append(bundle)
+ return bundle
+
+ def createFileBundle(self, bundlePrefix=""):
+ """ Creates a new file bundle to use with this package. """
+ fb = FileBundle(bundlePrefix)
+ self.fileBundles.append(fb)
+ return fb
+
+ def createConfigAction(self, target, source, env):
+ """ Called as action of config script builder """
+ global config_script_contents
+
+ new_contents = config_script_contents
+ value_dict = source[0].value # Get dictionary from the value node
+
+ all_lib_names = [os.path.basename(l.getAbsFilePath()) for l in self.assemblies if isinstance(l,Library)]
+ lib_names = []
+ for l in all_lib_names:
+ if not lib_names.count(l):
+ lib_names.append(l)
+ inc_paths = [pj(self.prefix,'include'),]
+ cflags = " ".join(["-I"+p for p in inc_paths])
+ if value_dict["extraCflags"] != None:
+ cflags = cflags + " " + value_dict["extraCflags"]
+ lib_paths = [pj(self.prefix,'lib'),]
+ if value_dict["extraIncPaths"] != None:
+ cflags = cflags + " ".join([" -I"+l for l in value_dict["extraIncPaths"]])
+
+ # Extend varDict with local settings
+ varDict = {}
+ if value_dict["varDict"] != None:
+ varDict = value_dict["varDict"]
+
+ varDict["Libs"] = " ".join(["-L"+l for l in lib_paths])
+ if value_dict["extraLibPath"] != None:
+ varDict["Libs"] += " " + " ".join(["-L"+l for l in value_dict["extraLibPath"]])
+ if len(lib_names):
+ varDict["Libs"] += " " + " ".join(["-l"+l for l in lib_names])
+ if value_dict["extraLibs"]!=None:
+ varDict["Libs"] = varDict["Libs"] + " " + " ".join(["-l"+l for l in value_dict["extraLibs"]])
+ varDict["Cflags"] = cflags
+ varDict["Version"] = self.getFullVersion()
+ varDict["Name"] = self.name
+ varDict["Description"] = self.description
+ varDict["Prefix"] = self.prefix
+
+ # Create the new content
+ txt = "# config script generated for %s at %s\n" % (self.name, time.asctime())
+ txt = txt + '# values: %s\n'%(source[0].get_contents(),)
+
+ for k,v in value_dict["varDict"].items():
+ if SCons.Util.is_String(v):
+ txt = txt + 'vars["%s"] = "%s"\n' % (k,v)
+ else:
+ txt = txt + 'vars["%s"] = %s\n' % (k,v)
+
+ # Find and replace the replacable content
+ cut_re = re.compile(r'(?<=# -- BEGIN CUT --\n).*?(?=# -- END CUT --)', re.DOTALL)
+ new_contents = cut_re.sub(txt,config_script_contents)
+
+ # Create and write out the new file (setting it executable)
+ fname = str(target[0])
+ f = open(str(target[0]), 'w')
+ f.write(new_contents)
+ f.close()
+ os.chmod(fname, stat.S_IREAD|stat.S_IEXEC|stat.S_IWUSR) # Set the file options
+
+ return 0 # Successful build
+
+ def createConfigScript(self, name, installDir='bin', varDict = None,
+ extraIncPaths=None, extraLibs=None, extraLibPaths=None, extraCflags=None):
+ """ Adds a config script to the given package installation.
+ varDict - Dictionary of extra variables to define.
+ """
+
+ if not self.env['BUILDERS'].has_key("PackageConfigScript"):
+ cfg_builder = Builder(action = Action(self.createConfigAction,
+ lambda t,s,e: "Create config script for %s package: %s"%(self.name, t[0])) )
+ self.env.Append(BUILDERS = {"PackageConfigScript" : cfg_builder})
+
+ value_dict = {}
+ value_dict["prefix"] = self.prefix
+ value_dict["extraIncPaths"] = extraIncPaths
+ value_dict["extraLibs"] = extraLibs
+ value_dict["extraLibPath"] = extraLibPaths
+ value_dict["extraCflags"] = extraCflags
+
+ value_dict["varDict"] = varDict
+ self.env.PackageConfigScript(target = pj(installDir, name), source = Value(value_dict))
+
+ # May need to delay doing this until a later build stage so that all libs, headers, etc are
+ # setup and ready to go in this package.
+
+
+ def addExtraDist(self, files, exclude=[]):
+ """
+ Adds in the given files to the distribution of this package. If a
+ directory is encountered in the file list, it is recursively added. Files
+ whose names are in the exclude list are not added to the list.
+ """
+ for file in files:
+ assert isinstance(file, str), "file was not of correct type."
+ # Make sure to skip files in the exclude list
+ if not file in exclude:
+ # If the file is a directory, recurse on it
+ if os.path.isdir(str(file)):
+ self.addExtraDist(os.listdir(str(file)), exclude)
+ # If the file is not a directory, add in the extra dist list
+ else:
+ self.extra_dist.append(file)
+
+
+ def build(self, install = True):
+ """
+ Sets up the build and install for this package. This will build all
+ assemblies contained therein that have not already been built and set
+ up the standard filebundle install.
+ """
+ for assembly in self.assemblies:
+ if not assembly.isBuilt():
+ assembly.build()
+
+ # Build the file bundles for this package
+ if install:
+ for fb in self.fileBundles:
+ fb.buildInstall(self.env, self.prefix)
+ #self.env.Alias('install', self.prefix)
+
+ # Setup all packagers
+ for p in self.packagers:
+ p.build()
+
+
+# ############################################# #
+# PACKAGERS
+# ############################################# #
+
+class Packager:
+ """ Base class for all packagers in the system.
+ A packager is responsible for packaging a package into a distributable form (rpm, etc).
+ The packager is attached to the package and then it is the package's responsibility
+ to add the...
[truncated message content] |
|
From: <pat...@us...> - 2007-07-07 01:22:31
|
Revision: 616
http://svn.sourceforge.net/xml-cppdom/?rev=616&view=rev
Author: patrickh
Date: 2007-07-06 18:22:34 -0700 (Fri, 06 Jul 2007)
Log Message:
-----------
Tag CppDOM 0.7.9.
Added Paths:
-----------
tags/0.7.9/
Copied: tags/0.7.9 (from rev 615, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2007-07-07 01:18:16
|
Revision: 615
http://svn.sourceforge.net/xml-cppdom/?rev=615&view=rev
Author: patrickh
Date: 2007-07-06 18:18:19 -0700 (Fri, 06 Jul 2007)
Log Message:
-----------
Roll the version to 0.7.9.
Modified Paths:
--------------
trunk/ChangeLog
trunk/cppdom/version.h
trunk/cppdom.spec
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-07-07 01:08:34 UTC (rev 614)
+++ trunk/ChangeLog 2007-07-07 01:18:19 UTC (rev 615)
@@ -1,5 +1,7 @@
DATE AUTHOR CHANGE
---------- ----------- -------------------------------------------------------
+2007-07-06 patrickh Fixed build issues on Mac OS X.
+ VERSION: 0.7.9
2007-06-26 patrickh Made many build fixes and improvements on Windows.
VERSION: 0.7.8
2006-11-07 patrickh Do not put headers into a versioned directory on
Modified: trunk/cppdom/version.h
===================================================================
--- trunk/cppdom/version.h 2007-07-07 01:08:34 UTC (rev 614)
+++ trunk/cppdom/version.h 2007-07-07 01:18:19 UTC (rev 615)
@@ -55,7 +55,7 @@
// The major/minor/patch version (up to 3 digits each).
#define CPPDOM_VERSION_MAJOR 0
#define CPPDOM_VERSION_MINOR 7
-#define CPPDOM_VERSION_PATCH 8
+#define CPPDOM_VERSION_PATCH 9
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
Modified: trunk/cppdom.spec
===================================================================
--- trunk/cppdom.spec 2007-07-07 01:08:34 UTC (rev 614)
+++ trunk/cppdom.spec 2007-07-07 01:18:19 UTC (rev 615)
@@ -1,7 +1,7 @@
# Spec file for cppdom.
%define name cppdom
-%define version 0.7.8
-%define release 2
+%define version 0.7.9
+%define release 1
Name: %{name}
Summary: A C++ based XML loader and writer with an internal DOM representation.
@@ -127,6 +127,9 @@
%doc %{_docdir}/cppdom-%{version}/html
%changelog
+* Fri Jul 06 2007 Patrick Hartling <pa...@in...> 0.7.9-1
+- Updated to version 0.7.9.
+
* Wed Jun 27 2007 Patrick Hartling <pa...@in...> 0.7.8-2
- Removed cppdom-config from the cppdom-devel package.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2007-07-07 01:08:31
|
Revision: 614
http://svn.sourceforge.net/xml-cppdom/?rev=614&view=rev
Author: patrickh
Date: 2007-07-06 18:08:34 -0700 (Fri, 06 Jul 2007)
Log Message:
-----------
Since we're passing platform-specific linker flags on Mac OS X, we might
as well pass in some version information, too.
Modified Paths:
--------------
trunk/cppdom/SConscript
Modified: trunk/cppdom/SConscript
===================================================================
--- trunk/cppdom/SConscript 2007-07-07 00:58:57 UTC (rev 613)
+++ trunk/cppdom/SConscript 2007-07-07 01:08:34 UTC (rev 614)
@@ -47,7 +47,10 @@
cppdom_shared_lib_env.AppendUnique(CPPDEFINES = ["CPPDOM_EXPORTS"])
if GetPlatform() == 'darwin':
cppdom_shared_lib_env.Append(
- LINKFLAGS = ['-install_name', 'lib%s.dylib' % cppdom_shared_libname]
+ LINKFLAGS = ['-install_name', 'lib%s.dylib' % cppdom_shared_libname,
+ '-Wl,-compatibility_version,%i.%i' % \
+ (CPPDOM_VERSION[0], CPPDOM_VERSION[1]),
+ '-Wl,-current_version,%i.%i.%i' % CPPDOM_VERSION]
)
cppdom_lib = cppdom_shared_lib_env.SharedLibrary(cppdom_shared_libname, sources,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2007-07-07 00:58:57
|
Revision: 613
http://svn.sourceforge.net/xml-cppdom/?rev=613&view=rev
Author: patrickh
Date: 2007-07-06 17:58:57 -0700 (Fri, 06 Jul 2007)
Log Message:
-----------
Generate a usable shared library on Mac OS X. For some reason, the install
name for the shared library was junk.
Modified Paths:
--------------
trunk/cppdom/SConscript
Modified: trunk/cppdom/SConscript
===================================================================
--- trunk/cppdom/SConscript 2007-06-28 22:05:08 UTC (rev 612)
+++ trunk/cppdom/SConscript 2007-07-07 00:58:57 UTC (rev 613)
@@ -45,6 +45,11 @@
'mt.exe -manifest ${TARGET}.manifest -outputresource:$TARGET;2']
cppdom_shared_lib_env = cppdom_lib_env.Copy()
cppdom_shared_lib_env.AppendUnique(CPPDEFINES = ["CPPDOM_EXPORTS"])
+ if GetPlatform() == 'darwin':
+ cppdom_shared_lib_env.Append(
+ LINKFLAGS = ['-install_name', 'lib%s.dylib' % cppdom_shared_libname]
+ )
+
cppdom_lib = cppdom_shared_lib_env.SharedLibrary(cppdom_shared_libname, sources,
SHLINKCOM = shlinkcom)
cppdom_shared_lib_env.Install(inst_paths['lib'], cppdom_lib)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2007-06-28 22:05:07
|
Revision: 612
http://svn.sourceforge.net/xml-cppdom/?rev=612&view=rev
Author: patrickh
Date: 2007-06-28 15:05:08 -0700 (Thu, 28 Jun 2007)
Log Message:
-----------
Updated the instructions for building on Mac OS X.
Modified Paths:
--------------
trunk/README
Modified: trunk/README
===================================================================
--- trunk/README 2007-06-28 22:04:45 UTC (rev 611)
+++ trunk/README 2007-06-28 22:05:08 UTC (rev 612)
@@ -30,16 +30,25 @@
type 'scons install' to install on the system
type 'scons install prefix=$HOME/software' to install in your account
+Mac OS X
+========
+
+On Mac OS X, the build may auto-detect that it can build multiple
+architectures (not necessarily universal binaries), but this case is not
+currently handled well. SCons will complain that there are multiple ways to
+build the same target and exit with an error. To work around this, specify
+the desired architecture explicitly (pass var_arch=ppc, var_arch=ia32, or
+var_arch=ppc64 on the scons command line) or build a universal binary (see
+below).
+
Universal Binaries
==================
To build the CppDOM libraries as univeral binaries (Mac OS X only), use the
following command:
- scons darwin_universal=yes var_arch=universal var_type=optimized
+ scons darwin_universal=yes var_arch=universal var_type=optimized \
+ darwin_sdk=/Developer/SDKs/MacOSX10.4u.sdk
-This will default to using the Mac OS X 10.4 universal SDK in
-/Developer/SDKs/MacOSX10.4.u.sdk. To override this, add the following
-option to the above command line:
-
- darwin_sdk=/path/to/platform/sdk
+An alternate platform SDK can be used by using the appropriate value with
+the darwin_sdk command line arcument.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2007-06-28 22:04:49
|
Revision: 611
http://svn.sourceforge.net/xml-cppdom/?rev=611&view=rev
Author: patrickh
Date: 2007-06-28 15:04:45 -0700 (Thu, 28 Jun 2007)
Log Message:
-----------
Recognize more CPU architecures when naming the .fpc file.
Modified Paths:
--------------
trunk/SConstruct
Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct 2007-06-28 20:16:14 UTC (rev 610)
+++ trunk/SConstruct 2007-06-28 22:04:45 UTC (rev 611)
@@ -167,7 +167,7 @@
sub_dirs = ['cppdom']
if common_env['build_test'] == 'yes':
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)
@@ -212,6 +212,12 @@
arch = "i386"
elif "x64" == combo["arch"]:
arch = "x86_64"
+ elif "ppc" == combo["arch"]:
+ arch = "ppc"
+ elif "ppc" == combo["arch"]:
+ arch = "ppc64"
+ elif "universal" == combo["arch"]:
+ arch = "universal"
cppdom_cxxflags = ''
cppdom_libs = "-l%s" % cppdom_shared_libname
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
