harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r795857 - in /harmony/enhanced/classlib/trunk/modules: auth/build.xml awt/build.xml luni/build.xml nio/build.xml print/build.xml security/build.xml swing/build.xml
Date Mon, 20 Jul 2009 14:27:30 GMT
Author: hindessm
Date: Mon Jul 20 14:27:30 2009
New Revision: 795857

URL: http://svn.apache.org/viewvc?rev=795857&view=rev
Log:
Remove remaining hy.<module>.blah defines.

Modified:
    harmony/enhanced/classlib/trunk/modules/auth/build.xml
    harmony/enhanced/classlib/trunk/modules/awt/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/build.xml
    harmony/enhanced/classlib/trunk/modules/nio/build.xml
    harmony/enhanced/classlib/trunk/modules/print/build.xml
    harmony/enhanced/classlib/trunk/modules/security/build.xml
    harmony/enhanced/classlib/trunk/modules/swing/build.xml

Modified: harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/build.xml?rev=795857&r1=795856&r2=795857&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/build.xml Mon Jul 20 14:27:30 2009
@@ -30,12 +30,6 @@
 
     <!-- set global properties for this build. -->
 
-    <property name="hy.auth.src.main.java.platform"
-              value="src/main/java/common/../${hy.os.family}" />
-
-    <property name="hy.auth.src.test.java.platform"
-              value="src/test/java/common/../${hy.os.family}" />
-
     <fileset id="classes" dir="../../build/classes">
         <or>
             <present targetdir="src/main/java/common" />
@@ -44,8 +38,8 @@
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
             </present>
-            <present targetdir="${hy.auth.src.main.java.platform}" />
-            <present targetdir="${hy.auth.src.main.java.platform}">
+            <present targetdir="src/main/java/${hy.os.family}" />
+            <present targetdir="src/main/java/${hy.os.family}">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -129,7 +123,7 @@
 
             <src>
                 <pathelement location="src/main/java/common"/>
-                <pathelement location="${hy.auth.src.main.java.platform}" />
+                <pathelement location="src/main/java/${hy.os.family}" />
             </src>
 
             <bootclasspath>
@@ -163,7 +157,7 @@
 
         <jar destfile="${hy.jdk}/jre/lib/boot/auth-src.jar">
             <fileset dir="src/main/java/common" />
-            <fileset dir="${hy.auth.src.main.java.platform}" />
+            <fileset dir="src/main/java/${hy.os.family}" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -208,7 +202,7 @@
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java/common"/>
-                    <pathelement location="${hy.auth.src.test.java.platform}"/>
+                    <pathelement location="src/test/java/${hy.os.family}"/>
                 </src>
             </javac-elements>
         </compile-tests>

Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?rev=795857&r1=795856&r2=795857&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Mon Jul 20 14:27:30 2009
@@ -29,12 +29,6 @@
 
     <!-- set global properties for this build. -->
 
-    <property name="hy.awt.src.main.java.platform"
-              value="src/main/java/common/../${hy.os.family}" />
-
-    <property name="hy.awt.src.test.impl.platform"
-              value="src/test/impl/${hy.os.family}" />
-
     <fileset id="classes" dir="../../build/classes">
         <or>
             <present targetdir="src/main/java/common" />
@@ -43,8 +37,8 @@
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
             </present>
-            <present targetdir="${hy.awt.src.main.java.platform}" />
-            <present targetdir="${hy.awt.src.main.java.platform}">
+            <present targetdir="src/main/java/${hy.os.family}" />
+            <present targetdir="src/main/java/${hy.os.family}">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -105,7 +99,7 @@
 
             <src>
                 <pathelement location="src/main/java/common"/>
-                <pathelement location="${hy.awt.src.main.java.platform}" />
+                <pathelement location="src/main/java/${hy.os.family}" />
             </src>
 
             <bootclasspath>
@@ -151,7 +145,7 @@
 
         <jar destfile="${hy.jdk}/jre/lib/boot/awt-src.jar">
             <fileset dir="src/main/java/common" />
-            <fileset dir="${hy.awt.src.main.java.platform}" />
+            <fileset dir="src/main/java/${hy.os.family}" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -375,7 +369,7 @@
     </target>
 
     <target name="compile-tests">
-        <compile-tests description="awt impl tests"
+        <compile-tests description="awt boot tests"
                        destdir="bin/test/boot">
             <javac-elements>
                 <src>
@@ -383,12 +377,12 @@
                 </src>
             </javac-elements>
         </compile-tests>
-        <compile-tests description="awt api tests"
+        <compile-tests description="awt tests"
                        destdir="bin/test/classes">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/api/java" />
-                    <pathelement location="${hy.awt.src.test.impl.platform}" />
+                    <pathelement location="src/test/impl/${hy.os.family}" />
                 </src>
             </javac-elements>
         </compile-tests>

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=795857&r1=795856&r2=795857&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Mon Jul 20 14:27:30 2009
@@ -29,10 +29,6 @@
 
     <!-- set global properties for this build. -->
 
-    <property name="hy.luni.src.test.api.java.platform"
-        value="src/test/api/${hy.os.family}" />
-    <property name="hy.luni.src.test.impl.java.platform"
-        value="src/test/impl/${hy.os.family}" />
     <fileset id="classes" dir="../../build/classes">
         <or>
             <present targetdir="src/main/java" />
@@ -359,7 +355,7 @@
             <javac-elements>
                 <src>
                     <pathelement location="src/test/api/common" />
-                    <pathelement location="${hy.luni.src.test.api.java.platform}" />
+                    <pathelement location="src/test/api/${hy.os.family}" />
                 </src>
                 <include name="**/*.java" />
             </javac-elements>
@@ -367,8 +363,8 @@
         <compile-tests description="luni impl tests" destdir="bin/test/impl">
             <javac-elements>
                 <src>
-                    <pathelement location="src/test/impl/common" />
-                    <pathelement location="${hy.luni.src.test.impl.java.platform}" />
+                   <pathelement location="src/test/impl/common" />
+                   <pathelement location="src/test/impl/${hy.os.family}" />
                 </src>
                 <include name="**/*.java" />
             </javac-elements>

Modified: harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/build.xml?rev=795857&r1=795856&r2=795857&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/build.xml Mon Jul 20 14:27:30 2009
@@ -29,12 +29,6 @@
 
     <!-- set global properties for this build. -->
 
-    <property name="hy.nio.src.main.java.platform"
-              value="src/main/java/common/../${hy.os.family}" />
-
-    <property name="hy.nio.src.test.java.platform"
-              value="src/test/java/common/../${hy.os.family}" />
-
     <property file="../../make/depends.properties" />
 
     <property name="tests.hdk.dir" value="${hy.hdk}/build/test/nio" />
@@ -51,8 +45,8 @@
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java" />
             </present>
-            <present targetdir="${hy.nio.src.main.java.platform}" />
-            <present targetdir="${hy.nio.src.main.java.platform}">
+            <present targetdir="src/main/java/${hy.os.family}" />
+            <present targetdir="src/main/java/${hy.os.family}">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java" />
@@ -130,7 +124,7 @@
 
             <src>
                 <pathelement location="src/main/java/common" />
-                <pathelement location="${hy.nio.src.main.java.platform}" />
+                <pathelement location="src/main/java/${hy.os.family}" />
             </src>
 
             <bootclasspath>
@@ -208,7 +202,7 @@
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java/common" />
-                    <pathelement location="${hy.nio.src.test.java.platform}" />
+                    <pathelement location="src/test/java/${hy.os.family}" />
                 </src>
             </javac-elements>
         </compile-tests>

Modified: harmony/enhanced/classlib/trunk/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/build.xml?rev=795857&r1=795856&r2=795857&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/print/build.xml Mon Jul 20 14:27:30 2009
@@ -29,9 +29,6 @@
 
     <!-- set global properties for this build. -->
 
-    <property name="hy.print.src.main.java.platform"
-              value="src/main/java/common/../${hy.os.family}" />
-
     <fileset id="classes" dir="../../build/classes">
         <or>
             <present targetdir="src/main/java/common" />
@@ -40,8 +37,8 @@
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
             </present>
-            <present targetdir="${hy.print.src.main.java.platform}" />
-            <present targetdir="${hy.print.src.main.java.platform}">
+            <present targetdir="src/main/java/${hy.os.family}" />
+            <present targetdir="src/main/java/${hy.os.family}">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -149,7 +146,7 @@
                 dir="src/main/java/common/org/apache/harmony/x/print"
                 includes="javax.print.StreamPrintServiceFactory"/>
             <metainf prefix="META-INF/services"
-                dir="${hy.print.src.main.java.platform}/org/apache/harmony/x/print"
+                dir="src/main/java/${hy.os.family}/org/apache/harmony/x/print"
                 includes="javax.print.PrintServiceLookup"/>
             <fileset refid="classes" />
             <manifest>
@@ -164,10 +161,10 @@
                 dir="src/main/java/common/org/apache/harmony/x/print"
                 includes="javax.print.StreamPrintServiceFactory"/>
             <metainf prefix="META-INF/services"
-                dir="${hy.print.src.main.java.platform}/org/apache/harmony/x/print"
+                dir="src/main/java/${hy.os.family}/org/apache/harmony/x/print"
                 includes="javax.print.PrintServiceLookup"/>
             <fileset dir="src/main/java/common" />
-            <fileset dir="${hy.print.src.main.java.platform}" />
+            <fileset dir="src/main/java/${hy.os.family}" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>

Modified: harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/build.xml?rev=795857&r1=795856&r2=795857&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/build.xml Mon Jul 20 14:27:30 2009
@@ -29,9 +29,6 @@
 
     <!-- set global properties for this build. -->
 
-    <property name="hy.security.src.main.java.platform"
-              value="src/main/java/common/../${hy.os.family}" />
-
     <fileset id="classes" dir="../../build/classes">
         <or>
             <present targetdir="src/main/java/common" />
@@ -40,8 +37,8 @@
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
             </present>
-            <present targetdir="${hy.security.src.main.java.platform}" />
-            <present targetdir="${hy.security.src.main.java.platform}">
+            <present targetdir="src/main/java/${hy.os.family}" />
+            <present targetdir="src/main/java/${hy.os.family}">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -128,7 +125,7 @@
 
             <src>
                 <pathelement location="src/main/java/common"/>
-                <pathelement location="${hy.security.src.main.java.platform}" />
+                <pathelement location="src/main/java/${hy.os.family}" />
             </src>
 
             <bootclasspath>
@@ -162,7 +159,7 @@
 
         <jar destfile="${hy.jdk}/jre/lib/boot/security-src.jar">
             <fileset dir="src/main/java/common" />
-            <fileset dir="${hy.security.src.main.java.platform}" />
+            <fileset dir="src/main/java/${hy.os.family}" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>

Modified: harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/build.xml?rev=795857&r1=795856&r2=795857&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/build.xml Mon Jul 20 14:27:30 2009
@@ -29,9 +29,6 @@
 
     <!-- set global properties for this build. -->
 
-    <property name="hy.swing.src.main.java.platform"
-              value="src/main/java/common/../${hy.os.family}" />
-
     <fileset id="classes" dir="../../build/classes">
         <or>
             <present targetdir="src/main/java/common" />
@@ -40,8 +37,8 @@
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
             </present>
-            <present targetdir="${hy.swing.src.main.java.platform}" />
-            <present targetdir="${hy.swing.src.main.java.platform}">
+            <present targetdir="src/main/java/${hy.os.family}" />
+            <present targetdir="src/main/java/${hy.os.family}">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -110,7 +107,7 @@
 
             <src>
                 <pathelement location="src/main/java/common"/>
-                <pathelement location="${hy.swing.src.main.java.platform}" />
+                <pathelement location="src/main/java/${hy.os.family}" />
             </src>
 
             <bootclasspath>



Mime
View raw message