From: <al...@us...> - 2006-11-08 17:45:54
|
Revision: 564 http://svn.sourceforge.net/xml-cppdom/?rev=564&view=rev Author: allenb Date: 2006-11-08 09:45:49 -0800 (Wed, 08 Nov 2006) Log Message: ----------- - Protect check of MSVS_VERSION Modified Paths: -------------- trunk/cppdom/SConscript Modified: trunk/cppdom/SConscript =================================================================== --- trunk/cppdom/SConscript 2006-11-08 16:05:43 UTC (rev 563) +++ trunk/cppdom/SConscript 2006-11-08 17:45:49 UTC (rev 564) @@ -35,7 +35,7 @@ if "shared" in combo["libtype"]: shlinkcom = cppdom_lib_env['SHLINKCOM'] # When using Visual C++ 8.0 or newer, embed the manifest in the DLL. - if float(cppdom_lib_env['MSVS_VERSION']) >= 8.0: + if cppdom_lib_env.has_key('MSVS_VERSION') and float(cppdom_lib_env['MSVS_VERSION']) >= 8.0: shlinkcom = [shlinkcom, 'mt.exe -manifest ${TARGET}.manifest -outputresource:$TARGET;2'] cppdom_lib = cppdom_lib_env.SharedLibrary(cppdom_shared_libname, sources, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pat...@us...> - 2007-06-26 01:05:36
|
Revision: 596 http://svn.sourceforge.net/xml-cppdom/?rev=596&view=rev Author: patrickh Date: 2007-06-25 18:05:34 -0700 (Mon, 25 Jun 2007) Log Message: ----------- Do not define CPPDOM_DYN_LINK when building the CppDOM libraries. It is only for user-level code. This should finish off fixing up the mess that I made in Revision 591. Revision Links: -------------- http://svn.sourceforge.net/xml-cppdom/?rev=591&view=rev Modified Paths: -------------- trunk/cppdom/SConscript Modified: trunk/cppdom/SConscript =================================================================== --- trunk/cppdom/SConscript 2007-06-25 22:37:34 UTC (rev 595) +++ trunk/cppdom/SConscript 2007-06-26 01:05:34 UTC (rev 596) @@ -41,7 +41,7 @@ shlinkcom = [shlinkcom, 'mt.exe -manifest ${TARGET}.manifest -outputresource:$TARGET;2'] cppdom_shared_lib_env = cppdom_lib_env.Copy() - cppdom_shared_lib_env.AppendUnique(CPPDEFINES = ["CPPDOM_EXPORTS", "CPPDOM_DYN_LINK"]) + cppdom_shared_lib_env.AppendUnique(CPPDEFINES = ["CPPDOM_EXPORTS"]) cppdom_lib = cppdom_shared_lib_env.SharedLibrary(cppdom_shared_libname, sources, SHLINKCOM = shlinkcom) cppdom_shared_lib_env.Install(inst_paths['lib'], cppdom_lib) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pat...@us...> - 2007-06-26 14:01:22
|
Revision: 597 http://svn.sourceforge.net/xml-cppdom/?rev=597&view=rev Author: patrickh Date: 2007-06-26 07:01:24 -0700 (Tue, 26 Jun 2007) Log Message: ----------- Handle the case of using Visual C++ Express Edition where "Exp" is appended to the version number. Modified Paths: -------------- trunk/cppdom/SConscript Modified: trunk/cppdom/SConscript =================================================================== --- trunk/cppdom/SConscript 2007-06-26 01:05:34 UTC (rev 596) +++ trunk/cppdom/SConscript 2007-06-26 14:01:24 UTC (rev 597) @@ -37,7 +37,10 @@ if "shared" in combo["libtype"]: shlinkcom = cppdom_lib_env['SHLINKCOM'] # When using Visual C++ 8.0 or newer, embed the manifest in the DLL. - if cppdom_lib_env.has_key('MSVS_VERSION') and float(cppdom_lib_env['MSVS_VERSION']) >= 8.0: + # NOTE: The [:3] bit used before passing the MSVS_VERSION value to float() + # is to handle the case of Visual C++ Express Edition which appends "Exp" + # to the version number. + if cppdom_lib_env.has_key('MSVS_VERSION') and float(cppdom_lib_env['MSVS_VERSION'][:3]) >= 8.0: shlinkcom = [shlinkcom, 'mt.exe -manifest ${TARGET}.manifest -outputresource:$TARGET;2'] cppdom_shared_lib_env = cppdom_lib_env.Copy() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pat...@us...> - 2007-07-07 00:58:57
|
Revision: 613 http://svn.sourceforge.net/xml-cppdom/?rev=613&view=rev Author: patrickh Date: 2007-07-06 17:58:57 -0700 (Fri, 06 Jul 2007) Log Message: ----------- Generate a usable shared library on Mac OS X. For some reason, the install name for the shared library was junk. Modified Paths: -------------- trunk/cppdom/SConscript Modified: trunk/cppdom/SConscript =================================================================== --- trunk/cppdom/SConscript 2007-06-28 22:05:08 UTC (rev 612) +++ trunk/cppdom/SConscript 2007-07-07 00:58:57 UTC (rev 613) @@ -45,6 +45,11 @@ 'mt.exe -manifest ${TARGET}.manifest -outputresource:$TARGET;2'] cppdom_shared_lib_env = cppdom_lib_env.Copy() cppdom_shared_lib_env.AppendUnique(CPPDEFINES = ["CPPDOM_EXPORTS"]) + if GetPlatform() == 'darwin': + cppdom_shared_lib_env.Append( + LINKFLAGS = ['-install_name', 'lib%s.dylib' % cppdom_shared_libname] + ) + cppdom_lib = cppdom_shared_lib_env.SharedLibrary(cppdom_shared_libname, sources, SHLINKCOM = shlinkcom) cppdom_shared_lib_env.Install(inst_paths['lib'], cppdom_lib) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pat...@us...> - 2007-07-07 01:08:31
|
Revision: 614 http://svn.sourceforge.net/xml-cppdom/?rev=614&view=rev Author: patrickh Date: 2007-07-06 18:08:34 -0700 (Fri, 06 Jul 2007) Log Message: ----------- Since we're passing platform-specific linker flags on Mac OS X, we might as well pass in some version information, too. Modified Paths: -------------- trunk/cppdom/SConscript Modified: trunk/cppdom/SConscript =================================================================== --- trunk/cppdom/SConscript 2007-07-07 00:58:57 UTC (rev 613) +++ trunk/cppdom/SConscript 2007-07-07 01:08:34 UTC (rev 614) @@ -47,7 +47,10 @@ cppdom_shared_lib_env.AppendUnique(CPPDEFINES = ["CPPDOM_EXPORTS"]) if GetPlatform() == 'darwin': cppdom_shared_lib_env.Append( - LINKFLAGS = ['-install_name', 'lib%s.dylib' % cppdom_shared_libname] + LINKFLAGS = ['-install_name', 'lib%s.dylib' % cppdom_shared_libname, + '-Wl,-compatibility_version,%i.%i' % \ + (CPPDOM_VERSION[0], CPPDOM_VERSION[1]), + '-Wl,-current_version,%i.%i.%i' % CPPDOM_VERSION] ) cppdom_lib = cppdom_shared_lib_env.SharedLibrary(cppdom_shared_libname, sources, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pat...@us...> - 2007-08-01 15:37:50
|
Revision: 625 http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=625&view=rev Author: patrickh Date: 2007-08-01 08:37:52 -0700 (Wed, 01 Aug 2007) Log Message: ----------- Note a to-do item for Mac OS X. Modified Paths: -------------- trunk/cppdom/SConscript Modified: trunk/cppdom/SConscript =================================================================== --- trunk/cppdom/SConscript 2007-08-01 15:22:38 UTC (rev 624) +++ trunk/cppdom/SConscript 2007-08-01 15:37:52 UTC (rev 625) @@ -46,6 +46,8 @@ cppdom_shared_lib_env = cppdom_lib_env.Copy() cppdom_shared_lib_env.AppendUnique(CPPDEFINES = ["CPPDOM_EXPORTS"]) if GetPlatform() == 'darwin': + # TODO: The install name should probably include the installation + # prefix. cppdom_shared_lib_env.Append( LINKFLAGS = ['-install_name', 'lib%s.dylib' % cppdom_shared_libname, '-Wl,-compatibility_version,%i.%i' % \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |