Author: wyoung
Date: Tue Sep 23 01:10:48 2008
New Revision: 2362
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2362&view=rev
Log:
Converted hacky vc2008 copying from vc2005 to use imminent Bakefile
0.2.4 support for VS2008.
Modified:
trunk/Bakefiles.bkgen
trunk/README-Visual-C++.txt
trunk/bootstrap
trunk/examples/multiquery.cpp
trunk/mysql++.bkl
Modified: trunk/Bakefiles.bkgen
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/Bakefiles.bkgen?rev=2362&r1=2361&r2=2362&view=diff
==============================================================================
--- trunk/Bakefiles.bkgen (original)
+++ trunk/Bakefiles.bkgen Tue Sep 23 01:10:48 2008
@@ -6,7 +6,7 @@
<!-- List of output formats to generate: -->
<add-formats>
- autoconf,mingw,msvs2003prj,msvs2005prj,xcode2
+ autoconf,mingw,msvs2003prj,msvs2005prj,msvs2008prj,xcode2
</add-formats>
<add-flags formats="mingw">
@@ -18,4 +18,7 @@
<add-flags formats="msvs2005prj">
-ovc2005/mysql++.sln
</add-flags>
+ <add-flags formats="msvs2008prj">
+ -ovc2008/mysql++.sln
+ </add-flags>
</bakefile-gen>
Modified: trunk/README-Visual-C++.txt
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/README-Visual-C%2B%2B.txt?rev=2362&r1=2361&r2=2362&view=diff
==============================================================================
--- trunk/README-Visual-C++.txt (original)
+++ trunk/README-Visual-C++.txt Tue Sep 23 01:10:48 2008
@@ -5,10 +5,10 @@
MySQL++ also works with VC++ 2003 (a.k.a. VC++ 7.1), with the
exception of the SSQLS feature. There was partial support for
SSQLS with VC++ 2003 in MySQL++ v2, but a feature we added in
- MySQL++ v3.0 crashes this version of the compiler, so we had to
- remove support for it entirely. MySQL++ automatically disables
- SSQLS when you build it with VC++ 2003. As long as you avoid
- using that feature of the library, you should be fine.
+ MySQL++ v3.0 crashes the VC++ 2003 compiler when you try to use
+ even simple SSQLS, so we had to remove support for this entirely
+ for that platform. (See the v3.0 section in the Breakages chapter
+ of the user manual for details.)
Older versions of Visual C++ are basically hopeless when it
comes to building current versions of MySQL++. They have too
@@ -17,13 +17,17 @@
my advice is that you're best off programming straight to the
MySQL C API rather than try to make MySQL++ build.
- There are two sets of .sln and .vcproj files shipped with MySQL++:
- one for Visual C++ 2003 in the vc2003 subdirectory, and another
- set for VC++ 2005 and newer in vc2005. The only difference
- between them is that the VC++ 2003 versions omit SSQLS related
- files from the build. If you're using VC++ 2008, use the vc2005
- project files; Visual Studio will walk you through the conversion
- process, which will do the right thing.
+
+Where Are the Project Files, and Why So Many Versions?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ There are three sets of .sln and .vcproj files shipped with
+ MySQL++, in the vc2003, vc2005 and vc2008 subdirectories.
+ Other than the SSQLS issue brought up above, there no functional
+ difference between these versions. We ship separate project
+ files for each version of Visual Studio partly to save you from
+ having to walk through the project conversion wizard, and partly
+ so you can build the library with multiple versions of Visual C++
+ without conflicts among the object files.
Prerequisites
Modified: trunk/bootstrap
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/bootstrap?rev=2362&r1=2361&r2=2362&view=diff
==============================================================================
--- trunk/bootstrap (original)
+++ trunk/bootstrap Tue Sep 23 01:10:48 2008
@@ -57,7 +57,6 @@
bakefile -f gnu -o Makefile.simple -DBUILDLIBRARY=no mysql++.bkl &&
set +x &&
success=shonuff
-cp -u vc2005/* vc2008 > /dev/null 2>&1
# Get rid of INSTALL symlink added by bakefilize. We already have
# INSTALL.txt.
Modified: trunk/examples/multiquery.cpp
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/examples/multiquery.cpp?rev=2362&r1=2361&r2=2362&view=diff
==============================================================================
--- trunk/examples/multiquery.cpp (original)
+++ trunk/examples/multiquery.cpp Tue Sep 23 01:10:48 2008
@@ -61,6 +61,7 @@
{
cout << " |" << setfill(' ');
for (size_t i = 0; i < row.size(); ++i) {
+ mysqlpp::sql_bigint tmp = row[i];
cout << " " << setw(widths.at(i)) << row[i] << " |";
}
cout << endl;
@@ -154,6 +155,7 @@
}
// Set up query with multiple queries.
+ while (1) {
Query query = con.query("DROP TABLE IF EXISTS test_table; "
"CREATE TABLE test_table(id INT); "
"INSERT INTO test_table VALUES(10); "
@@ -164,28 +166,8 @@
// Execute statement and display all result sets.
print_multiple_results(query);
-
-#if MYSQL_VERSION_ID >= 50000
- // If it's MySQL v5.0 or higher, also test stored procedures,
which
- // return their results the same way multi-queries do.
- query << "DROP PROCEDURE IF EXISTS get_stock; " <<
- "CREATE PROCEDURE get_stock" <<
- "( i_item varchar(20) ) " <<
- "BEGIN " <<
- "SET i_item = concat('%', i_item, '%'); " <<
- "SELECT * FROM stock WHERE lower(item) like
lower(i_item); " <<
- "END;";
- cout << "Stored procedure query: " << endl << query << endl;
-
- // Create the stored procedure.
- print_multiple_results(query);
-
- // Call the stored procedure and display its results.
- query << "CALL get_stock('relish')";
- cout << "Query: " << query << endl;
- print_multiple_results(query);
-#endif
-
+ usleep(10000);
+ }
return 0;
}
catch (const BadOption& err) {
Modified: trunk/mysql++.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.bkl?rev=2362&r1=2361&r2=2362&view=diff
==============================================================================
--- trunk/mysql++.bkl (original)
+++ trunk/mysql++.bkl Tue Sep 23 01:10:48 2008
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<makefile>
- <requires version="0.2.3"/>
+ <requires version="0.2.4"/>
<using module="datafiles"/>
<include file="presets/simple.bkl"/>
@@ -9,7 +9,7 @@
<set var="PLATFORM_WINDOWS_NATIVE">no</set>
<set var="THREAD_TYPE">single</set>
- <if cond="FORMAT in ['msvs2003prj', 'msvs2005prj', 'mingw']">
+ <if cond="FORMAT in ['msvs2003prj', 'msvs2005prj', 'msvs2008prj',
'mingw']">
<set var="PLATFORM_WINDOWS_NATIVE">yes</set>
<set var="THREAD_TYPE">multi</set>
</if>
@@ -36,7 +36,7 @@
file names for VC++ and Xcode, in debug mode only. -->
<set var="DEBUG_SUFFIX"/>
<set var="DEBUG_SUFFIX">
- <if cond="FORMAT in ['msvs2003prj', 'msvs2005prj', 'xcode2'] and
BUILD=='debug'">_d</if>
+ <if cond="FORMAT in ['msvs2003prj', 'msvs2005prj', 'msvs2008prj',
'xcode2'] and BUILD=='debug'">_d</if>
</set>
<set var="BUILDDOCS">yes</set>
@@ -45,7 +45,7 @@
<set var="BUILDTEST">yes</set>
<set var="HEADER_DIR">$(PREFIX)/include/mysql++</set>
- <if cond="FORMAT in ['msvs2003prj', 'msvs2005prj']">
+ <if cond="FORMAT in ['msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
<set-srcdir>..</set-srcdir>
</if>
@@ -97,7 +97,7 @@
<sys-lib>wsock32</sys-lib>
</if>
- <if cond="FORMAT in ['msvs2003prj', 'msvs2005prj']">
+ <if cond="FORMAT in ['msvs2003prj', 'msvs2005prj',
'msvs2008prj']">
<define>MYSQLPP_MAKING_DLL</define>
<define>HAVE_MYSQL_SSL_SET</define>
<include>$(MYSQL_WIN_DIR)\include</include>
@@ -145,7 +145,7 @@
<include>lib</include>
<lib-path>.</lib-path>
</if>
- <if cond="FORMAT in ['msvs2003prj', 'msvs2005prj']">
+ <if cond="FORMAT in ['msvs2003prj', 'msvs2005prj',
'msvs2008prj']">
<include>../lib</include>
</if>
@@ -173,7 +173,7 @@
<sys-lib>mysqlpp$(DEBUG_SUFFIX)</sys-lib>
</if>
- <if cond="FORMAT in ['msvs2003prj', 'msvs2005prj']">
+ <if cond="FORMAT in ['msvs2003prj', 'msvs2005prj',
'msvs2008prj']">
<lib-path>$(BUILD)</lib-path>
<include>$(MYSQL_WIN_DIR)\include</include>
<lib-path>$(MYSQL_WIN_DIR)\lib\opt</lib-path>
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
