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

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

Revision: 610
          http://svn.sourceforge.net/xml-cppdom/?rev=610&view=rev
Author:   patrickh
Date:     2007-06-28 13:16:14 -0700 (Thu, 28 Jun 2007)

Log Message:
-----------
In the CppDOM .fpc file, set the installation path relative to the location
of the .fpc file as determined when flagpoll is run. This works around a
long-standing problem with the CppDOM installation procedure when packaging a
CppDOM release since staging areas are generally used to perform the
installation prior to packaging, but this staging area is not the actual
installation location (of course).

Submitted by:	Doug McCorkle < mccdo at iastate dot edu >

Modified Paths:
--------------
    trunk/SConstruct
    trunk/cppdom.spec

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2007-06-27 21:05:13 UTC (rev 609)
+++ trunk/SConstruct	2007-06-28 20:16:14 UTC (rev 610)
@@ -141,7 +141,9 @@
    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')
+   base_inst_paths['flagpollPrefix'] = pj('${fp_file_cwd}' ,'..' ,'..')
    include_dir = pj(base_inst_paths['base'], 'include')
+   base_inst_paths['includePrefix'] = pj( base_inst_paths['flagpollPrefix'], 'include')
 
    if common_env['versioning']:
       version_suffix = "-%s_%s_%s" % CPPDOM_VERSION
@@ -150,6 +152,8 @@
       if not sys.platform.startswith('win'):
          include_dir = pj(base_inst_paths['base'], 'include', 
                           "cppdom-%s.%s.%s" % CPPDOM_VERSION)
+      base_inst_paths['includePrefix'] = pj(  base_inst_paths['includePrefix'], 
+                                              "cppdom-%s.%s.%s" % CPPDOM_VERSION )
    else:
       version_suffix = ''
 
@@ -170,10 +174,13 @@
       print "   Processing combo: ", ", ".join(['%s:%s'%(i[0],i[1]) for i in combo.iteritems()])
 
       inst_paths = copy.copy(base_inst_paths)
+      inst_paths['libPrefix'] = pj(inst_paths['flagpollPrefix'], 'lib')
       if GetPlatform() != "win32" and "debug" == combo["type"]:
-         inst_paths["lib"] = pj(inst_paths["lib"],"debug")      
+         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
@@ -224,14 +231,14 @@
       # Build up substitution map
       submap = {
          '@provides@'                  : provides,
-         '@prefix@'                    : inst_paths['base'],
+         '@prefix@'                    : inst_paths['flagpollPrefix'],
          '@exec_prefix@'               : '${prefix}',
          '@cppdom_cxxflags@'           : cppdom_cxxflags,
-         '@includedir@'                : inst_paths['include'],
+         '@includedir@'                : inst_paths['includePrefix'],
          '@cppdom_extra_cxxflags@'     : '',
          '@cppdom_extra_include_dirs@' : '',
          '@cppdom_libs@'               : cppdom_libs,
-         '@libdir@'                    : inst_paths['lib'],
+         '@libdir@'                    : inst_paths['libPrefix'],
          '@arch@'                      : arch,
          '@version@'                   : cppdom_version_str
       }

Modified: trunk/cppdom.spec
===================================================================
--- trunk/cppdom.spec	2007-06-27 21:05:13 UTC (rev 609)
+++ trunk/cppdom.spec	2007-06-28 20:16:14 UTC (rev 610)
@@ -76,8 +76,6 @@
 
 %install
 [ -z %{buildroot} ] || rm -rf %{buildroot}
-
-lib_subdir=`echo %{_libdir} | sed -e "s|%{_prefix}/\(.*\)|\1|"`
 CXXFLAGS="$RPM_OPT_FLAGS"
 LINKFLAGS="$RPM_OPT_FLAGS" 
 export CXXFLAGS
@@ -85,8 +83,6 @@
 scons prefix=%{buildroot}%{_prefix} var_arch=%{arch} var_type=optimized build_test=no install
 mkdir -p %{buildroot}%{_docdir}/cppdom-%{version}
 mv doc/html %{buildroot}%{_docdir}/cppdom-%{version}
-sed -i -e 's|%{buildroot}||g' %{buildroot}%{_libdir}/flagpoll/*.fpc
-sed -i -e 's|%{buildroot}||g' %{buildroot}%{_bindir}/cppdom-config
 # Remove all stupid scons temp files
 find %{buildroot}%{_prefix} -name .sconsign -exec rm {} \;
 for f in README AUTHORS ChangeLog COPYING ; do


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