Adjust to new source location (src/org --> src/java/org)

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196063 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index 984684b29d9b2be558135732ea119cc258f298fa..aa3766756fcba9bfeaf826caf38acaaf542e595b 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -144,17 +144,18 @@ list of possible build targets.
     <property name="textfontencoding" value="WinAnsiEncoding"/>
 
     <property name="src.dir" value="./src"/>
-    <property name="src.codegen" value="./src/codegen"/>
+    <property name="src.java" value="${src.dir}/java"/>
+    <property name="src.codegen" value="${src.dir}/codegen"/>
     <property name="docs.dir" value="./docs"/>
-    <property name="xdocs.dir" value="./src/documentation/content/xdocs"/>
+    <property name="xdocs.dir" value="${src.dir}/documentation/content/xdocs"/>
     <property name="fo.examples.dir" value="./examples/fo/basic"/>
     <property name="lib.dir" value="./lib"/>
-    <property name="hyph.dir" value="./src/hyph"/>
+    <property name="hyph.dir" value="${src.dir}/hyph"/>
     <property name="conf.dir" value="./conf"/>
     <property name="packages" value="org.apache.fop.*"/>
 
-    <property name="viewer.resources.src.dir" value="./src/org/apache/fop/viewer/resources"/>
-    <property name="viewer.images.src.dir" value="./src/org/apache/fop/viewer/Images"/>
+    <property name="viewer.resources.src.dir" value="${src.java}/org/apache/fop/viewer/resources"/>
+    <property name="viewer.images.src.dir" value="${src.java}/org/apache/fop/viewer/Images"/>
 
     <property name="build.dir" value="./build"/>
     <property name="build.src" value="./build/src"/>
@@ -368,7 +369,7 @@ list of possible build targets.
     <!-- prepare JDK dependant files -->
     <copy todir="${build.gensrc}" filtering="on">
       <mapper type="glob" from="*.javat" to="*.java"/>
-      <fileset dir="${src.dir}">
+      <fileset dir="${src.java}">
         <include name="**/*.javat"/>
       </fileset>
     </copy>
@@ -394,7 +395,7 @@ list of possible build targets.
 
     <javac destdir="${build.dest}" debug="${debug}" deprecation="${deprecation}" optimize="${optimize}">
       <src path="${build.gensrc}"/>
-      <src path="${src.dir}"/>
+      <src path="${src.java}"/>
       <classpath refid="libs-build-classpath"/>
       <patternset refid="base-sources"/>
     </javac>
@@ -403,7 +404,7 @@ list of possible build targets.
   <target name="compile-jimi" depends="compile-src" if="jimi.present">
     <echo message="Jimi library is present. Fop installs jimi support."/>
     <javac destdir="${build.dest}" debug="${debug}" deprecation="${deprecation}" optimize="${optimize}">
-      <src path="${src.dir}"/>
+      <src path="${src.java}"/>
       <classpath refid="libs-build-classpath"/>
       <include name="**/${jimi}"/>
     </javac>
@@ -412,7 +413,7 @@ list of possible build targets.
   <target name="compile-jai" depends="compile-src" if="jai.present">
     <echo message="JAI library is present. Fop installs JAI support."/>
     <javac destdir="${build.dest}" debug="${debug}" deprecation="${deprecation}" optimize="${optimize}">
-      <src path="${src.dir}"/>
+      <src path="${src.java}"/>
       <classpath refid="libs-build-classpath"/>
       <include name="**/${jai}"/>
     </javac>
@@ -563,7 +564,7 @@ list of possible build targets.
         overview="${src.dir}/overview.html"
         failonerror="true">
       <sourcepath>
-        <pathelement path="${src.dir}"/>
+        <pathelement path="${src.java}"/>
         <pathelement path="${build.gensrc}"/>
       </sourcepath>
     </javadoc>
@@ -625,7 +626,7 @@ list of possible build targets.
     <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" classpathref="checkstylepath"/>
 
     <checkstyle properties="checkstyle.cfg" failonviolation="false">
-      <fileset dir="${src.dir}" includes="org/apache/fop/**/*.java"/>
+      <fileset dir="${src.java}" includes="org/apache/fop/**/*.java"/>
       <formatter type="plain" toFile="${build.dir}/checkstyle_report.txt"/>
       <formatter type="xml" toFile="${build.dir}/checkstyle_report.xml"/>
     </checkstyle>

diff --git a/buildtools.xml b/buildtools.xml
index 65cbbaa294c6916ac564e49ff3ad0349fa3f31a8..386335c650495f9cbc4867fd98e8274195b95927 100644 (file)
--- a/buildtools.xml
+++ b/buildtools.xml
@@ -17,6 +17,7 @@
 <project default="buildtools" basedir=".">
   <target name="init">
    <property name="src.dir" value="./src"/>
+   <property name="src.java" value="${src.dir}/java"/>
    <property name="build.src" value="./lib/src"/>
    <property name="build.dest" value="./lib/classes"/>
 
@@ -45,7 +46,7 @@
 
    <target name="prepare.src" depends="prepare.trax">
      <copy todir="${build.src}">
-       <fileset dir="${src.dir}"
+       <fileset dir="${src.java}"
           includes="${tools}/**,${hyph}/**"
           excludes="${tools}/anttasks/Fop.java,${tools}/TestConverter.java,${tools}/AreaTreeBuilder.java,${hyph}/Hyphenator.java,**/${trax}"/>
      </copy>
@@ -54,7 +55,7 @@
    <target name="prepare.trax" if="trax.present">
      <echo message="JAXP1.1 transforms is present. Installing TRaX support"/>
      <copy todir="${build.src}">
-       <fileset dir="${src.dir}"
+       <fileset dir="${src.java}"
           includes="**/${trax}"/>
      </copy>
    </target>