Modified:
branches/branch_3_1/connector-j/build.xml
branches/branch_5_0/connector-j/build.xml
tags/v_3_1_14/connector-j/build.xml
trunk/connector-j/build.xml
Log:
Cleaned up handling of commercially-licensed builds.
Modified: branches/branch_3_1/connector-j/build.xml
===================================================================
--- branches/branch_3_1/connector-j/build.xml 2006-10-18 18:53:40 UTC (rev 5897)
+++ branches/branch_3_1/connector-j/build.xml 2006-10-18 20:13:56 UTC (rev 5898)
@@ -252,6 +252,30 @@
<fixcrlf srcdir="${packageDest}"
tab="remove" tablength="8"
eol="lf" includes="**/README"/>
+
+ <if>
+ <isset property="com.mysql.jdbc.commercialBuild"/>
+ <then>
+ <!-- These are the GPL and FLOSS exceptions. They don't get shipped with
+ commercial builds -->
+
+ <delete file="${packageDest}/COPYING"/>
+ <delete file="${packageDest}/EXCEPTIONS-CONNECTOR-J"/>
+
+ <!-- Pull in the commercial license itself -->
+
+ <copy file="${sourceDir}/lib-nodist/MySQLEULA.txt" toDir="${packageDest}"/>
+
+ <loadfile property="commercialLicenseText"
+ srcFile="${sourceDir}/lib-nodist/commercialLicense.txt"/>
+ <replaceregexp
+ match="Copyright.*1307.[^replaceregexp]*USA"
+ replace="${commercialLicenseText}"
+ flags="s">
+ <fileset dir="${buildDir}/${fullProdName}" includes="**/*"/>
+ </replaceregexp>
+ </then>
+ </if>
</target>
<target name="dist" depends="init, compile"
@@ -542,11 +566,11 @@
</target>
- <target name="compile" depends="init, -commercial-license, compile-driver, compile-testsuite, compile.integration"
+ <target name="compile" depends="init, compile-driver, compile-testsuite, compile.integration"
description="Compiles the driver, testsuite, and integration classes.">
</target>
- <target name="compile-trace" depends="init, -commercial-license, -compile-driver-trace"
+ <target name="compile-trace" depends="init, -compile-driver-trace"
description="Compiles the debug/trace variant of the driver.">
</target>
@@ -698,30 +722,6 @@
<delete file="${docsErrorXslTempfile}"/>
</target>
- <!-- Replaces copyright/license banner at the top of every source
- file -->
-
- <target name="-commercial-license" depends="init" if="com.mysql.jdbc.commercialBuild">
- <!-- These are the GPL and FLOSS exceptions. They don't get shipped with
- commercial builds -->
-
- <delete file="${buildDir}/${fullProdName}/COPYING"/>
- <delete file="${buildDir}/${fullProdName}/EXCEPTIONS-CONNECTOR-J"/>
-
- <!-- Pull in the commercial license itself -->
-
- <copy file="${sourceDir}/lib-nodist/MySQLEULA.txt" toDir="${buildDir}/${fullProdName}"/>
-
- <loadfile property="commercialLicenseText"
- srcFile="${sourceDir}/lib-nodist/commercialLicense.txt"/>
- <replaceregexp
- match="Copyright.*1307.[^replaceregexp]*USA"
- replace="${commercialLicenseText}"
- flags="s">
- <fileset dir="${buildDir}/${fullProdName}" includes="**/*"/>
- </replaceregexp>
- </target>
-
<!--
Targets below this point are for code coverage and depend on
the 'Emma' project which you can download from
Modified: branches/branch_5_0/connector-j/build.xml
===================================================================
--- branches/branch_5_0/connector-j/build.xml 2006-10-18 18:53:40 UTC (rev 5897)
+++ branches/branch_5_0/connector-j/build.xml 2006-10-18 20:13:56 UTC (rev 5898)
@@ -254,6 +254,30 @@
<fixcrlf srcdir="${packageDest}"
tab="remove" tablength="8"
eol="lf" includes="**/README"/>
+
+ <if>
+ <isset property="com.mysql.jdbc.commercialBuild"/>
+ <then>
+ <!-- These are the GPL and FLOSS exceptions. They don't get shipped with
+ commercial builds -->
+
+ <delete file="${packageDest}/COPYING"/>
+ <delete file="${packageDest}/EXCEPTIONS-CONNECTOR-J"/>
+
+ <!-- Pull in the commercial license itself -->
+
+ <copy file="${sourceDir}/lib-nodist/MySQLEULA.txt" toDir="${packageDest}"/>
+
+ <loadfile property="commercialLicenseText"
+ srcFile="${sourceDir}/lib-nodist/commercialLicense.txt"/>
+ <replaceregexp
+ match="Copyright.*1307.[^replaceregexp]*USA"
+ replace="${commercialLicenseText}"
+ flags="s">
+ <fileset dir="${buildDir}/${fullProdName}" includes="**/*"/>
+ </replaceregexp>
+ </then>
+ </if>
</target>
<target name="dist" depends="init, compile">
@@ -578,11 +602,10 @@
</target>
-
- <target name="compile" depends="init, -commercial-license, compile-driver, compile-testsuite, compile.integration">
+ <target name="compile" depends="init, compile-driver, compile-testsuite, compile.integration">
</target>
- <target name="compile-trace" depends="init, -commercial-license, compile-driver-trace">
+ <target name="compile-trace" depends="init, compile-driver-trace">
</target>
<!-- Compiles the driver itself -->
@@ -725,30 +748,6 @@
<delete file="${docsErrorXslTempfile}"/>
</target>
- <!-- Replaces copyright/license banner at the top of every source
- file -->
-
- <target name="-commercial-license" depends="init" if="com.mysql.jdbc.commercialBuild">
- <!-- These are the GPL and FLOSS exceptions. They don't get shipped with
- commercial builds -->
-
- <delete file="${buildDir}/${fullProdName}/COPYING"/>
- <delete file="${buildDir}/${fullProdName}/EXCEPTIONS-CONNECTOR-J"/>
-
- <!-- Pull in the commercial license itself -->
-
- <copy file="${sourceDir}/lib-nodist/MySQLEULA.txt" toDir="${buildDir}/${fullProdName}"/>
-
- <loadfile property="commercialLicenseText"
- srcFile="${sourceDir}/lib-nodist/commercialLicense.txt"/>
- <replaceregexp
- match="Copyright.*1307.[^replaceregexp]*USA"
- replace="${commercialLicenseText}"
- flags="s">
- <fileset dir="${buildDir}/${fullProdName}" includes="**/*"/>
- </replaceregexp>
- </target>
-
<!--
Targets below this point are for code coverage and depend on
the 'Emma' project which you can download from
Modified: tags/v_3_1_14/connector-j/build.xml
===================================================================
--- tags/v_3_1_14/connector-j/build.xml 2006-10-18 18:53:40 UTC (rev 5897)
+++ tags/v_3_1_14/connector-j/build.xml 2006-10-18 20:13:56 UTC (rev 5898)
@@ -252,6 +252,30 @@
<fixcrlf srcdir="${packageDest}"
tab="remove" tablength="8"
eol="lf" includes="**/README"/>
+
+ <if>
+ <isset property="com.mysql.jdbc.commercialBuild"/>
+ <then>
+ <!-- These are the GPL and FLOSS exceptions. They don't get shipped with
+ commercial builds -->
+
+ <delete file="${packageDest}/COPYING"/>
+ <delete file="${packageDest}/EXCEPTIONS-CONNECTOR-J"/>
+
+ <!-- Pull in the commercial license itself -->
+
+ <copy file="${sourceDir}/lib-nodist/MySQLEULA.txt" toDir="${packageDest}"/>
+
+ <loadfile property="commercialLicenseText"
+ srcFile="${sourceDir}/lib-nodist/commercialLicense.txt"/>
+ <replaceregexp
+ match="Copyright.*1307.[^replaceregexp]*USA"
+ replace="${commercialLicenseText}"
+ flags="s">
+ <fileset dir="${buildDir}/${fullProdName}" includes="**/*"/>
+ </replaceregexp>
+ </then>
+ </if>
</target>
<target name="dist" depends="init, compile"
@@ -542,11 +566,11 @@
</target>
- <target name="compile" depends="init, -commercial-license, compile-driver, compile-testsuite, compile.integration"
+ <target name="compile" depends="init, compile-driver, compile-testsuite, compile.integration"
description="Compiles the driver, testsuite, and integration classes.">
</target>
- <target name="compile-trace" depends="init, -commercial-license, -compile-driver-trace"
+ <target name="compile-trace" depends="init, -compile-driver-trace"
description="Compiles the debug/trace variant of the driver.">
</target>
@@ -698,30 +722,6 @@
<delete file="${docsErrorXslTempfile}"/>
</target>
- <!-- Replaces copyright/license banner at the top of every source
- file -->
-
- <target name="-commercial-license" depends="init" if="com.mysql.jdbc.commercialBuild">
- <!-- These are the GPL and FLOSS exceptions. They don't get shipped with
- commercial builds -->
-
- <delete file="${buildDir}/${fullProdName}/COPYING"/>
- <delete file="${buildDir}/${fullProdName}/EXCEPTIONS-CONNECTOR-J"/>
-
- <!-- Pull in the commercial license itself -->
-
- <copy file="${sourceDir}/lib-nodist/MySQLEULA.txt" toDir="${buildDir}/${fullProdName}"/>
-
- <loadfile property="commercialLicenseText"
- srcFile="${sourceDir}/lib-nodist/commercialLicense.txt"/>
- <replaceregexp
- match="Copyright.*1307.[^replaceregexp]*USA"
- replace="${commercialLicenseText}"
- flags="s">
- <fileset dir="${buildDir}/${fullProdName}" includes="**/*"/>
- </replaceregexp>
- </target>
-
<!--
Targets below this point are for code coverage and depend on
the 'Emma' project which you can download from
Modified: trunk/connector-j/build.xml
===================================================================
--- trunk/connector-j/build.xml 2006-10-18 18:53:40 UTC (rev 5897)
+++ trunk/connector-j/build.xml 2006-10-18 20:13:56 UTC (rev 5898)
@@ -261,6 +261,30 @@
<fixcrlf srcdir="${packageDest}"
tab="remove" tablength="8"
eol="lf" includes="**/README"/>
+
+ <if>
+ <isset property="com.mysql.jdbc.commercialBuild"/>
+ <then>
+ <!-- These are the GPL and FLOSS exceptions. They don't get shipped with
+ commercial builds -->
+
+ <delete file="${packageDest}/COPYING"/>
+ <delete file="${packageDest}/EXCEPTIONS-CONNECTOR-J"/>
+
+ <!-- Pull in the commercial license itself -->
+
+ <copy file="${sourceDir}/lib-nodist/MySQLEULA.txt" toDir="${packageDest}"/>
+
+ <loadfile property="commercialLicenseText"
+ srcFile="${sourceDir}/lib-nodist/commercialLicense.txt"/>
+ <replaceregexp
+ match="Copyright.*1307.[^replaceregexp]*USA"
+ replace="${commercialLicenseText}"
+ flags="s">
+ <fileset dir="${buildDir}/${fullProdName}" includes="**/*"/>
+ </replaceregexp>
+ </then>
+ </if>
</target>
<target name="dist" depends="init, compile">
@@ -586,10 +610,10 @@
</target>
- <target name="compile" depends="init, -commercial-license, compile-driver, compile-testsuite, compile.integration">
+ <target name="compile" depends="init, compile-driver, compile-testsuite, compile.integration">
</target>
- <target name="compile-trace" depends="init, -commercial-license, compile-driver-trace">
+ <target name="compile-trace" depends="init, compile-driver-trace">
</target>
<!-- Compiles the driver itself -->
@@ -732,30 +756,6 @@
<delete file="${docsErrorXslTempfile}"/>
</target>
- <!-- Replaces copyright/license banner at the top of every source
- file -->
-
- <target name="-commercial-license" depends="init" if="com.mysql.jdbc.commercialBuild">
- <!-- These are the GPL and FLOSS exceptions. They don't get shipped with
- commercial builds -->
-
- <delete file="${buildDir}/${fullProdName}/COPYING"/>
- <delete file="${buildDir}/${fullProdName}/EXCEPTIONS-CONNECTOR-J"/>
-
- <!-- Pull in the commercial license itself -->
-
- <copy file="${sourceDir}/lib-nodist/MySQLEULA.txt" toDir="${buildDir}/${fullProdName}"/>
-
- <loadfile property="commercialLicenseText"
- srcFile="${sourceDir}/lib-nodist/commercialLicense.txt"/>
- <replaceregexp
- match="Copyright.*1307.[^replaceregexp]*USA"
- replace="${commercialLicenseText}"
- flags="s">
- <fileset dir="${buildDir}/${fullProdName}" includes="**/*"/>
- </replaceregexp>
- </target>
-
<!--
Targets below this point are for code coverage and depend on
the 'Emma' project which you can download from
| Thread |
|---|
| • Connector/J commit: r5898 - branches/branch_3_1/connector-j branches/branch_5_0/connector-j tags/v_3_1_14/connector-j trunk/connector-j | mmatthews | 18 Oct |
