Author: wyoung
Date: Wed Mar 28 08:09:15 2007
New Revision: 1465
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=1465&view=rev
Log:
The top-level 'make doc' target no longer rebuilds HTML and PDF outputs
unconditionally: it's smart enough to recognize when it's inputs haven't
changed, and so leave the outputs as-is. As a result, 'make dist'
depends on the doc target again, since it won't do unnecessary work any
more.
Modified:
trunk/Wishlist
trunk/mysql++.bkl
Modified: trunk/Wishlist
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/Wishlist?rev=1465&r1=1464&r2=1465&view=diff
==============================================================================
--- trunk/Wishlist (original)
+++ trunk/Wishlist Wed Mar 28 08:09:15 2007
@@ -16,10 +16,6 @@
puts an item in this section instead of the v3.0 one is that
it can be done without breaking the ABI, which would force
a feature to v3.0.
-
- o It would be nice if 'make doc' didn't rebuild the docs if it
- didn't have to. The dependencies to make that work for
- userman should be easy, but for refman...maybe not so easy.
o Stop using ColData_Tmpl<T>::buf_ member. It currently
contains a duplicate (and, in the presence of nulls,
Modified: trunk/mysql++.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.bkl?rev=1465&r1=1464&r2=1465&view=diff
==============================================================================
--- trunk/mysql++.bkl (original)
+++ trunk/mysql++.bkl Wed Mar 28 08:09:15 2007
@@ -276,30 +276,30 @@
</action>
<action id="ctags"><depends>tags</depends></action>
- <action id="refman">
- <command>mkdir -p doc/latex</command>
- <command>
- cd lib ; doxygen $(AND) cd ../doc/latex $(AND) \
- make pdf $(AND) cp refman.pdf ..
- </command>
- </action>
-
- <action id="userman">
+ <action id="doc/html/refman/index.html">
+ <depends-on-file>lib/Doxyfile</depends-on-file>
+ <depends-on-file>lib/*.cpp</depends-on-file>
+ <depends-on-file>lib/*.h</depends-on-file>
+ <command>
+ mkdir -p doc/latex ; cd lib ; doxygen >
/dev/null $(AND) \
+ cd ../doc/latex $(AND) make pdf >
/dev/null $(AND) \
+ cp refman.pdf ..
+ </command>
+ </action>
+
+ <action id="doc/html/userman/index.html">
+
<depends-on-file>doc/userman/userman.dbx</depends-on-file>
<command>cd doc/userman ; make html pdf</command>
</action>
<action id="doc">
- <depends>userman</depends>
- <depends>refman</depends>
+ <depends>doc/html/userman/index.html</depends>
+ <depends>doc/html/refman/index.html</depends>
</action>
<action id="dist">
- <depends>dist-build</depends>
- <command>tar czf $(PKGNAME).tar.gz $(PKGNAME)</command>
- <command>rm -rf $(PKGNAME)</command>
- </action>
-
- <action id="dist-build">
+ <depends>doc</depends>
+
<!-- Set up package directory -->
<command>
for d in config doc/{.,html}/{refman,userman}
examples lib ; \
@@ -351,6 +351,11 @@
<command>
cp lib/*.{cpp,h,in,pl} $(PKGNAME)/lib
</command>
+
+ <!-- distribution dir created, so pack up a copy and
+ nuke the temporary -->
+ <command>tar czf $(PKGNAME).tar.gz $(PKGNAME)</command>
+ <command>rm -rf $(PKGNAME)</command>
</action>
<action id="rpm-setup">
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
