Author: wyoung
Date: Thu Jan 3 08:04:08 2008
New Revision: 2065
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2065&view=rev
Log:
Adding "_d" suffix to MySQL++ main library output files in debug mode
for VC++, MinGW, and Xcode. In release mode and on all other platforms,
the rules are the same as before.
Modified:
trunk/Wishlist
trunk/mysql++.bkl
Modified: trunk/Wishlist
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/Wishlist?rev=2065&r1=2064&r2=2065&view=diff
==============================================================================
--- trunk/Wishlist (original)
+++ trunk/Wishlist Thu Jan 3 08:04:08 2008
@@ -17,11 +17,6 @@
o Disable SSQLS if < VC++ 2005, remove custom.pl -v, and remove
discussion of it from userman.
-
- o Figure out how to name debug DLL and library under VC++ and
- Xcode differently (trailing '_d'?) to avoid trouble when mixing
- build options among translation units. With VC++, we can do
- it in install.bat. Xcode....?
v3.1 Tentative Plan
Modified: trunk/mysql++.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.bkl?rev=2065&r1=2064&r2=2065&view=diff
==============================================================================
--- trunk/mysql++.bkl (original)
+++ trunk/mysql++.bkl Thu Jan 3 08:04:08 2008
@@ -1,36 +1,45 @@
<?xml version="1.0"?>
<makefile>
- <requires version="0.2.2"/>
+ <requires version="0.2.3"/>
<using module="datafiles"/>
<include file="presets/simple.bkl"/>
<set var="DDD">$(DOLLAR)$(DOLLAR)d</set>
<set var="DDF">$(DOLLAR)$(DOLLAR)f</set>
- <set var="AND">&&</set>
<set var="ZLIB">yes</set>
+ <set var="PLATFORM_WINDOWS_NATIVE">no</set>
<set var="THREAD_TYPE">single</set>
<if cond="FORMAT in ['msvs2003prj', 'mingw']">
+ <set var="PLATFORM_WINDOWS_NATIVE">yes</set>
<set var="THREAD_TYPE">multi</set>
</if>
- <option name="BUILD">
- <values>debug,release</values>
- <values-description>Debug,Release</values-description>
- <default-value>debug</default-value>
- <description>
- Type of compiled binaries
- </description>
- </option>
+ <option name="BUILD">
+ <values>debug,release</values>
+ <values-description>Debug,Release</values-description>
+ <default-value>debug</default-value>
+ <description>
+ Type of compiled binaries
+ </description>
+ </option>
<set var="MYSQL_WIN_DIR">
C:\Program Files\MySQL\MySQL Server 5.0
</set>
- <set var="DEBUGINFO">
- <if cond="BUILD=='debug'">on</if>
- <if cond="BUILD=='release'">off</if>
- </set>
+ <set var="DEBUGINFO">
+ <if cond="BUILD=='debug'">on</if>
+ <if cond="BUILD=='release'">off</if>
+ </set>
+
+ <!-- This convoluted syntax adds "_d" to the end of library and DLL
+ file names for VC++, MinGW and Xcode, in debug mode only. -->
+ <set var="DEBUG_SUFFIX"/>
+ <set var="DEBUG_SUFFIX">
+ <if cond="PLATFORM_WINDOWS_NATIVE=='yes' and
BUILD=='debug'">_d</if>
+ <if cond="FORMAT=='xcode2' and BUILD=='debug'">_d</if>
+ </set>
<set var="BUILDDOCS">yes</set>
<set var="BUILDEXAMPLES">yes</set>
@@ -40,7 +49,8 @@
<if cond="BUILDLIBRARY=='yes'">
<dll id="mysqlpp">
- <libname>mysqlpp</libname>
+ <dllname>mysqlpp$(DEBUG_SUFFIX)</dllname>
+ <libname>mysqlpp$(DEBUG_SUFFIX)</libname>
<so_version>3.0.0</so_version>
<sources>
@@ -79,7 +89,7 @@
<install-to>$(LIBDIR)</install-to>
- <if cond="FORMAT in ['msvs2003prj', 'mingw']">
+ <if cond="PLATFORM_WINDOWS_NATIVE=='yes'">
<define>UNICODE</define>
<define>_UNICODE</define>
</if>
@@ -149,7 +159,7 @@
<lib-path>.</lib-path>
</if>
- <if cond="FORMAT in ['msvs2003prj', 'mingw']">
+ <if cond="PLATFORM_WINDOWS_NATIVE=='yes'">
<define>UNICODE</define>
<define>_UNICODE</define>
</if>
@@ -423,7 +433,7 @@
</command>
<!-- distribution dir created, so pack up a copy and
- nuke the temporary -->
+ nuke the temporary -->
<command>tar czf $(PKGNAME).tar.gz $(PKGNAME)</command>
<command>rm -rf $(PKGNAME)</command>
</action>
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
