[xml-cppdom-checkins] SF.net SVN: xml-cppdom: [550] branches/0.6

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

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.