harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mloe...@apache.org
Subject svn commit: r391609 [1/2] - in /incubator/harmony/enhanced/classlib/trunk/doc: build.xml kernel/kernel.cfg vminterface/natives.cfg
Date Wed, 05 Apr 2006 13:19:15 GMT
Author: mloenko
Date: Wed Apr  5 06:19:01 2006
New Revision: 391609

URL: http://svn.apache.org/viewcvs?rev=391609&view=rev
Log:
Applied path from HARMONY-146: doxygen build is broken

Modified:
    incubator/harmony/enhanced/classlib/trunk/doc/build.xml
    incubator/harmony/enhanced/classlib/trunk/doc/kernel/kernel.cfg
    incubator/harmony/enhanced/classlib/trunk/doc/vminterface/natives.cfg

Modified: incubator/harmony/enhanced/classlib/trunk/doc/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/doc/build.xml?rev=391609&r1=391608&r2=391609&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/doc/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/doc/build.xml Wed Apr  5 06:19:01 2006
@@ -1,112 +1,104 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Copyright 1998, 2005 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="Build-Harmony-Documentation" default="all" basedir=".">
-
-    <property name="vm.doc.dir" value="vm_doc" />
-    <property name="kernel.doc.dir" value="kernel_doc" />
-
-    <!-- ================================= 
-          target: all
-         ================================= -->
-    <target name="all" 
-        description="Target to rebuild the Harmony doc from scratch." 
-        depends="doxygen-kernel, doxygen-natives" />
-
-    <!-- ================================= 
-          target: properties
-         ================================= -->
-    <target name="properties" depends="init, windows-properties, linux-properties" />
-
-    <!-- ================================= 
-          target: windows-properties              
-         ================================= -->
-    <target name="windows-properties" if="is.windows">
-        <property name="target.platform" value="win.IA32" />
-        <property name="exe.suffix" value=".exe" />
-    </target>
-
-    <!-- ================================= 
-          target: linux-properties              
-         ================================= -->
-    <target name="linux-properties" if="is.linux">
-        <property name="target.platform" value="linux.IA32" />
-        <property name="exe.suffix" value="" />
-    </target>
-
-    <!-- ================================= 
-          target: init                      
-         ================================= -->
-    <target name="init">
-        <condition property="is.windows">
-            <os family="windows" />
-        </condition>
-
-        <condition property="is.linux">
-            <os name="linux" />
-        </condition>
-    </target>
-
-    <!-- ================================= 
-          target: doxygen-kernel                      
-         ================================= -->
-    <target name="doxygen-kernel" 
-        depends="properties, clean-kernel" 
-        description="Invoke doxygen on contributed kernel source">
-        <exec executable="doxygen${exe.suffix}" dir="..">
-            <arg line="doc/kernel/kernel.cfg" />
-            <env key="HARMONY_DOC_DIR" value="${basedir}" />
-        </exec>
-    </target>
-
-    <!-- ================================= 
-          target: doxygen-natives                      
-         ================================= -->
-    <target name="doxygen-natives" 
-        depends="properties, clean-natives" 
-        description="Invoke doxygen on natives">
-        <exec executable="doxygen${exe.suffix}" dir="..">
-            <arg line="doc/vminterface/natives.cfg" />
-            <env key="HARMONY_DOC_DIR" value="${basedir}" />
-            <env key="HARMONY_NATIVE_SRC_DIR" value="${basedir}/../native-src/${target.platform}"
/>
-        </exec>
-    </target>
-
-    <!-- ================================= 
-          target: clean-kernel    
-         ================================= -->
-    <target name="clean-kernel" description="Clean away the generated kernel documentation.">
-        <echo>Cleaning up kernel documentation directories</echo>
-        <delete failonerror="false" dir='${kernel.doc.dir}' />
-    </target>
-
-    <!-- ================================= 
-          target: clean-natives    
-         ================================= -->
-    <target name="clean-natives" description="Clean away the generated natives documentation.">
-        <echo>Cleaning up natives documentation directories</echo>
-        <delete failonerror="false" dir='${vm.doc.dir}' />
-    </target>
-
-
-    <!-- ================================= 
-          target: clean         
-         ================================= -->
-    <target name="clean" 
-        depends="clean-kernel, clean-natives" 
-        description="Clean away the generated documentation." />
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Copyright 1998, 2005 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="Build-Harmony-Documentation" default="all" basedir=".">
+
+    <property name="vm.doc.dir" value="vm_doc" />
+    <property name="kernel.doc.dir" value="kernel_doc" />
+
+    <!-- import share properties -->
+    <import file="${basedir}/../make/properties.xml" />
+
+    <!-- ================================= 
+          target: all
+         ================================= -->
+    <target name="all" 
+        description="Target to rebuild the Harmony doc from scratch." 
+        depends="doxygen-kernel, doxygen-natives" />
+
+    <!-- ================================= 
+          target: properties
+         ================================= -->
+    <target name="properties" depends="windows-properties, linux-properties" />
+
+    <!-- ================================= 
+          target: windows-properties              
+         ================================= -->
+    <target name="windows-properties" if="is.windows">
+        <!-- FIXME: consistent platform names should be used -->
+        <property name="target.platform" value="win.IA32" />
+    </target>
+
+    <!-- ================================= 
+          target: linux-properties              
+         ================================= -->
+    <target name="linux-properties" if="is.linux">
+        <!-- FIXME: consistent platform names should be used -->
+        <property name="target.platform" value="linux.IA32" />
+    </target>
+
+    <!-- ================================= 
+          target: doxygen-kernel                      
+         ================================= -->
+    <target name="doxygen-kernel" 
+        depends="properties, clean-kernel" 
+        description="Invoke doxygen on contributed kernel source">
+        <exec executable="doxygen${exe.suffix}" dir="..">
+            <arg line="doc/kernel/kernel.cfg" />
+            <env key="HARMONY_DOC_DIR" value="${basedir}" />
+            <env key="HARMONY_OS" value="${hy.os}" />
+        </exec>
+    </target>
+
+    <!-- ================================= 
+          target: doxygen-natives                      
+         ================================= -->
+    <target name="doxygen-natives" 
+        depends="properties, clean-natives" 
+        description="Invoke doxygen on natives">
+        <exec executable="doxygen${exe.suffix}" dir="..">
+            <arg line="doc/vminterface/natives.cfg" />
+            <env key="HARMONY_DOC_DIR" value="${basedir}" />
+            <env key="HARMONY_NATIVE_SRC_DIR" value="${basedir}/../native-src/${target.platform}"
/>
+            <env key="HARMONY_NATIVE_SHARED_SRC_DIR" value="${basedir}/../native-src/shared"
/>
+        </exec>
+    </target>
+
+    <!-- ================================= 
+          target: clean-kernel    
+         ================================= -->
+    <target name="clean-kernel" description="Clean away the generated kernel documentation.">
+        <echo>Cleaning up kernel documentation directories</echo>
+        <delete failonerror="false" dir='${kernel.doc.dir}' />
+    </target>
+
+    <!-- ================================= 
+          target: clean-natives    
+         ================================= -->
+    <target name="clean-natives" description="Clean away the generated natives documentation.">
+        <echo>Cleaning up natives documentation directories</echo>
+        <delete failonerror="false" dir='${vm.doc.dir}' />
+    </target>
+
+
+    <!-- ================================= 
+          target: clean         
+         ================================= -->
+    <target name="clean" 
+        depends="clean-kernel, clean-natives" 
+        description="Clean away the generated documentation." />
+
+</project>

Modified: incubator/harmony/enhanced/classlib/trunk/doc/kernel/kernel.cfg
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/doc/kernel/kernel.cfg?rev=391609&r1=391608&r2=391609&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/doc/kernel/kernel.cfg (original)
+++ incubator/harmony/enhanced/classlib/trunk/doc/kernel/kernel.cfg Wed Apr  5 06:19:01 2006
@@ -1,17 +1,17 @@
 # Doxyfile 1.4.4
 
-# Copyright 2005 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
+# Copyright 2005 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.
 
 # This file describes the settings to be used by the documentation system
@@ -432,8 +432,27 @@
 # with spaces.
 
 # Must set the HARMONY_DOC_DIR to find the input.
-INPUT	= "$(HARMONY_DOC_DIR)/../java-src/kernel/src" \
-			"$(HARMONY_DOC_DIR)/kernel"
+INPUT	= \
+  "$(HARMONY_DOC_DIR)/../modules/archive/src/main/java" \
+  "$(HARMONY_DOC_DIR)/../modules/beans/src/main/java" \
+  "$(HARMONY_DOC_DIR)/../modules/crypto/src/main/java" \
+  "$(HARMONY_DOC_DIR)/../modules/jndi/src/main/java" \
+  "$(HARMONY_DOC_DIR)/../modules/logging/src/main/java" \
+  "$(HARMONY_DOC_DIR)/../modules/luni/bin/main/java" \
+  "$(HARMONY_DOC_DIR)/../modules/luni/src/main/java" \
+  "$(HARMONY_DOC_DIR)/../modules/luni-kernel/src/main/java" \
+  "$(HARMONY_DOC_DIR)/../modules/math/src/main/java" \
+  "$(HARMONY_DOC_DIR)/../modules/nio/src/main/java" \
+  "$(HARMONY_DOC_DIR)/../modules/nio_char/src/main/java" \
+  "$(HARMONY_DOC_DIR)/../modules/prefs/src/main/java" \
+  "$(HARMONY_DOC_DIR)/../modules/regex/src/main/java" \
+  "$(HARMONY_DOC_DIR)/../modules/security/src/main/java/common" \
+  "$(HARMONY_DOC_DIR)/../modules/security/src/main/java/$(HARMONY_OS)" \
+  "$(HARMONY_DOC_DIR)/../modules/security-kernel/src/main/java" \
+  "$(HARMONY_DOC_DIR)/../modules/sql/src/main/java" \
+  "$(HARMONY_DOC_DIR)/../modules/text/src/main/java" \
+  "$(HARMONY_DOC_DIR)/../modules/x-net/src/main/java" \
+  "$(HARMONY_DOC_DIR)/kernel"
 
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
@@ -465,7 +484,7 @@
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
 # certain files from those directories.
 
-EXCLUDE_PATTERNS       =
+EXCLUDE_PATTERNS       = */.svn/*
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or
 # directories that contain example code fragments that are included (see



Mime
View raw message