xml-cppdom-checkins Mailing List for XML CppDom (Page 5)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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.




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

xml-cppdom-checkins Mailing List for XML CppDom (Page 5)

xml-cppdom-checkins — CVS commit list