svn commit: r1605223 - in /ofbiz/trunk: framework/base/build.xml framework/sql/build.xml macros.xml

[doogie-3]

Author: doogie
Date: Tue Jun 24 23:21:05 2014
New Revision: 1605223

URL: http://svn.apache.org/r1605223
Log:
Remove sourcepathref from default-javac; in build.xml that did *not*
create a src-dir patternset, the default *empty* src-dir pattern set was
used.  Then, when javac would compile src/**/*.jar, it would *also*
compile any *other* java files it happened to find in the folder.

In other words, if there was an unpacked tree, let's say named 'p', and
there was a set of folders in there that eventually had java files, they
would all get compiled.

Modified:
    ofbiz/trunk/framework/base/build.xml
    ofbiz/trunk/framework/sql/build.xml
    ofbiz/trunk/macros.xml

Modified: ofbiz/trunk/framework/base/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/build.xml?rev=1605223&r1=1605222&r2=1605223&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/build.xml (original)
+++ ofbiz/trunk/framework/base/build.xml Tue Jun 24 23:21:05 2014
@@ -36,9 +36,6 @@ under the License.
         <fileset dir="${lib.dir}/scripting" includes="*.jar"/>
         <fileset dir="../start/build/lib" includes="*.jar"/>
     </path>
-    <patternset id="src-dirs">
-        <include name="build/gen-src/javacc"/>
-    </patternset>
 
     <filelist id="test.classes" dir="${src.dir}">
         <file name="org/ofbiz/base/lang/test/ComparableRangeTests.java"/>
@@ -87,7 +84,13 @@ under the License.
     </target>
 
     <target name="classes" depends="prepare,gen-src">
-        <javac16/>
+        <javac16>
+            <sourcepath>
+                <dirset dir="build/gen-src">
+                    <include name="javacc"/>
+                </dirset>
+            </sourcepath>
+        </javac16>
     </target>
 
     <target name="jar" depends="classes">

Modified: ofbiz/trunk/framework/sql/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/build.xml?rev=1605223&r1=1605222&r2=1605223&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/build.xml (original)
+++ ofbiz/trunk/framework/sql/build.xml Tue Jun 24 23:21:05 2014
@@ -33,10 +33,6 @@ under the License.
         <fileset dir="../base/lib" includes="*.jar"/>
         <fileset dir="../base/build/lib" includes="*.jar"/>
     </path>
-    <patternset id="src-dirs">
-        <include name="build/gen-src/javacc"/>
-        <include name="build/gen-src/jjtree"/>
-    </patternset>
     <path id="test.class.path">
         <path refid="local.class.path"/>
        <fileset dir="../base/lib" includes="*.jar"/>
@@ -61,7 +57,14 @@ under the License.
     </target>
 
     <target name="classes" depends="prepare,gen-src">
-        <javac16/>
+        <javac16>
+            <sourcepath>
+                <dirset dir="build/gen-src">
+                    <include name="javacc"/>
+                    <include name="jjtree"/>
+                </dirset>
+            </sourcepath>
+        </javac16>
     </target>
 
     <target name="jar" depends="classes">

Modified: ofbiz/trunk/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=1605223&r1=1605222&r2=1605223&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Tue Jun 24 23:21:05 2014
@@ -42,12 +42,6 @@ under the License.
   </sequential>
  </macrodef>
 
- <path id="src-path">
-  <dirset dir=".">
-   <patternset refid="src-dirs"/>
-  </dirset>
- </path>
- <patternset id="src-dirs"/>
  <patternset id="src.inc.set">
   <include name="**/*.java"/>
  </patternset>
@@ -85,7 +79,7 @@ under the License.
  </presetdef>
 
  <presetdef name="javac16">
-  <default-javac compiler="javac1.6" target="1.6" source="1.6" encoding="UTF-8" sourcepathref="src-path" includeantruntime="false">
+  <default-javac compiler="javac1.6" target="1.6" source="1.6" encoding="UTF-8" includeantruntime="false">
    <compilerarg value="-Xlint:-path"/>
    <!--
    Please leave this line here.  It makes it easier to enable/disable it.