Author: wyoung
Date: Sat Feb 25 06:52:04 2006
New Revision: 1168
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=1168&view=rev
Log:
Completed work on new Bakefiles
Added:
branches/v2.1-bakefile/common.bkl
Modified:
branches/v2.1-bakefile/examples/examples.bkl
branches/v2.1-bakefile/lib/lib.bkl
Added: branches/v2.1-bakefile/common.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/branches/v2.1-bakefile/common.bkl?rev=1168&view=auto
==============================================================================
--- branches/v2.1-bakefile/common.bkl (added)
+++ branches/v2.1-bakefile/common.bkl Sat Feb 25 06:52:04 2006
@@ -1,0 +1,18 @@
+<?xml version="1.0" ?>
+<makefile>
+ <include file="presets/simple.bkl"/>
+
+ <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="DEBUGINFO">
+ <if cond="BUILD=='debug'">on</if>
+ <if cond="BUILD=='release'">off</if>
+ </set>
+</makefile>
Modified: branches/v2.1-bakefile/examples/examples.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/branches/v2.1-bakefile/examples/examples.bkl?rev=1168&r1=1167&r2=1168&view=diff
==============================================================================
--- branches/v2.1-bakefile/examples/examples.bkl (original)
+++ branches/v2.1-bakefile/examples/examples.bkl Sat Feb 25 06:52:04 2006
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<makefile>
- <include file="presets/simple.bkl"/>
+ <include file="../common.bkl"/>
<!-- Define variables that control make/project file generation -->
@@ -12,11 +12,25 @@
<template id="example">
<include>../lib</include>
- <lib-path>../lib</lib-path>
- <sys-lib>@MYSQL_C_LIB@</sys-lib>
<sys-lib>mysqlpp</sys-lib>
- <if cond="ZLIB=='yes'">
- <sys-lib>z</sys-lib>
+
+ <debug-info>$(DEBUGINFO)</debug-info>
+
+ <if cond="FORMAT=='msvc6prj'">
+ <define>_UNICODE</define>
+ <include>c:\mysql\include</include>
+ <lib-path>c:\mysql\lib\opt</lib-path>
+ <lib-path>..\lib\$(BUILD)</lib-path>
+ <sys-lib>libmysql</sys-lib>
+ </if>
+
+ <if cond="FORMAT=='autoconf'">
+ <warnings>max</warnings>
+ <lib-path>../lib</lib-path>
+ <sys-lib>@MYSQL_C_LIB@</sys-lib>
+ <if cond="ZLIB=='yes'">
+ <sys-lib>z</sys-lib>
+ </if>
</if>
<if cond="MYSQLLIB == 'mysqlclient'">
@@ -26,7 +40,6 @@
<threading>multi</threading>
</if>
- <warnings>max</warnings>
<cxx-rtti>on</cxx-rtti>
<cxx-exceptions>on</cxx-exceptions>
</template>
@@ -39,10 +52,59 @@
<!-- Define output targets -->
+ <!-- First, the "standard" examples, those being the ones that
+ all depend on the util module -->
<exe id="resetdb" template="std-example">
<sources>resetdb.cpp</sources>
</exe>
<exe id="simple1" template="std-example">
<sources>simple1.cpp</sources>
</exe>
+ <exe id="simple2" template="std-example">
+ <sources>simple2.cpp</sources>
+ </exe>
+ <exe id="simple3" template="std-example">
+ <sources>simple3.cpp</sources>
+ </exe>
+ <exe id="usequery" template="std-example">
+ <sources>usequery.cpp</sources>
+ </exe>
+ <exe id="multiquery" template="std-example">
+ <sources>multiquery.cpp</sources>
+ </exe>
+ <exe id="custom1" template="std-example">
+ <sources>custom1.cpp</sources>
+ </exe>
+ <exe id="custom2" template="std-example">
+ <sources>custom2.cpp</sources>
+ </exe>
+ <exe id="custom3" template="std-example">
+ <sources>custom3.cpp</sources>
+ </exe>
+ <exe id="custom4" template="std-example">
+ <sources>custom4.cpp</sources>
+ </exe>
+ <exe id="custom5" template="std-example">
+ <sources>custom5.cpp</sources>
+ </exe>
+ <exe id="custom6" template="std-example">
+ <sources>custom6.cpp</sources>
+ </exe>
+ <exe id="dbinfo" template="std-example">
+ <sources>dbinfo.cpp</sources>
+ </exe>
+ <exe id="fieldinf1" template="std-example">
+ <sources>fieldinf1.cpp</sources>
+ </exe>
+
+ <!-- Next, the "nonstandard" examples -->
+ <exe id="cgi_image" template="example">
+ <sources>cgi_image.cpp</sources>
+ </exe>
+ <exe id="load_file" template="example">
+ <sources>load_file.cpp</sources>
+ </exe>
+ <exe id="updel" template="example">
+ <sources>updel.cpp</sources>
+ </exe>
</makefile>
Modified: branches/v2.1-bakefile/lib/lib.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/branches/v2.1-bakefile/lib/lib.bkl?rev=1168&r1=1167&r2=1168&view=diff
==============================================================================
--- branches/v2.1-bakefile/lib/lib.bkl (original)
+++ branches/v2.1-bakefile/lib/lib.bkl Sat Feb 25 06:52:04 2006
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<makefile>
- <include file="presets/simple.bkl"/>
+ <include file="../common.bkl"/>
<dll id="mysqlpp">
<sources>coldata.cpp connection.cpp datetime.cpp field_names.cpp
@@ -8,7 +8,16 @@
query.cpp result.cpp row.cpp sql_string.cpp string_util.cpp
type_info.cpp vallist.cpp</sources>
+ <debug-info>$(DEBUGINFO)</debug-info>
<include>..</include>
+
+ <if cond="FORMAT=='msvc6prj'">
+ <define>_UNICODE</define>
+ <define>MYSQLPP_MAKING_DLL</define>
+ <include>c:\mysql\include</include>
+ <lib-path>c:\mysql\lib\opt</lib-path>
+ <sys-lib>libmysql</sys-lib>
+ </if>
</dll>
<action id="custom.h">
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
