From: mmatthews
Date: December 20 2005 11:12pm
Subject: Connector/J commit: r4720 - branches/branch_3_1/connector-j
List-Archive: http://lists.mysql.com/commits/304
Message-Id: <200512202312.jBKNCmWI017406@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Modified:
   branches/branch_3_1/connector-j/CHANGES
   branches/branch_3_1/connector-j/build.xml
Log:


Modified: branches/branch_3_1/connector-j/CHANGES
===================================================================
--- branches/branch_3_1/connector-j/CHANGES	2005-12-20 19:52:31 UTC (rev 4719)
+++ branches/branch_3_1/connector-j/CHANGES	2005-12-20 23:12:45 UTC (rev 4720)
@@ -17,6 +17,9 @@
       
     - Fixed BUG#11874 - ResultSet.getShort() for UNSIGNED TINYINT
       returned wrong values. 
+      
+    - Fixed BUG#15676 - lib-nodist directory missing from  
+      package breaks out-of-box build
     
 11-30-05 - Version 3.1.12
 

Modified: branches/branch_3_1/connector-j/build.xml
===================================================================
--- branches/branch_3_1/connector-j/build.xml	2005-12-20 19:52:31 UTC (rev 4719)
+++ branches/branch_3_1/connector-j/build.xml	2005-12-20 23:12:45 UTC (rev 4720)
@@ -74,6 +74,12 @@
 	<target name="init" depends="-init-copy, -init-no-crypto">
 		<!-- Check that files needed to generate documentation are in place -->
 
+		<!-- We need the following for source distributions as there we
+             can't dynamically alter the classpath, and not having this
+		     directory present causes the build to fail -->
+
+		<mkdir dir="${buildDir}/${fullProdName}/lib-nodist" />
+
 		<available file="${com.mysql.jdbc.docs.sourceDir}" property="com.mysql.jdbc.docs.sourcesPresent" />
 
 		<available classname="com.mchange.v2.c3p0.QueryConnectionTester" 
@@ -122,9 +128,9 @@
 	</target>
 
 	<target name="-init-no-crypto" depends="-init-copy" if="com.mysql.jdbc.noCryptoBuild">
-		<copy file="${sourceDir}//lib-nodist/ExportControlledNoCrypto.notjava"
+		<copy file="${sourceDir}/lib-nodist/ExportControlledNoCrypto.notjava"
 			toFile="${buildDir}/${fullProdName}/com/mysql/jdbc/ExportControlled.java"
-			overwrite="true"/>
+			overwrite="true" />
 	</target>
 
 	<!--