Author: wyoung
Date: Mon Jul 2 20:46:47 2007
New Revision: 1642
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=1642&view=rev
Log:
- Shortened bootstrap "no*" options so the usage message can fit on a
single 80-column line.
- Added "nodoc" bootstrap option, to turn off doc dependency in RPM
build, to allow CentOS 5 build.
- Still v2.3.
Modified:
trunk/ChangeLog
trunk/HACKERS
trunk/bootstrap
trunk/mysql++.bkl
Modified: trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/ChangeLog?rev=1642&r1=1641&r2=1642&view=diff
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Mon Jul 2 20:46:47 2007
@@ -1,4 +1,4 @@
-2.3.0, 2007.07.02 (r1641)
+2.3.0, 2007.07.02 (r1642)
o Added Query::for_each() and Query::store_if() methods
proposed by Joel Fielder, and added examples for each.
@@ -94,9 +94,17 @@
Since these classes aren't actually used outside the library,
this shouldn't cause a problem. Patch by Nils Woetzel.
- o Partial fix to Doxygen PDF build on RHEL4 and 5. Doesn't yet
- run automatically, but it can be coaxed on by hand now.
- Proper fix is pending a response from the Doxygen folk.
+ o Partial fix to Doxygen PDF build on RHEL4 and 5. Needs
+ hand-coaxing to complete successfully on RHEL4, and doesn't
+ yet work at all on RHEL5.
+
+ o Shortened the "no*" options to the bootstrap script, so that
+ the usage message fits on a single line.
+
+ o Added "nodoc" bootstrap script option, for disabling the
+ documentation build during the dist target build. Allows for
+ building binary RPMs on CentOS 5.0, where doc building is
+ currently broken.
o Removed the updel example program. It was kind of silly,
and if you were to rewrite it today, you'd use for_each() anyway.
Modified: trunk/HACKERS
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/HACKERS?rev=1642&r1=1641&r2=1642&view=diff
==============================================================================
--- trunk/HACKERS (original)
+++ trunk/HACKERS Mon Jul 2 20:46:47 2007
@@ -81,18 +81,29 @@
to regenerate the build files. The bootstrap script also has
other functions:
- $ ./bootstrap [pedantic] [noexamples] [nolibrary] [configure options]
+ $ ./bootstrap [pedantic] [no{doc,ex,lib,opt}] [configure flags]
If you pass 'pedantic' to the bootstrap script, it will set up
the autoconf build system so it turns on all of GCC's warnings and
such. It's useful to build the library in this mode when making
changes to make sure there are no obvious problems with the code.
- If you pass 'noexamples', the generated Makefiles and project
- files won't try to build any of the examples.
+ If you pass 'nodoc', the documentation won't be considered a
+ prerequisite for building the distribution tarball. This is
+ useful on systems where the documentation doesn't build correctly,
+ and you only need to make a binary RPM. That process requires
+ a tarball, but doesn't need the documentation. Don't distribute
+ the tarball or SRPM that results, as they are broken.
- If you pass 'nolibrary', the generated Makefiles and project
- files won't try to build the MySQL++ library.
+ If you pass 'noex', the generated Makefiles and project files
+ won't try to build any of the examples.
+
+ If you pass 'nolib', the generated Makefiles and project files
+ won't try to build the MySQL++ library.
+
+ If you pass 'noopt', compiler optimization will be turned off
+ on systems that use configure. (It currently has no effect on
+ MinGW or Visual C++.)
You can pass any of the previous options in any order. As soon as
the bootstrap script sees an option that it doesn't understand,
Modified: trunk/bootstrap
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/bootstrap?rev=1642&r1=1641&r2=1642&view=diff
==============================================================================
--- trunk/bootstrap (original)
+++ trunk/bootstrap Mon Jul 2 20:46:47 2007
@@ -5,17 +5,22 @@
while [ $ARGS != 0 ]
do
case "$1" in
- noexamples)
+ nodoc)
+ BF_OPTIONS="-DBUILDDOCS=no $BF_OPTIONS"
+ shift
+ ;;
+
+ noex)
BF_OPTIONS="-DBUILDEXAMPLES=no $BF_OPTIONS"
shift
;;
- nolibrary)
+ nolib)
BF_OPTIONS="-DBUILDLIBRARY=no $BF_OPTIONS"
shift
;;
- nooptimization)
+ noopt)
export CXXFLAGS="-g -O0"
shift
;;
Modified: trunk/mysql++.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.bkl?rev=1642&r1=1641&r2=1642&view=diff
==============================================================================
--- trunk/mysql++.bkl (original)
+++ trunk/mysql++.bkl Mon Jul 2 20:46:47 2007
@@ -28,8 +28,9 @@
<if cond="BUILD=='release'">off</if>
</set>
+ <set var="BUILDDOCS">yes</set>
+ <set var="BUILDEXAMPLES">yes</set>
<set var="BUILDLIBRARY">yes</set>
- <set var="BUILDEXAMPLES">yes</set>
<set var="HEADER_DIR">$(PREFIX)/include/mysql++</set>
<if cond="BUILDLIBRARY=='yes'">
@@ -300,7 +301,9 @@
</action>
<action id="dist">
- <depends>doc</depends>
+ <if cond="BUILDDOCS=='yes'">
+ <depends>doc</depends>
+ </if>
<!-- Set up package directory -->
<command>
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
