[xml-cppdom-checkins] SF.net SVN: xml-cppdom: [559] trunk

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

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.