You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ap...@apache.org on 2007/07/24 09:47:03 UTC
svn commit: r558950 - in /harmony/enhanced/jdktools/trunk/modules:
samsa/build.xml tools/META-INF/MANIFEST.MF
tools/src/main/java/org/apache/harmony/tools/javadoc/
tools/src/main/java/org/apache/harmony/tools/javadoc/Main.java
Author: apetrenko
Date: Tue Jul 24 00:47:02 2007
New Revision: 558950
URL: http://svn.apache.org/viewvc?view=rev&rev=558950
Log:
Patch for HARMONY-4498 "[tools][netbeans] javadoc tool is absent"
Added:
harmony/enhanced/jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javadoc/
harmony/enhanced/jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javadoc/Main.java (with props)
Modified:
harmony/enhanced/jdktools/trunk/modules/samsa/build.xml
harmony/enhanced/jdktools/trunk/modules/tools/META-INF/MANIFEST.MF
Modified: harmony/enhanced/jdktools/trunk/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/build.xml?view=diff&rev=558950&r1=558949&r2=558950
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/build.xml Tue Jul 24 00:47:02 2007
@@ -60,24 +60,27 @@
<property name="hy.samsa.exe"
location="${hy.samsa.src.main.native}/samsa/${hy.os.family}/samsa${exe.suffix}" />
+ <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/java${exe.suffix}" />
+ <chmod file="${hy.jdk}/bin/java${exe.suffix}" perm="ugo+x" />
+
+ <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javaw${exe.suffix}" />
+ <chmod file="${hy.jdk}/bin/java${exe.suffix}" perm="ugo+x" />
+
<copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javac${exe.suffix}" />
<chmod file="${hy.jdk}/bin/javac${exe.suffix}" perm="ugo+x" />
<copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javah${exe.suffix}" />
<chmod file="${hy.jdk}/bin/javah${exe.suffix}" perm="ugo+x" />
- <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/java${exe.suffix}" />
- <chmod file="${hy.jdk}/bin/java${exe.suffix}" perm="ugo+x" />
-
- <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javaw${exe.suffix}" />
- <chmod file="${hy.jdk}/bin/java${exe.suffix}" perm="ugo+x" />
+ <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javadoc${exe.suffix}" />
+ <chmod file="${hy.jdk}/bin/javadoc${exe.suffix}" perm="ugo+x" />
<copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/keytool${exe.suffix}" />
<chmod file="${hy.jdk}/bin/keytool${exe.suffix}" perm="ugo+x" />
<copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/jarsigner${exe.suffix}" />
<chmod file="${hy.jdk}/bin/jarsigner${exe.suffix}" perm="ugo+x" />
-
+
</target>
<!-- copy samsa symbol info for different tools -->
@@ -86,9 +89,11 @@
<property name="hy.samsa.progdb"
location="${hy.samsa.src.main.native}/samsa/${hy.os.family}/samsa${progdb.suffix}" />
+ <copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/java${progdb.suffix}" />
+ <copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/javaw${progdb.suffix}" />
<copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/javac${progdb.suffix}" />
<copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/javah${progdb.suffix}" />
- <copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/java${progdb.suffix}" />
+ <copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/javadoc${progdb.suffix}" />
<copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/keytool${progdb.suffix}" />
<copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/jarsigner${progdb.suffix}" />
@@ -135,6 +140,13 @@
<echo message="Run jdk/bin/javah in ${hy.tests.reports}"/>
<exec failonerror="false"
executable="${test.jre.home}/../bin/javah${exe.suffix}"
+ dir="${hy.tests.reports}">
+ <arg line="" />
+ </exec>
+
+ <echo message="Run jdk/bin/javadoc in ${hy.tests.reports}"/>
+ <exec failonerror="false"
+ executable="${test.jre.home}/../bin/javadoc${exe.suffix}"
dir="${hy.tests.reports}">
<arg line="" />
</exec>
Modified: harmony/enhanced/jdktools/trunk/modules/tools/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/tools/META-INF/MANIFEST.MF?view=diff&rev=558950&r1=558949&r2=558950
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/tools/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/jdktools/trunk/modules/tools/META-INF/MANIFEST.MF Tue Jul 24 00:47:02 2007
@@ -35,6 +35,7 @@
org.apache.harmony.security.x509;version="1.0.0"
Export-Package: org.apache.harmony.tools.javac,
org.apache.harmony.tools.javah,
+ org.apache.harmony.tools.javadoc,
org.apache.harmony.tools.jarsigner,
org.apache.harmony.tools.keytool,
com.sun.tools.javac,
Added: harmony/enhanced/jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javadoc/Main.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javadoc/Main.java?view=auto&rev=558950
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javadoc/Main.java (added)
+++ harmony/enhanced/jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javadoc/Main.java Tue Jul 24 00:47:02 2007
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+package org.apache.harmony.tools.javadoc;
+
+
+/**
+ * This is the entry point for the javadoc tool.
+ *
+ * This is a stub for while the real implementation is not available.
+ */
+public final class Main {
+
+ /**
+ * Command-line tool invokes this method.
+ */
+ public static void main(String[] args) {
+ System.out.println("JavaDoc is not implemented yet");
+ }
+}
Propchange: harmony/enhanced/jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javadoc/Main.java
------------------------------------------------------------------------------
svn:eol-style = native