From: John David Duncan
Date: May 17 2011 5:58pm
Subject: bzr commit into mysql-5.1-telco-7.1 branch (john.duncan:4200)
List-Archive: http://lists.mysql.com/commits/137615
Message-Id: <201105171758.p4HHwLwe007754@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0092997516=="

--===============0092997516==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/jdd/bzr-repo/working/mysql-5.1-telco-7.1/ based on revid:jonas@stripped

 4200 John David Duncan	2011-05-17
      Attempt to fix CLASSPATH issues with ndb.clusterj test on Windows.
      Fix dependency tracking for Make in clusterj.

    modified:
      mysql-test/suite/ndb/include/have_connectorj.inc
      mysql-test/suite/ndb/include/have_junit.inc
      storage/ndb/clusterj/Makefile.am
=== modified file 'mysql-test/suite/ndb/include/have_connectorj.inc'
--- a/mysql-test/suite/ndb/include/have_connectorj.inc	2011-05-12 20:06:27 +0000
+++ b/mysql-test/suite/ndb/include/have_connectorj.inc	2011-05-17 17:57:32 +0000
@@ -1,6 +1,9 @@
 --perl
 use strict;
 use IO::File;
+use lib "lib/";
+use My::Platform;
+
 
 #
 # Looks for MySQL Connector/J JAR file in MTR_CLASSPATH
@@ -11,11 +14,14 @@ my $classpath = $ENV{'MTR_CLASSPATH'} ||
 my $vardir = $ENV{MYSQLTEST_VARDIR} or die "Need MYSQLTEST_VARDIR";
 my $jar;
 my $notfound;
+my $sep = (IS_WINDOWS) ? ';' : ':';
+
 
 # -- look for the Connctor/J jar file
-foreach $jar (split ':', $classpath) {
+foreach $jar (split $sep, $classpath) {
   if($jar =~ m/mysql-connector/  && -f $jar) {
     $ok = 2;
+    last;
   }
   elsif($jar =~ m/mysql-connector/) {
     $ok = 1;

=== modified file 'mysql-test/suite/ndb/include/have_junit.inc'
--- a/mysql-test/suite/ndb/include/have_junit.inc	2011-05-12 16:04:16 +0000
+++ b/mysql-test/suite/ndb/include/have_junit.inc	2011-05-17 17:57:32 +0000
@@ -1,17 +1,21 @@
 --perl
 use strict;
 use IO::File;
+use lib "lib/";
+use My::Platform;
 
 my $ok = 0;
 my $classpath = $ENV{'MTR_CLASSPATH'} || '';
 my $vardir = $ENV{MYSQLTEST_VARDIR} or die "Need MYSQLTEST_VARDIR";
 my $jar;
 my $notfound;
+my $sep = (IS_WINDOWS) ? ';' : ':';
 
 # -- look for the junit jar file
-foreach $jar (split ':', $classpath) {
+foreach $jar (split $sep, $classpath) {
   if($jar =~ m/junit/  && -f $jar) {
     $ok = 2;
+    last;
   }
   elsif($jar =~ m/junit/) {
     $ok = 1;

=== modified file 'storage/ndb/clusterj/Makefile.am'
--- a/storage/ndb/clusterj/Makefile.am	2011-02-21 11:53:51 +0000
+++ b/storage/ndb/clusterj/Makefile.am	2011-05-17 17:57:32 +0000
@@ -38,6 +38,10 @@ clusterj_DATA = $(clusterj_version_jar)
 
 EXTRA_DIST = pom.xml CMakeLists.txt
 
+class_timestamps = clusterj-api/classclusterj_api.stamp \
+                   clusterj-core/classclusterj_core.stamp \
+                   clusterj-tie/classclusterj_tie.stamp
+
 $(CLUSTERJ_MANIFEST):
 	echo "Manifest-Version: 1.0"  > $(CLUSTERJ_MANIFEST)
 	echo "Export-Package: $(CLUSTERJ_EXPORT)"  >> $(CLUSTERJ_MANIFEST) 
@@ -45,7 +49,7 @@ $(CLUSTERJ_MANIFEST):
 	echo "Bundle-Description: ClusterJ"  >> $(CLUSTERJ_MANIFEST)
 
 # make both clusterj and clusterjpa jar (the latter optional based on OPENJPA_OPT)
-$(clusterj_version_jar) : $(BASE_DIRS) $(CLUSTERJ_TESTS) $(OPENJPA_OPT) $(CLUSTERJ_MANIFEST)
+$(clusterj_version_jar) : $(BASE_DIRS) $(CLUSTERJ_TESTS) $(OPENJPA_OPT) $(CLUSTERJ_MANIFEST) $(class_timestamps)
 	rm -f $(clusterj_version_jar); \
 	@JAR@ cvfm $(clusterj_version_jar) $(CLUSTERJ_MANIFEST); \
 	for i in $(BASE_DIRS); do \


--===============0092997516==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/john.duncan@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: john.duncan@stripped
# target_branch: file:///Users/jdd/bzr-repo/working/mysql-5.1-telco-\
#   7.1/
# testament_sha1: a7a9b0fc18f42f1e860588aa53e563886054c9ff
# timestamp: 2011-05-17 10:58:16 -0700
# base_revision_id: jonas@stripped
# 
# Begin bundle
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
ArcDr0A=


--===============0092997516==--