harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r925287 - in /harmony/enhanced/jdktools/trunk/modules: jdktools/ jdktools/META-INF/ jdktools/depends/ jdktools/depends/manifests/ jdktools/depends/manifests/bcel-5.2/ jdktools/depends/manifests/bcel-5.2/META-INF/ jdktools/src/test/java/org/...
Date Fri, 19 Mar 2010 15:44:40 GMT
Author: odeakin
Date: Fri Mar 19 15:44:40 2010
New Revision: 925287

URL: http://svn.apache.org/viewvc?rev=925287&view=rev
Log:
Apply partial jdktools patch for HARMONY-6477 (Problems building jdktools modules in Eclipse).

Added:
    harmony/enhanced/jdktools/trunk/modules/jdktools/depends/
    harmony/enhanced/jdktools/trunk/modules/jdktools/depends/manifests/
    harmony/enhanced/jdktools/trunk/modules/jdktools/depends/manifests/bcel-5.2/
    harmony/enhanced/jdktools/trunk/modules/jdktools/depends/manifests/bcel-5.2/META-INF/
    harmony/enhanced/jdktools/trunk/modules/jdktools/depends/manifests/bcel-5.2/META-INF/MANIFEST.MF
  (with props)
Modified:
    harmony/enhanced/jdktools/trunk/modules/jdktools/META-INF/MANIFEST.MF
    harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml
    harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javah/Test02.java
    harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF

Modified: harmony/enhanced/jdktools/trunk/modules/jdktools/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jdktools/META-INF/MANIFEST.MF?rev=925287&r1=925286&r2=925287&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/jdktools/trunk/modules/jdktools/META-INF/MANIFEST.MF Fri Mar 19 15:44:40
2010
@@ -5,17 +5,17 @@ Implementation-Title: Apache Harmony
 Implementation-Vendor: The Apache Software Foundation
 Implementation-Vendor-Id: org.apache.harmony
 Implementation-URL: http://harmony.apache.org
-Class-Path: com.ibm.icu.base_3.6.1.v20070417.jar
-  ecj-3.5.1.jar
-  jdimodel.jar
-  jdtstub.jar
 Bundle-ManifestVersion: 2
 Bundle-Name: Harmony Tools
 Bundle-SymbolicName: org.apache.harmony.tools
 Bundle-Version: 1.0.0
 Bundle-Localization: plugin
 Eclipse-JREBundle: true
-Import-Package: java.io,
+Import-Package: java.applet,
+ java.awt,
+ java.awt.event,
+ java.beans,
+ java.io,
  java.lang,
  java.lang.reflect,
  java.math,
@@ -24,11 +24,24 @@ Import-Package: java.io,
  java.nio.charset,
  java.security,
  java.security.cert,
+ java.text,
  java.util,
  java.util.jar,
  java.util.logging,
+ java.util.zip,
+ javax.accessibility,
  javax.crypto,
  javax.security.auth.x500,
+ javax.sound.sampled,
+ javax.swing,
+ javax.swing.border,
+ javax.swing.text,
+ javax.swing.text.html,
+ javax.swing.text.html.parser,
+ org.apache.bcel,
+ org.apache.bcel.classfile,
+ org.apache.bcel.generic,
+ org.apache.bcel.util,
  org.apache.harmony.kernel.vm,
  org.apache.harmony.luni.util,
  org.apache.harmony.pack200,

Modified: harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml?rev=925287&r1=925286&r2=925287&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml Fri Mar 19 15:44:40 2010
@@ -39,6 +39,13 @@
                         dest="${jdt.jdimodel.jar}" />
         <check-one-file src="${icu.url}" dest="${icu.jar}" />
         <check-one-file src="${ecj.jar.url}" dest="${ecj.jar}" />
+        <check-one-file src="${bcel.jar.url}" dest="${bcel.jar}" />
+        <copy todir="${hy.hdk}/jdk/jre/lib/boot">
+            <fileset dir="${depends.jars}">
+                <patternset includes="${bcel.version}/*.jar" />
+            </fileset>
+            <fileset dir="depends/manifests"/>
+        </copy>
     </target>
     
     <target name="fetch-depends">
@@ -46,7 +53,6 @@
         <fetch dep="jdt.jdimodel.jar"/>
     </target>
 
-
     <target name="build" depends="check-depends, build-java" />
     <target name="build-java" depends="compile-java, build-jar" />
     <target name="build-native" />

Added: harmony/enhanced/jdktools/trunk/modules/jdktools/depends/manifests/bcel-5.2/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jdktools/depends/manifests/bcel-5.2/META-INF/MANIFEST.MF?rev=925287&view=auto
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/depends/manifests/bcel-5.2/META-INF/MANIFEST.MF
(added)
+++ harmony/enhanced/jdktools/trunk/modules/jdktools/depends/manifests/bcel-5.2/META-INF/MANIFEST.MF
Fri Mar 19 15:44:40 2010
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: BCEL
+Bundle-SymbolicName: org.apache.bcel;singleton:=true
+Bundle-Version: 5.2
+Bundle-ClassPath: bcel-5.2.jar
+Eclipse-JREBundle: true
+Import-Package: java.lang
+Export-Package: org.apache.bcel, 
+  org.apache.bcel.classfile, 
+  org.apache.bcel.util,
+  org.apache.bcel.generic

Propchange: harmony/enhanced/jdktools/trunk/modules/jdktools/depends/manifests/bcel-5.2/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javah/Test02.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javah/Test02.java?rev=925287&r1=925286&r2=925287&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javah/Test02.java
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javah/Test02.java
Fri Mar 19 15:44:40 2010
@@ -16,7 +16,7 @@
  */
 
 package org.apache.harmony.tests.tools.javah;
-import Test.*;
+import org.apache.harmony.tests.tools.javah.Test.*;
 
 public class Test02 extends Test01 {
 

Modified: harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF?rev=925287&r1=925286&r2=925287&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF Fri Mar 19 15:44:40
2010
@@ -11,7 +11,10 @@ Bundle-SymbolicName: org.apache.harmony.
 Bundle-Version: 1.0.0
 Bundle-Localization: plugin
 Eclipse-JREBundle: true
-Import-Package: java.io,
+Import-Package: java.awt,
+ java.awt.event,
+ java.beans,
+ java.io,
  java.lang,
  java.lang.reflect,
  java.math,
@@ -23,8 +26,12 @@ Import-Package: java.io,
  java.util,
  java.util.jar,
  java.util.logging,
+ javax.accessibility,
  javax.crypto,
  javax.security.auth.x500,
+ javax.swing,
+ javax.swing.event,
+ javax.swing.text,
  org.apache.harmony.kernel.vm,
  org.apache.harmony.luni.util,
  org.apache.harmony.pack200,
@@ -33,7 +40,8 @@ Import-Package: java.io,
  org.apache.harmony.security.provider.cert;version="1.0.0",
  org.apache.harmony.security.utils;version="1.0.0",
  org.apache.harmony.security.x501;version="1.0.0",
- org.apache.harmony.security.x509;version="1.0.0"
+ org.apache.harmony.security.x509;version="1.0.0",
+ org.apache.harmony.unpack200
 Export-Package: org.apache.harmony.jretools.keytool,
  org.apache.harmony.jretools.unpack200,
  org.apache.harmony.jretools.pack200,



Mime
View raw message