Author: wyoung
Date: Fri Feb 29 07:32:25 2008
New Revision: 2227
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2227&view=rev
Log:
- Reworked the dist target to allow the srpm target to avoid building
the manuals.
- Disabled manual building and maintainer mode stuff for dist tarball by
rebaking everything instead of cloning the configuration I personally
happen to use.
Modified:
trunk/Wishlist
trunk/mysql++.bkl
Modified: trunk/Wishlist
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/Wishlist?rev=2227&r1=2226&r2=2227&view=diff
==============================================================================
--- trunk/Wishlist (original)
+++ trunk/Wishlist Fri Feb 29 07:32:25 2008
@@ -7,20 +7,6 @@
o Any time you must hand-roll some SQL code in your program,
consider whether it could be generalized to a widely-useful
API feature.
-
-
-v3.0 Final To-Do
-----------------
- o Rename dist target to dist-temp, with a different temporary
- output file name. Make new dist target that unpacks this,
- cds into the directory it unpacks into, rebake with doc and
- test targets disabled, then pack it back up into new tarball
- and nuke temp stuff.
-
- o Make srpm target depend on dist-temp so building binary RPMs
- doesn't try to build tests or rebuild docs. Former have no
- value to binary RPMs, and for the latter we want to just package
- already-built docs.
v3.1 Tentative Plan
Modified: trunk/mysql++.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.bkl?rev=2227&r1=2226&r2=2227&view=diff
==============================================================================
--- trunk/mysql++.bkl (original)
+++ trunk/mysql++.bkl Fri Feb 29 07:32:25 2008
@@ -402,11 +402,7 @@
<depends>doc/html/userman/index.html</depends>
</action>
- <action id="dist">
- <if cond="BUILDDOCS=='yes'">
- <depends>doc</depends>
- </if>
-
+ <action id="@[EMAIL PROTECTED]@PACKAGE_VERSION@">
<!-- Set up package directory -->
<command>
for d in config doc/{.,html}/{refman,userman} examples lib
test ; \
@@ -487,27 +483,36 @@
cp test/*.cpp $(PKGNAME)/test
</command>
- <!-- distribution dir created, so pack up a copy and
- nuke the temporary -->
+ <!-- re-bootstrap it to get a standard configuration -->
+ <command>cd $(PKGNAME) ; ./bootstrap nodoc nomaint</command>
+ <command>rm -f $(PKGNAME)/Makefile
$(PKGNAME)/config.{log,status}</command>
+ <command>rm -fr $(PKGNAME)/autom4te.cache</command>
+ </action>
+
+ <action id="dist">
+ <depends>$(PKGNAME)</depends>
<command>tar czf $(PKGNAME).tar.gz $(PKGNAME)</command>
<command>rm -rf $(PKGNAME)</command>
</action>
<action id="rpm-setup">
+ <depends>dist</depends>
<command>cp $(PKGNAME).tar.gz /usr/src/redhat/SOURCES</command>
- <depends>dist</depends>
</action>
<action id="rpm">
+ <if cond="BUILDDOCS=='yes'">
+ <depends>doc</depends>
+ </if>
+ <depends>rpm-setup</depends>
<command>cd /usr/src/redhat/SPECS</command>
<command>rpmbuild -bb mysql++.spec</command>
+ </action>
+
+ <action id="srpm">
<depends>rpm-setup</depends>
- </action>
-
- <action id="srpm">
<command>cd /usr/src/redhat/SPECS</command>
<command>rpmbuild -bs mysql++.spec</command>
- <depends>rpm-setup</depends>
</action>
<action id="ebuild">
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
