[ggt-checkins] SF.net SVN: ggt:[1264] trunk

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

Revision: 1264
          http://ggt.svn.sourceforge.net/ggt/?rev=1264&view=rev
Author:   patrickh
Date:     2010-11-21 18:05:22 +0000 (Sun, 21 Nov 2010)

Log Message:
-----------
Generate gmtl.pc (for pkg-config) use from gmtl.fpc.in. This addresses
feature request #3102319. Bumped the version to 0.6.2.

Submitted by: Johannes Zarl

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/SConstruct
    trunk/docs/version.mk.doxy
    trunk/gmtl/Version.h
    trunk/gmtl.fpc.in

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-11-21 17:54:40 UTC (rev 1263)
+++ trunk/ChangeLog	2010-11-21 18:05:22 UTC (rev 1264)
@@ -1,5 +1,7 @@
 DATE       AUTHOR       CHANGE
 ---------- ------------ -------------------------------------------------------
+2010-11-21 patrickh     gmtl.pc is once again generated for pkg-config usage.
+
 [0.6.1 released - 5.20.2010]===================================================
 2010-05-20 patrickh     Added gmtl::ParametericCurve, gmtl::LinearCurve,
                         gmtl::QuadraticCurve, and gmtl::CubicCurve.

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2010-11-21 17:54:40 UTC (rev 1263)
+++ trunk/SConstruct	2010-11-21 18:05:22 UTC (rev 1264)
@@ -701,14 +701,15 @@
    base_inst_paths['lib'] = pj(base_inst_paths['base'], 'lib')
    base_inst_paths['share'] = pj(base_inst_paths['base'], 'share')
    base_inst_paths['flagpoll'] = pj(base_inst_paths['share'], 'flagpoll')
+   base_inst_paths['pkgconfig'] = pj(base_inst_paths['lib'], 'pkgconfig')
    base_inst_paths['bin'] = pj(base_inst_paths['base'], 'bin')
    include_dir = pj(base_inst_paths['base'], 'include')
-   base_inst_paths['include'] = pj('${fp_file_cwd}' ,'..' ,'..', 'include')
+   base_inst_paths['include'] = pj(base_inst_paths['base'], 'include')
 
    if baseEnv['versioning'] == 'yes' and not sys.platform.startswith("win"):
       include_version = "gmtl-%s.%s.%s" % GetGMTLVersion()
       include_dir = pj(include_dir, include_version)
-      base_inst_paths['include'] = pj('${fp_file_cwd}' ,'..' ,'..', 'include',
+      base_inst_paths['include'] = pj(base_inst_paths['base'], 'include',
                                       include_version)
 
    print "using prefix:", base_inst_paths['base']         
@@ -743,7 +744,7 @@
    # Build up substitution map
    submap = {
       '@provides@'                : provides,
-      '@prefix@'                  : pj('${fp_file_cwd}', '..', '..'),
+      '@prefix@'                  : base_inst_paths['base'],
       '@exec_prefix@'             : '${prefix}',
       '@gmtl_cxxflags@'           : '',
       '@includedir@'              : base_inst_paths['include'],
@@ -760,9 +761,14 @@
                                'gmtl.fpc.in', submap = submap)
    env.AddPostAction(gmtl_fpc, Chmod('$TARGET', 0644))
    env.Depends(gmtl_fpc, 'gmtl/Version.h')
+   gmtl_pc = env.SubstBuilder(pj(base_inst_paths['pkgconfig'], "gmtl.pc"), 
+                               'gmtl.fpc.in', submap = submap)
+   env.AddPostAction(gmtl_pc, Chmod('$TARGET', 0644))
+   env.Depends(gmtl_pc, 'gmtl/Version.h')
 
    installed_targets += env.Install(base_inst_paths['bin'], 'gmtl-config')
    installed_targets += gmtl_fpc
+   installed_targets += gmtl_pc
 
    pkg.build()
    installed_targets += pkg.getInstalledTargets()

Modified: trunk/docs/version.mk.doxy
===================================================================
--- trunk/docs/version.mk.doxy	2010-11-21 17:54:40 UTC (rev 1263)
+++ trunk/docs/version.mk.doxy	2010-11-21 18:05:22 UTC (rev 1264)
@@ -1,4 +1,4 @@
 # This file can be included by a Doxygen configuration file to set the
 # project version number and by makefiles to accomplish the same.
 
-PROJECT_NUMBER = 0.6.1
+PROJECT_NUMBER = 0.6.2

Modified: trunk/gmtl/Version.h
===================================================================
--- trunk/gmtl/Version.h	2010-11-21 17:54:40 UTC (rev 1263)
+++ trunk/gmtl/Version.h	2010-11-21 18:05:22 UTC (rev 1264)
@@ -22,7 +22,7 @@
 // The major/minor/patch version (up to 3 digits each).
 #define GMTL_VERSION_MAJOR    0
 #define GMTL_VERSION_MINOR    6
-#define GMTL_VERSION_PATCH    1
+#define GMTL_VERSION_PATCH    2
 
 //--------------------------------------------------------------------------
 //--------------------------------------------------------------------------

Modified: trunk/gmtl.fpc.in
===================================================================
--- trunk/gmtl.fpc.in	2010-11-21 17:54:40 UTC (rev 1263)
+++ trunk/gmtl.fpc.in	2010-11-21 18:05:22 UTC (rev 1264)
@@ -1,3 +1,4 @@
+prefix=@prefix@
 exec_prefix=@exec_prefix@
 cxxflags=@gmtl_cxxflags@
 includedir=@includedir@
@@ -11,4 +12,4 @@
 Libs:
 Cflags: -I${includedir}
 Arch: @arch@
-prefix: @prefix@
+prefix: ${prefix}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.