Author: wyoung
Date: Tue Jul 22 18:48:34 2008
New Revision: 2308

URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2308&view=rev
Log:
- Creating vc2008 subdir as a copy of vc2005/*, updated only when 2005
  version is newer or 2008 version is missing.
- dist target complains (but does not fail) if vc2008/*.sln isn't
  converted.  Such a file isn't suited for public distribution, but is
  okay for building RPMs and such.

Added:
    trunk/checkvc8   (with props)
Modified:
    trunk/Wishlist
    trunk/bootstrap
    trunk/mysql++.bkl

Modified: trunk/Wishlist
URL: 
http://svn.gna.org/viewcvs/mysqlpp/trunk/Wishlist?rev=2308&r1=2307&r2=2308&view=diff
==============================================================================
--- trunk/Wishlist (original)
+++ trunk/Wishlist Tue Jul 22 18:48:34 2008
@@ -4,24 +4,11 @@
 
 Any Version
 -----------
-    o Until Bakefile comes out with VS2008 support, add rules to
-      maintain a vc2008 subdirectory with copies of the project files
-      in vc2005 subdirectory.  Use Bakefile rules instead of ham-handed
-      copying in bootstrap script so that if these files are updated
-      after being cloned from vc2005, they're left alone.  This lets
-      me hand-convert them before making the distribution tarball.
-      Then, update README-Visual-C++.txt to cover new vc2008 directory.
+    o In web site Makefile, extract vc2008/*.sln to stdout, piping
+         through grep to check that it is converted from vc2005.  Fail
+         site build if not.
 
-    o In dist target, emit big warning message if vc2008/mysql++.sln
-      doesn't show that it's been converted.  Not fatal: just means
-      that uploading that particular tarball to the public server
-      isn't a great idea.
-
-    o Make similar test in web site Makefile?  Can extract this file
-      in the same way we do the ChangeLog.  If not converted at that
-      point, it *is* fatal.
-
-       o If pkg-config available, register ourselves with it using
+       o If pkg-config is available, register ourselves with it using
          information discovered by configure.  Also, write out a
          mysql++-config script, which either wraps pkg-config or
          reinvents it, poorly, for systems that don't have it.

Modified: trunk/bootstrap
URL: 
http://svn.gna.org/viewcvs/mysqlpp/trunk/bootstrap?rev=2308&r1=2307&r2=2308&view=diff
==============================================================================
--- trunk/bootstrap (original)
+++ trunk/bootstrap Tue Jul 22 18:48:34 2008
@@ -51,10 +51,11 @@
 
 # Do Bakefile stuff first
 set -x &&
-       mkdir -p vc2003 vc2005 &&
+       for d in 3 5 8 ; do mkdir -p vc200$d ; done &&
        bakefilize &&
        bakefile_gen $BF_OPTIONS &&
        bakefile -f gnu -o Makefile.simple -DBUILDLIBRARY=no mysql++.bkl &&
+       find vc2005 -maxdepth 1 -type f -exec cp -u {} vc2008 \; &&
        set +x &&
        success=shonuff
 

Added: trunk/checkvc8
URL: http://svn.gna.org/viewcvs/mysqlpp/trunk/checkvc8?rev=2308&view=auto
==============================================================================
--- trunk/checkvc8 (added)
+++ trunk/checkvc8 Tue Jul 22 18:48:34 2008
@@ -1,0 +1,10 @@
+#!/bin/sh
+if grep -q 'Format Version 9.00' vc2008/*.sln
+then
+       echo
+       echo
+       echo WARNING: vc2008/*.sln not converted yet!
+       echo
+       echo
+       sleep 3
+fi

Propchange: trunk/checkvc8
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/mysql++.bkl
URL: 
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.bkl?rev=2308&r1=2307&r2=2308&view=diff
==============================================================================
--- trunk/mysql++.bkl (original)
+++ trunk/mysql++.bkl Tue Jul 22 18:48:34 2008
@@ -499,6 +499,7 @@
 
                <action id="dist">
             <depends>$(PKGNAME)</depends>
+                       <command>checkvc8</command>
             <command>tar czf $(PKGNAME).tar.gz $(PKGNAME)</command>
             <command>rm -rf $(PKGNAME)</command>
         </action>


_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits

Reply via email to