harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r496426 - in /harmony/enhanced/classlib/trunk/modules/archive: ./ make/
Date Mon, 15 Jan 2007 18:34:40 GMT
Author: ayza
Date: Mon Jan 15 10:34:39 2007
New Revision: 496426

URL: http://svn.apache.org/viewvc?view=rev&rev=496426
Log:
Add support for common exclude list for ARCHIVE module (HARMONY-2970)

Added:
    harmony/enhanced/classlib/trunk/modules/archive/make/exclude.common   (with props)
Modified:
    harmony/enhanced/classlib/trunk/modules/archive/build.xml
    harmony/enhanced/classlib/trunk/modules/archive/make/exclude.linux.x86.drl   (props changed)
    harmony/enhanced/classlib/trunk/modules/archive/make/exclude.linux.x86.ibm   (props changed)
    harmony/enhanced/classlib/trunk/modules/archive/make/exclude.linux.x86_64.drl   (props
changed)
    harmony/enhanced/classlib/trunk/modules/archive/make/exclude.linux.x86_64.ibm   (props
changed)
    harmony/enhanced/classlib/trunk/modules/archive/make/exclude.windows.x86.drl   (props
changed)
    harmony/enhanced/classlib/trunk/modules/archive/make/exclude.windows.x86.ibm   (props
changed)
    harmony/enhanced/classlib/trunk/modules/archive/make/exclude.windows.x86_64.drl   (props
changed)
    harmony/enhanced/classlib/trunk/modules/archive/make/exclude.windows.x86_64.ibm   (props
changed)

Modified: harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/build.xml?view=diff&rev=496426&r1=496425&r2=496426
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/build.xml Mon Jan 15 10:34:39 2007
@@ -38,7 +38,12 @@
     </fileset>
 
     <property name="zlib.zip" location="${depends.oss}/zlib_1.2.3.zip" />
-    <property name="exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}"
/>
+
+    <property name="archive.common.exclude.file" location="./make/exclude.common" />
+    <property name="archive.platform.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}"
/>
+    <property name="archive.interm.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}.interm"
/>
+
+    <property name="exclude.file" location="${hy.hdk}/build/archive.exclude" />
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
     
@@ -104,7 +109,7 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="-test-module" depends="build, compile-tests, run-tests" />
+    <target name="-test-module" depends="build, compile-tests, prepare-exclude, run-tests"
/>
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/archive.jar" />
@@ -201,6 +206,28 @@
             </bootclasspath>
             <classpath location="${hy.hdk}/build/test/support.jar" />
         </javac>
+    </target>
+
+    <target name="prepare-exclude" depends="-init-exclude, -add-common, -add-platform,
-add-intermittent">
+    </target>
+
+    <target name="-init-exclude" >
+        <echo message="" file="${exclude.file}" />
+        <loadfile property="archive.common.exclude.exist" srcFile="${archive.common.exclude.file}"
failonerror="false" />
+        <loadfile property="archive.platform.exclude.exist" srcFile="${archive.platform.exclude.file}"
failonerror="false" />
+        <loadfile property="archive.interm.exclude.exist" srcFile="${archive.interm.exclude.file}"
failonerror="false"/>
+    </target>
+
+    <target name="-add-common" if="archive.common.exclude.exist" >
+        <echo message="${archive.common.exclude.exist}${line.separator}" file="${exclude.file}"
append="true"/>
+    </target>
+
+    <target name="-add-platform" if="archive.platform.exclude.exist" >
+        <echo message="${archive.platform.exclude.exist}${line.separator}" file="${exclude.file}"
append="true"/>
+    </target>
+
+    <target name="-add-intermittent" if="archive.interm.exclude.exist" >
+        <echo message="${archive.interm.exclude.exist}${line.separator}" file="${exclude.file}"
append="true"/>
     </target>
 
     <target name="run-tests">

Added: harmony/enhanced/classlib/trunk/modules/archive/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/make/exclude.common?view=auto&rev=496426
==============================================================================
    (empty)

Propchange: harmony/enhanced/classlib/trunk/modules/archive/make/exclude.common
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/classlib/trunk/modules/archive/make/exclude.linux.x86.drl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/classlib/trunk/modules/archive/make/exclude.linux.x86.ibm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/classlib/trunk/modules/archive/make/exclude.linux.x86_64.drl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/classlib/trunk/modules/archive/make/exclude.linux.x86_64.ibm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/classlib/trunk/modules/archive/make/exclude.windows.x86.drl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/classlib/trunk/modules/archive/make/exclude.windows.x86.ibm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/classlib/trunk/modules/archive/make/exclude.windows.x86_64.drl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/classlib/trunk/modules/archive/make/exclude.windows.x86_64.ibm
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message