You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/05/08 22:49:42 UTC
svn commit: r405159 - in /incubator/harmony/enhanced/classlib/trunk: make/
make/patternsets/ modules/luni-kernel/make/ modules/security-kernel/make/
Author: tellison
Date: Mon May 8 13:49:40 2006
New Revision: 405159
URL: http://svn.apache.org/viewcvs?rev=405159&view=rev
Log:
Patch for HARMONY-439 (java build improvements - delegation to modules)
Added:
incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/
incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/build.xml (with props)
incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/patternset.txt
- copied unchanged from r405155, incubator/harmony/enhanced/classlib/trunk/make/patternsets/luni-kernel.txt
incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/
incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/build.xml (with props)
incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/patternset.txt
- copied unchanged from r405155, incubator/harmony/enhanced/classlib/trunk/make/patternsets/security-kernel.txt
Removed:
incubator/harmony/enhanced/classlib/trunk/make/patternsets/luni-kernel.txt
incubator/harmony/enhanced/classlib/trunk/make/patternsets/security-kernel.txt
Modified:
incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=405159&r1=405158&r2=405159&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Mon May 8 13:49:40 2006
@@ -212,13 +212,7 @@
<include name="java.security" />
</fileset>
</copy>
-
- <copy todir="${target.output}/jre/lib" overwrite="yes" flatten="yes">
- <fileset dir="modules/logging/src/main/java">
- <include name="**/logging.properties" />
- </fileset>
- </copy>
-
+
</target>
Added: incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/build.xml?rev=405159&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/build.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/build.xml Mon May 8 13:49:40 2006
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation or its
+ licensors, as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an "AS
+ IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ express or implied. See the License for the specific language
+ governing permissions and limitations under the License.
+-->
+
+<project name="LUNI Kernel Stub JAR Build"
+ default="warn" basedir="..">
+
+ <description>Build for luni kernel stub jar</description>
+
+ <property name="hy.target" location="../../deploy" />
+ <property name="hy.build" location="../../build" />
+ <property name="stub.jar"
+ location="${hy.target}/jre/lib/boot/luni-kernel-stubs.jar" />
+
+ <target name="warn">
+ <fail>...
+
+This module is a non-functional stub. It is intended only for use by
+the top-level build.
+
+ </fail>
+ </target>
+
+ <target name="build">
+ <jar destfile="${stub.jar}" manifest="META-INF/MANIFEST.MF">
+ <fileset dir="${hy.build}" includesfile="make/patternset.txt" />
+ </jar>
+ </target>
+
+ <target name="clean">
+ <delete file="${stub.jar}" />
+ </target>
+
+</project>
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/build.xml?rev=405159&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/build.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/build.xml Mon May 8 13:49:40 2006
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation or its
+ licensors, as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an "AS
+ IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ express or implied. See the License for the specific language
+ governing permissions and limitations under the License.
+-->
+
+<project name="Security Kernel Stub JAR Build"
+ default="warn" basedir="..">
+
+ <description>Build for security kernel stub jar</description>
+
+ <property name="hy.target" location="../../deploy" />
+ <property name="hy.build" location="../../build" />
+ <property name="stub.jar"
+ location="${hy.target}/jre/lib/boot/security-kernel-stubs.jar" />
+
+ <target name="warn">
+ <fail>...
+
+This module is a non-functional stub. It is intended only for use by
+the top-level build.
+
+ </fail>
+ </target>
+
+ <target name="build">
+ <jar destfile="${stub.jar}" manifest="META-INF/MANIFEST.MF">
+ <fileset dir="${hy.build}" includesfile="make/patternset.txt" />
+ </jar>
+ </target>
+
+ <target name="clean">
+ <delete file="${stub.jar}" />
+ </target>
+
+</project>
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/build.xml
------------------------------------------------------------------------------
svn:eol-style = native