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...> - 2006-11-07 22:34:25
|
Revision: 560
http://svn.sourceforge.net/xml-cppdom/?rev=560&view=rev
Author: patrickh
Date: 2006-11-07 14:34:22 -0800 (Tue, 07 Nov 2006)
Log Message:
-----------
Added a hack to make the MSVS_VERSION command line option work. SCons 0.96.93
is supposed to have some sort of fix to allow MSVS_VERSION to be set after
the creation of the construction environment, but I cannot figure out how to
make that work.
Modified Paths:
--------------
trunk/SConstruct
Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct 2006-11-07 22:09:58 UTC (rev 559)
+++ trunk/SConstruct 2006-11-07 22:34:22 UTC (rev 560)
@@ -58,7 +58,11 @@
option_filename = "config.cache." + platform
if GetPlatform() == "win32":
- common_env = Environment()
+ if ARGUMENTS.has_key("MSVS_VERSION"):
+ common_env = Environment(MSVS_VERSION = ARGUMENTS["MSVS_VERSION"])
+ common_env['WINDOWS_INSERT_MANIFEST'] = True
+ else:
+ common_env = Environment()
else:
common_env = Environment(ENV = os.environ)
SConsAddons.Builders.registerSubstBuilder(common_env)
@@ -87,9 +91,9 @@
opts.Add('build_test', 'Build the test programs', 'yes')
opts.Add(sca_opts.BoolOption('versioning',
'If no then build only libraries and headers without versioning', True))
-if common_env.has_key("MSVS"):
- opts.Add('MSVS_VERSION', 'Set to specific version of MSVS to use. %s'%str(common_env['MSVS']['VERSIONS']),
- common_env['MSVS']['VERSION'])
+#if common_env.has_key("MSVS"):
+# opts.Add('MSVS_VERSION', 'Set to specific version of MSVS to use. %s'%str(common_env['MSVS']['VERSIONS']),
+# common_env['MSVS']['VERSION'])
opts.Process(common_env)
@@ -156,7 +160,7 @@
print "types: ", variant_helper.variants["type"]
print "libtypes: ", variant_helper.variants["libtype"]
print "archs: ", variant_helper.variants["arch"]
-
+
sub_dirs = ['cppdom']
if common_env['build_test'] == 'yes':
sub_dirs.append('test')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2006-11-07 22:10:04
|
Revision: 559
http://svn.sourceforge.net/xml-cppdom/?rev=559&view=rev
Author: patrickh
Date: 2006-11-07 14:09:58 -0800 (Tue, 07 Nov 2006)
Log Message:
-----------
Do not put the CppDOM headers into a verioned directory when installing on
Windows. This was discussed several weeks ago on xml-cppdom-devel@.
Modified Paths:
--------------
trunk/ChangeLog
trunk/SConstruct
trunk/cppdom/version.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-09-20 16:40:55 UTC (rev 558)
+++ trunk/ChangeLog 2006-11-07 22:09:58 UTC (rev 559)
@@ -1,5 +1,8 @@
DATE AUTHOR CHANGE
---------- ----------- -------------------------------------------------------
+2006-11-07 patrickh Do not put headers into a versioned directory on
+ Windows.
+ VERSION: 0.7.7
2006-07-13 patrickh Implemented automatic linking on Windows.
VERSION: 0.7.6
2006-07-13 patrickh Moved the declaration of cppdom::getVersion() to
Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct 2006-09-20 16:40:55 UTC (rev 558)
+++ trunk/SConstruct 2006-11-07 22:09:58 UTC (rev 559)
@@ -138,13 +138,19 @@
base_inst_paths['lib'] = pj(base_inst_paths['base'], 'lib')
base_inst_paths['flagpoll'] = pj(base_inst_paths['lib'], 'flagpoll')
base_inst_paths['bin'] = pj(base_inst_paths['base'], 'bin')
- if common_env['versioning'] == True:
+ include_dir = pj(base_inst_paths['base'], 'include')
+
+ if common_env['versioning']:
version_suffix = "-%s_%s_%s" % CPPDOM_VERSION
- base_inst_paths['include'] = pj(base_inst_paths['base'], 'include',
- "cppdom-%s.%s.%s" % CPPDOM_VERSION)
+
+ # We do not use a versioned header directory on Windows.
+ if not sys.platform.startswith('win'):
+ include_dir = pj(base_inst_paths['base'], 'include',
+ "cppdom-%s.%s.%s" % CPPDOM_VERSION)
else:
version_suffix = ''
- base_inst_paths['include'] = pj(base_inst_paths['base'], 'include')
+
+ base_inst_paths['include'] = include_dir
print "using prefix: ", base_inst_paths['base']
print "types: ", variant_helper.variants["type"]
Modified: trunk/cppdom/version.h
===================================================================
--- trunk/cppdom/version.h 2006-09-20 16:40:55 UTC (rev 558)
+++ trunk/cppdom/version.h 2006-11-07 22:09:58 UTC (rev 559)
@@ -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 6
+#define CPPDOM_VERSION_PATCH 7
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2006-09-20 16:41:00
|
Revision: 558
http://svn.sourceforge.net/xml-cppdom/?rev=558&view=rev
Author: patrickh
Date: 2006-09-20 09:40:55 -0700 (Wed, 20 Sep 2006)
Log Message:
-----------
Put the .fpc file in the flagpoll directory rather than the pkg-config
directory. I am committing this on Dan's behalf because he is getting
403 forbidden errors for some reason.
Modified Paths:
--------------
trunk/SConstruct
Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct 2006-08-16 15:16:08 UTC (rev 557)
+++ trunk/SConstruct 2006-09-20 16:40:55 UTC (rev 558)
@@ -136,7 +136,7 @@
base_inst_paths = {}
base_inst_paths['base'] = os.path.abspath(common_env['prefix'])
base_inst_paths['lib'] = pj(base_inst_paths['base'], 'lib')
- base_inst_paths['pkgconfig'] = pj(base_inst_paths['lib'], 'pkgconfig')
+ base_inst_paths['flagpoll'] = pj(base_inst_paths['lib'], 'flagpoll')
base_inst_paths['bin'] = pj(base_inst_paths['base'], 'bin')
if common_env['versioning'] == True:
version_suffix = "-%s_%s_%s" % CPPDOM_VERSION
@@ -185,7 +185,7 @@
SConscript(pj(d,'SConscript'), build_dir=pj(full_build_dir, d), duplicate=0)
# Build up the provides vars for the .fpc files
- inst_paths['pkgconfig'] = pj(inst_paths['lib'],'pkgconfig')
+ inst_paths['flagpoll'] = pj(inst_paths['lib'],'flagpoll')
provides = "cppdom"
# XXX: provides data
#if combo["type"] != "optimized":
@@ -220,7 +220,7 @@
if combo["type"] != "optimized":
name_parts.append(combo["type"])
pc_filename = "-".join(name_parts) + ".fpc"
- cppdom_pc = build_env.SubstBuilder(pj(inst_paths['pkgconfig'],pc_filename),
+ cppdom_pc = build_env.SubstBuilder(pj(inst_paths['flagpoll'],pc_filename),
'cppdom.fpc.in', submap=submap)
build_env.AddPostAction (cppdom_pc, Chmod('$TARGET', 0644))
build_env.Depends(cppdom_pc, 'cppdom/version.h')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2006-08-16 16:35:45
|
Revision: 557 Author: allenb Date: 2006-08-16 08:16:08 -0700 (Wed, 16 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=557&view=rev Log Message: ----------- Remove old -config .in file. Removed Paths: ------------- trunk/cppdom-config.in Deleted: trunk/cppdom-config.in =================================================================== --- trunk/cppdom-config.in 2006-08-12 22:04:30 UTC (rev 556) +++ trunk/cppdom-config.in 2006-08-16 15:16:08 UTC (rev 557) @@ -1,136 +0,0 @@ -#!/bin/sh - -cppdom_extra_cxxflags="@cppdom_extra_cxxflags@" -cppdom_extra_include_dirs="@cppdom_extra_include_dirs@" - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -prefix_set='no' -exec_prefix_set='no' -print_all='no' -use_linker='no' - -usage() -{ - if test "x$2" != "x" ; then - echo "Unrecognized option '$2'" - fi - - cat <<EOF -Usage: cppdom-config [OPTIONS] -Options: - [--basedir] Use \$CPPDOM_BASE_DIR when printing paths - [--prefix[=DIR]] Print the installation prefix or set an - alternate prefix to use when printing paths - [--exec-prefix[=DIR]] Print the executable prefix or set an - alternate executable prefix to use when - printing paths - [--version] Print the installed CppDom's version number - [--cxxflags] Print the CppDom-specific flags for the C++ - compiler - [--libs] Print the CppDom-specific libraries - [--all] Print all the flags used for compiling or - linking (depending on other options) -EOF - - exit $1 -} - -if test $# -eq 0; then - usage 1 1>&2 -fi - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --help) - usage 0 1>&2 - ;; - --all) - print_all='yes' - ;; - --basedir) - use_base_dir=yes - ;; - --prefix=*) - prefix=$optarg - prefix_set='yes' - - if test $exec_prefix_set = no ; then - exec_prefix=$optarg - fi - ;; - --prefix) - echo_prefix=yes - ;; - --exec-prefix=*) - exec_prefix=$optarg - exec_prefix_set=yes - ;; - --exec-prefix) - echo_exec_prefix=yes - ;; - --version) - echo @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ - ;; - --cxxflags) - echo_cxxflags=yes - ;; - --libs) - echo_libs=yes - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - -# If we are using $CPPDOM_BASE_DIR, overwrite $prefix and $exec_prefix unless -# they were set explicitly on the command line. -if test "$use_base_dir" = "yes" ; then - if test "$prefix_set" = "no" ; then - prefix="$CPPDOM_BASE_DIR" - fi - - if test "$exec_prefix_set" = "no" ; then - exec_prefix="$CPPDOM_BASE_DIR" - fi -fi - -if test "$echo_prefix" = "yes"; then - echo $prefix -fi - -if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix -fi - -if test "$echo_cxxflags" = "yes"; then - if [ "x$cppdom_extra_include_dirs" != "x" ]; then - for dir in $cppdom_extra_include_dirs ; do - cppdom_extra_includes="$cppdom_extra_includes -I@includedir@/$dir" - cppdom_basedir_extra_includes="$cppdom_basedir_extra_includes -I$CPPDOM_BASE_DIR/include/$dir" - done - fi - - if test "$use_base_dir" = "yes"; then - echo @cppdom_cxxflags@ $cppdom_extra_cxxflags -I$CPPDOM_BASE_DIR/include $cppdom_basedir_extra_includes - else - echo @cppdom_cxxflags@ $cppdom_extra_cxxflags -I@includedir@ $cppdom_extra_includes - fi -fi - -if test "x$echo_libs" = "xyes"; then - if test "x$use_base_dir" = "xyes"; then - echo -L$CPPDOM_BASE_DIR/@lib_subdir@ @cppdom_libs@ - else - echo -L@libdir@ @cppdom_libs@ - fi -fi - -exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <al...@us...> - 2006-08-12 22:04:35
|
Revision: 556 Author: allenb Date: 2006-08-12 15:04:30 -0700 (Sat, 12 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=556&view=rev Log Message: ----------- Add --basedir param. Modified Paths: -------------- trunk/cppdom-config Modified: trunk/cppdom-config =================================================================== --- trunk/cppdom-config 2006-08-08 12:42:11 UTC (rev 555) +++ trunk/cppdom-config 2006-08-12 22:04:30 UTC (rev 556) @@ -10,6 +10,7 @@ parser.add_option("--cxxflags",action="store_true",help="Pring the CppDom-specific flags for the C++ compiler.") parser.add_option("--libs",action="store_true",help="Pring the CppDom specific libraries.") parser.add_option("--all",action="store_true",help="Print all the flags used for compiling or linking.") +parser.add_option("--basedir",action="store_true",help="For compatibility. (disabled in this wrapper)") (options, pos_args) = parser.parse_args() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <al...@us...> - 2006-08-08 12:42:13
|
Revision: 555 Author: allenb Date: 2006-08-08 05:42:11 -0700 (Tue, 08 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=555&view=rev Log Message: ----------- Install cppdom-config. Modified Paths: -------------- trunk/SConstruct Modified: trunk/SConstruct =================================================================== --- trunk/SConstruct 2006-08-08 01:51:09 UTC (rev 554) +++ trunk/SConstruct 2006-08-08 12:42:11 UTC (rev 555) @@ -234,6 +234,7 @@ # env.Depends(cppdom_config, 'cppdom/version.h') + common_env.Install(inst_paths['bin'],'cppdom-config') common_env.Alias('install', inst_paths['base']) # Close up with aliases and defaults This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <al...@us...> - 2006-08-08 01:51:11
|
Revision: 554 Author: allenb Date: 2006-08-07 18:51:09 -0700 (Mon, 07 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=554&view=rev Log Message: ----------- - Update version and prefix usage and spec. Modified Paths: -------------- trunk/cppdom.fpc.in Modified: trunk/cppdom.fpc.in =================================================================== --- trunk/cppdom.fpc.in 2006-08-08 01:50:52 UTC (rev 553) +++ trunk/cppdom.fpc.in 2006-08-08 01:51:09 UTC (rev 554) @@ -1,19 +1,16 @@ -prefix=@prefix@ exec_prefix=@exec_prefix@ cxxflags=@cppdom_cxxflags@ includedir=@includedir@ libs=@cppdom_libs@ libdir=@libdir@ -version_major=@VERSION_MAJOR@ -version_minor=@VERSION_MINOR@ -version_patch=@VERSION_PATCH@ Name: XML CppDom Provides: @provides@ -Version: ${version_major}.${version_minor}.${version_patch} +Version: @version@ 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} Arch: @arch@ +prefix: @prefix@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <al...@us...> - 2006-08-08 01:50:54
|
Revision: 553 Author: allenb Date: 2006-08-07 18:50:52 -0700 (Mon, 07 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=553&view=rev Log Message: ----------- Remove the provides type for now from fpc file. This still needs to be fixed up but I don't know how to do it well when only debug or optimized is in path. Modified Paths: -------------- trunk/SConstruct Modified: trunk/SConstruct =================================================================== --- trunk/SConstruct 2006-08-08 01:50:13 UTC (rev 552) +++ trunk/SConstruct 2006-08-08 01:50:52 UTC (rev 553) @@ -187,8 +187,9 @@ # Build up the provides vars for the .fpc files inst_paths['pkgconfig'] = pj(inst_paths['lib'],'pkgconfig') provides = "cppdom" - if combo["type"] != "optimized": - provides += "_%s"%combo["type"] + # XXX: provides data + #if combo["type"] != "optimized": + # provides += "_%s"%combo["type"] arch = "noarch" if "ia32" == combo["arch"]: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <al...@us...> - 2006-08-08 01:50:15
|
Revision: 552 Author: allenb Date: 2006-08-07 18:50:13 -0700 (Mon, 07 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=552&view=rev Log Message: ----------- Set executable. Property Changed: ---------------- trunk/cppdom-config Property changes on: trunk/cppdom-config ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <al...@us...> - 2006-08-08 01:47:42
|
Revision: 551 Author: allenb Date: 2006-08-07 18:47:36 -0700 (Mon, 07 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=551&view=rev Log Message: ----------- Added new config file. Added Paths: ----------- trunk/cppdom-config Added: trunk/cppdom-config =================================================================== --- trunk/cppdom-config (rev 0) +++ trunk/cppdom-config 2006-08-08 01:47:36 UTC (rev 551) @@ -0,0 +1,40 @@ +#!/usr/bin/env python + +import os, sys +from optparse import OptionParser + +parser = OptionParser(usage="%prog [OPTIONS]", description="Cppdom config option processor.") + +parser.add_option("--prefix",action="store_true",help="Print the installation prefix.") +parser.add_option("--version",action="store_true",help="Print the installed CppDom's version number.") +parser.add_option("--cxxflags",action="store_true",help="Pring the CppDom-specific flags for the C++ compiler.") +parser.add_option("--libs",action="store_true",help="Pring the CppDom specific libraries.") +parser.add_option("--all",action="store_true",help="Print all the flags used for compiling or linking.") + +(options, pos_args) = parser.parse_args() + +if 0 != len(pos_args): + parser.print_help() + +# Build up flags for flagpoll +command_flags = " cppdom --concat" + +if options.prefix: + command_flags += " --get-prefix" +elif options.version: + command_flags += " --modversion" +elif options.cxxflags or options.libs: + if options.cxxflags: + command_flags += " --cflags" + if options.libs: + command_flags += " --libs" + if not options.all: + command_flags += " --no-deps" +else: + parser.print_help() + sys.exit(1) + +command_line = "flagpoll " + command_flags + +#print "Command: ", command_line +os.system(command_line) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pat...@us...> - 2006-08-04 19:27:47
|
Revision: 550 Author: patrickh Date: 2006-08-04 12:27:44 -0700 (Fri, 04 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=550&view=rev Log Message: ----------- Generate a flagpoll .fpc file for querying information about a CppDOM installation. Modified Paths: -------------- branches/0.6/ChangeLog branches/0.6/SConstruct Added Paths: ----------- branches/0.6/cppdom.fpc.in Modified: branches/0.6/ChangeLog =================================================================== --- branches/0.6/ChangeLog 2006-08-04 19:01:41 UTC (rev 549) +++ branches/0.6/ChangeLog 2006-08-04 19:27:44 UTC (rev 550) @@ -1,5 +1,8 @@ DATE AUTHOR CHANGE ---------- ----------- ------------------------------------------------------- +2006-08-04 patrickh Generate a flagpoll .fpc file for querying CppDOM + package information. + [Version 0.6.5 released - 8.4.2006]============================================ 2006-07-14 patrickh Added support for Windows XP x64 Edition. 2006-07-12 patrickh Implemented automatic linking on Windows. Modified: branches/0.6/SConstruct =================================================================== --- branches/0.6/SConstruct 2006-08-04 19:01:41 UTC (rev 549) +++ branches/0.6/SConstruct 2006-08-04 19:27:44 UTC (rev 550) @@ -249,7 +249,8 @@ # Figure out what vesion of CppDom we're using CPPDOM_VERSION = GetCppDomVersion() -print 'Building CppDom Version: %i.%i.%i' % CPPDOM_VERSION +cppdom_version_str = '%i.%i.%i' % CPPDOM_VERSION +print 'Building CppDom Version: %s' % cppdom_version_str # Get command-line arguments optimize = ARGUMENTS.get('optimize', 'no') @@ -378,6 +379,7 @@ inst_paths = {} inst_paths['base'] = os.path.abspath(baseEnv['prefix']) inst_paths['lib'] = pj(inst_paths['base'], baseEnv['libdir']) + inst_paths['pkgconfig'] = pj(inst_paths['lib'], 'pkgconfig') inst_paths['bin'] = pj(inst_paths['base'], 'bin') inst_paths['include'] = pj(inst_paths['base'], 'include') print "using prefix: ", inst_paths['base'] @@ -393,6 +395,15 @@ for d in dirs: SConscript(pj(d,'SConscript'), build_dir=pj(buildDir, d), duplicate=0) + # Build up the provides vars for the .fpc files + provides = "cppdom" + + arch = "noarch" + if "ia32" == cpu_arch: + arch = "i386" + else: + arch = cpu_arch + # Setup tar of source files tar_sources = Split(""" AUTHORS @@ -400,6 +411,8 @@ COPYING README cppdom-config.in + cppdom.fpc.in + cppdom.pc.in SConstruct doc/cppdom.doxy doc/dox/examples_index.dox @@ -414,6 +427,7 @@ # Build up substitution map submap = { + '@provides@' : provides, '@prefix@' : inst_paths['base'], '@exec_prefix@' : '${prefix}', '@cppdom_cxxflags@' : '', @@ -426,13 +440,25 @@ '@VERSION_MAJOR@' : str(CPPDOM_VERSION[0]), '@VERSION_MINOR@' : str(CPPDOM_VERSION[1]), '@VERSION_PATCH@' : str(CPPDOM_VERSION[2]), + '@arch@' : arch, + '@version@' : cppdom_version_str, } # Setup the builder for cppdom-config if GetPlatform() != 'win32': env = baseEnv.Copy(BUILDERS = builders) - cppdom_config = env.ConfigBuilder('cppdom-config', 'cppdom-config.in', submap=submap ) + name_parts = ['cppdom', cppdom_version_str, arch] + pc_filename = "-".join(name_parts) + ".fpc" + cppdom_pc = env.ConfigBuilder(pj(inst_paths['pkgconfig'], pc_filename), + 'cppdom.fpc.in', submap = submap) + + env.AddPostAction(cppdom_pc, Chmod('$TARGET', 0644)) + env.Depends(cppdom_pc, 'cppdom/version.h') + + cppdom_config = env.ConfigBuilder('cppdom-config', 'cppdom-config.in', + submap = submap) + env.Depends('cppdom-config', 'cppdom/version.h') env.Install(inst_paths['bin'], cppdom_config) Copied: branches/0.6/cppdom.fpc.in (from rev 548, trunk/cppdom.fpc.in) =================================================================== --- branches/0.6/cppdom.fpc.in (rev 0) +++ branches/0.6/cppdom.fpc.in 2006-08-04 19:27:44 UTC (rev 550) @@ -0,0 +1,19 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +cxxflags=@cppdom_cxxflags@ +includedir=@includedir@ +libs=@cppdom_libs@ +libdir=@libdir@ +version_major=@VERSION_MAJOR@ +version_minor=@VERSION_MINOR@ +version_patch=@VERSION_PATCH@ + +Name: XML CppDom +Provides: @provides@ +Version: ${version_major}.${version_minor}.${version_patch} +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} +Arch: @arch@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pat...@us...> - 2006-08-04 19:01:45
|
Revision: 549 Author: patrickh Date: 2006-08-04 12:01:41 -0700 (Fri, 04 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=549&view=rev Log Message: ----------- Tag the 0.6.5 release. Added Paths: ----------- tags/0.6.5/ Copied: tags/0.6.5 (from rev 548, branches/0.6) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pat...@us...> - 2006-08-04 14:55:58
|
Revision: 548 Author: patrickh Date: 2006-08-04 07:55:55 -0700 (Fri, 04 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=548&view=rev Log Message: ----------- Changed the 0.6.5 release date to be today. Modified Paths: -------------- branches/0.6/ChangeLog Modified: branches/0.6/ChangeLog =================================================================== --- branches/0.6/ChangeLog 2006-08-04 14:36:29 UTC (rev 547) +++ branches/0.6/ChangeLog 2006-08-04 14:55:55 UTC (rev 548) @@ -1,6 +1,6 @@ DATE AUTHOR CHANGE ---------- ----------- ------------------------------------------------------- -[Version 0.6.5 released - 7.14.2006]=========================================== +[Version 0.6.5 released - 8.4.2006]============================================ 2006-07-14 patrickh Added support for Windows XP x64 Edition. 2006-07-12 patrickh Implemented automatic linking on Windows. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pat...@us...> - 2006-08-04 14:36:37
|
Revision: 547 Author: patrickh Date: 2006-08-04 07:36:29 -0700 (Fri, 04 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=547&view=rev Log Message: ----------- Step 2 in restructuring the tags to match the trunk and the branches. Added Paths: ----------- tags/0.1.0/ tags/0.3.0/ tags/0.3.1/ tags/0.3.2/ tags/0.3.3/ tags/0.6.0/ tags/0.6.1/ tags/0.6.2/ tags/0.6.3/ tags/0.6.4/ tags/version1/ Removed Paths: ------------- tags/0.1.0-off/ tags/0.3.0-off/ tags/0.3.1-off/ tags/0.3.2-off/ tags/0.3.3-off/ tags/0.6.0-off/ tags/0.6.1-off/ tags/0.6.2-off/ tags/0.6.3-off/ tags/0.6.4-off/ tags/version1-off/ Copied: tags/0.1.0 (from rev 546, tags/0.1.0-off/cppdom) Copied: tags/0.3.0 (from rev 546, tags/0.3.0-off/cppdom) Copied: tags/0.3.1 (from rev 546, tags/0.3.1-off/cppdom) Copied: tags/0.3.2 (from rev 546, tags/0.3.2-off/cppdom) Copied: tags/0.3.3 (from rev 546, tags/0.3.3-off/cppdom) Copied: tags/0.6.0 (from rev 546, tags/0.6.0-off/cppdom) Copied: tags/0.6.1 (from rev 546, tags/0.6.1-off/cppdom) Copied: tags/0.6.2 (from rev 546, tags/0.6.2-off/cppdom) Copied: tags/0.6.3 (from rev 546, tags/0.6.3-off/cppdom) Copied: tags/0.6.4 (from rev 546, tags/0.6.4-off/cppdom) Copied: tags/version1 (from rev 546, tags/version1-off/cppdom) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pat...@us...> - 2006-08-04 14:32:20
|
Revision: 546 Author: patrickh Date: 2006-08-04 07:32:12 -0700 (Fri, 04 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=546&view=rev Log Message: ----------- Step 1 in fixing up the structure of the tags to match that of the trunk and the branches. Added Paths: ----------- tags/0.1.0-off/ tags/0.3.0-off/ tags/0.3.1-off/ tags/0.3.2-off/ tags/0.3.3-off/ tags/0.6.0-off/ tags/0.6.1-off/ tags/0.6.2-off/ tags/0.6.3-off/ tags/0.6.4-off/ tags/version1-off/ Removed Paths: ------------- tags/0.1.0/ tags/0.3.0/ tags/0.3.1/ tags/0.3.2/ tags/0.3.3/ tags/0.6.0/ tags/0.6.1/ tags/0.6.2/ tags/0.6.3/ tags/0.6.4/ tags/version1/ Copied: tags/0.1.0-off (from rev 543, tags/0.1.0) Copied: tags/0.3.0-off (from rev 543, tags/0.3.0) Copied: tags/0.3.1-off (from rev 543, tags/0.3.1) Copied: tags/0.3.2-off (from rev 543, tags/0.3.2) Copied: tags/0.3.3-off (from rev 543, tags/0.3.3) Copied: tags/0.6.0-off (from rev 543, tags/0.6.0) Copied: tags/0.6.1-off (from rev 543, tags/0.6.1) Copied: tags/0.6.2-off (from rev 543, tags/0.6.2) Copied: tags/0.6.3-off (from rev 543, tags/0.6.3) Copied: tags/0.6.4-off (from rev 543, tags/0.6.4) Copied: tags/version1-off (from rev 543, tags/version1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pat...@us...> - 2006-08-04 14:30:49
|
Revision: 545 Author: patrickh Date: 2006-08-04 07:30:45 -0700 (Fri, 04 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=545&view=rev Log Message: ----------- Step 2 in fixing up the structure of the branches to match that of the trunk. Added Paths: ----------- branches/0.3/ branches/0.6/ Removed Paths: ------------- branches/0.3-off/ branches/0.6-off/ Copied: branches/0.3 (from rev 544, branches/0.3-off/cppdom) Copied: branches/0.6 (from rev 544, branches/0.6-off/cppdom) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pat...@us...> - 2006-08-04 14:29:52
|
Revision: 544 Author: patrickh Date: 2006-08-04 07:29:48 -0700 (Fri, 04 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=544&view=rev Log Message: ----------- Step 1 in fixing up the structure of the branches to match that of the trunk. Added Paths: ----------- branches/0.3-off/ branches/0.6-off/ Removed Paths: ------------- branches/0.3/ branches/0.6/ Copied: branches/0.3-off (from rev 543, branches/0.3) Copied: branches/0.6-off (from rev 543, branches/0.6) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pat...@us...> - 2006-08-04 14:22:22
|
Revision: 543 Author: patrickh Date: 2006-08-04 07:22:20 -0700 (Fri, 04 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=543&view=rev Log Message: ----------- Another version update related to the 0.6.5 release. Modified Paths: -------------- branches/0.6/cppdom/doc/cppdom.doxy Modified: branches/0.6/cppdom/doc/cppdom.doxy =================================================================== --- branches/0.6/cppdom/doc/cppdom.doxy 2006-08-04 14:19:56 UTC (rev 542) +++ branches/0.6/cppdom/doc/cppdom.doxy 2006-08-04 14:22:20 UTC (rev 543) @@ -23,7 +23,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.1.0 +PROJECT_NUMBER = 0.6.5 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pat...@us...> - 2006-08-04 14:19:58
|
Revision: 542 Author: patrickh Date: 2006-08-04 07:19:56 -0700 (Fri, 04 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=542&view=rev Log Message: ----------- Removed more tags related to Doozer imports. Removed Paths: ------------- tags/v2_cvs-may-7-2002/ tags/v2_cvs-may-7-2002-2/ tags/v2_cvs-may-7-2002-3/ tags/v2_cvs-may-7-2002-4/ tags/v2_cvs-may-7-2002-5/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pat...@us...> - 2006-08-04 14:19:07
|
Revision: 541 Author: patrickh Date: 2006-08-04 07:19:03 -0700 (Fri, 04 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=541&view=rev Log Message: ----------- Get rid of unneeded tags. These were related to imports of Doozer from long, long ago. Removed Paths: ------------- tags/May-07-2002-10/ tags/May-07-2002-11/ tags/May-07-2002-12/ tags/May-07-2002-13/ tags/May-07-2002-14/ tags/May-07-2002-15/ tags/May-07-2002-16/ tags/May-07-2002-17/ tags/May-07-2002-18/ tags/May-07-2002-19/ tags/May-07-2002-20/ tags/May-07-2002-5/ tags/May-07-2002-6/ tags/May-07-2002-7/ tags/May-07-2002-8/ tags/May-07-2002-9/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pat...@us...> - 2006-08-04 14:17:14
|
Revision: 540 Author: patrickh Date: 2006-08-04 07:17:06 -0700 (Fri, 04 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=540&view=rev Log Message: ----------- Simplify release tag names. Added Paths: ----------- tags/0.1.0/ tags/0.3.0/ tags/0.3.1/ tags/0.3.2/ tags/0.3.3/ tags/0.6.0/ tags/0.6.1/ tags/0.6.2/ tags/0.6.3/ tags/0.6.4/ Removed Paths: ------------- tags/rel-0-1-0/ tags/rel-0-3-0/ tags/rel-0-3-1/ tags/rel-0-3-2/ tags/rel-0-3-3/ tags/rel-0-6-0/ tags/rel-0-6-1/ tags/rel-0-6-2/ tags/rel-0-6-3/ tags/rel-0-6-4/ Copied: tags/0.1.0 (from rev 539, tags/rel-0-1-0) Copied: tags/0.3.0 (from rev 539, tags/rel-0-3-0) Copied: tags/0.3.1 (from rev 539, tags/rel-0-3-1) Copied: tags/0.3.2 (from rev 539, tags/rel-0-3-2) Copied: tags/0.3.3 (from rev 539, tags/rel-0-3-3) Copied: tags/0.6.0 (from rev 539, tags/rel-0-6-0) Copied: tags/0.6.1 (from rev 539, tags/rel-0-6-1) Copied: tags/0.6.2 (from rev 539, tags/rel-0-6-2) Copied: tags/0.6.3 (from rev 539, tags/rel-0-6-3) Copied: tags/0.6.4 (from rev 539, tags/rel-0-6-4) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pat...@us...> - 2006-08-04 14:07:58
|
Revision: 539 Author: patrickh Date: 2006-08-04 07:07:56 -0700 (Fri, 04 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=539&view=rev Log Message: ----------- Prep for 0.6.5 release. Modified Paths: -------------- branches/0.6/cppdom/cppdom/version.h Modified: branches/0.6/cppdom/cppdom/version.h =================================================================== --- branches/0.6/cppdom/cppdom/version.h 2006-08-04 14:04:10 UTC (rev 538) +++ branches/0.6/cppdom/cppdom/version.h 2006-08-04 14:07:56 UTC (rev 539) @@ -57,7 +57,7 @@ // The major/minor/patch version (up to 3 digits each). #define CPPDOM_VERSION_MAJOR 0 #define CPPDOM_VERSION_MINOR 6 -#define CPPDOM_VERSION_PATCH 4 +#define CPPDOM_VERSION_PATCH 5 //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pat...@us...> - 2006-08-04 14:04:13
|
Revision: 538 Author: patrickh Date: 2006-08-04 07:04:10 -0700 (Fri, 04 Aug 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=538&view=rev Log Message: ----------- Simplify branch names. Added Paths: ----------- branches/0.3/ branches/0.6/ Removed Paths: ------------- branches/releng-0-3/ branches/releng-0-6/ Copied: branches/0.3 (from rev 537, branches/releng-0-3) Copied: branches/0.6 (from rev 537, branches/releng-0-6) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <pat...@us...> - 2006-07-24 13:48:16
|
Revision: 537 Author: patrickh Date: 2006-07-24 06:48:09 -0700 (Mon, 24 Jul 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=537&view=rev Log Message: ----------- Back out Revision 524 in order to change this back into a Visual Studio .NET 2002 solution/project. ViewCVS Links: ------------- http://svn.sourceforge.net/xml-cppdom/?rev=524&view=rev Modified Paths: -------------- trunk/vc7/cppdom.sln trunk/vc7/cppdom.vcproj Modified: trunk/vc7/cppdom.sln =================================================================== --- trunk/vc7/cppdom.sln 2006-07-24 13:42:19 UTC (rev 536) +++ trunk/vc7/cppdom.sln 2006-07-24 13:48:09 UTC (rev 537) @@ -1,15 +1,15 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 +Microsoft Visual Studio Solution File, Format Version 7.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppdom", "cppdom.vcproj", "{B2999048-3E24-41EC-B0DD-B0F8607C5F00}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Global GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Debug - DLL = Debug - DLL - Release = Release - Release - DLL = Release - DLL + ConfigName.0 = Debug + ConfigName.1 = Debug - DLL + ConfigName.2 = Release + ConfigName.3 = Release - DLL EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {B2999048-3E24-41EC-B0DD-B0F8607C5F00}.Debug.ActiveCfg = Debug|Win32 {B2999048-3E24-41EC-B0DD-B0F8607C5F00}.Debug.Build.0 = Debug|Win32 Modified: trunk/vc7/cppdom.vcproj =================================================================== --- trunk/vc7/cppdom.vcproj 2006-07-24 13:42:19 UTC (rev 536) +++ trunk/vc7/cppdom.vcproj 2006-07-24 13:48:09 UTC (rev 537) @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="Windows-1252"?> +<?xml version="1.0" encoding = "Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="7.00" Name="cppdom" ProjectGUID="{B2999048-3E24-41EC-B0DD-B0F8607C5F00}" Keyword="ExtStoredProcProj"> @@ -56,13 +56,7 @@ <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Release - DLL|Win32" @@ -114,13 +108,7 @@ <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Debug|Win32" @@ -162,12 +150,6 @@ Culture="1033"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Release|Win32" @@ -211,16 +193,8 @@ Culture="1033"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> - <References> - </References> <Files> <Filter Name="Source Files" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <al...@us...> - 2006-07-24 13:42:22
|
Revision: 536 Author: allenb Date: 2006-07-24 06:42:19 -0700 (Mon, 24 Jul 2006) ViewCVS: http://svn.sourceforge.net/xml-cppdom/?rev=536&view=rev Log Message: ----------- Use symlinkInstallFunc from sconsaddons. Modified Paths: -------------- trunk/SConstruct Modified: trunk/SConstruct =================================================================== --- trunk/SConstruct 2006-07-24 13:37:05 UTC (rev 535) +++ trunk/SConstruct 2006-07-24 13:42:19 UTC (rev 536) @@ -37,13 +37,6 @@ patch = re.compile('.*(#define *CPPDOM_VERSION_PATCH *(\d+)).*', re.DOTALL).sub(r'\2', contents) return (int(major), int(minor), int(patch)) -def symlinkInstallFunc(dest, source, env): - """Replacement function for install so it can install source - to destination by sym linking it. - """ - os.symlink(pj(os.getcwd(), source), dest) - return 0 - #------------------------------------------------------------------------------ # Main build setup @@ -136,7 +129,7 @@ # - Manually set the used prefix to the instlinks of the build dir if common_env['prefix'] == unspecified_prefix: if hasattr(os,'symlink'): - common_env['INSTALL'] = symlinkInstallFunc + common_env['INSTALL'] = SConsAddons.Util.symlinkInstallFunc common_env['prefix'] = pj( Dir('.').get_abspath(), buildDir, 'instlinks') # --- Setup installation paths --- # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
