harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From py...@apache.org
Subject svn commit: r463256 - in /incubator/harmony/enhanced/classlib/trunk/doc: build.xml vminterface/natives.cfg
Date Thu, 12 Oct 2006 14:14:33 GMT
Author: pyang
Date: Thu Oct 12 07:14:32 2006
New Revision: 463256

URL: http://svn.apache.org/viewvc?view=rev&rev=463256
Log:
fix the vm_doc generation script

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

Modified: incubator/harmony/enhanced/classlib/trunk/doc/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/doc/build.xml?view=diff&rev=463256&r1=463255&r2=463256
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/doc/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/doc/build.xml Thu Oct 12 07:14:32 2006
@@ -41,16 +41,14 @@
           target: windows-properties              
          ================================= -->
     <target name="windows-properties" if="is.windows">
-        <!-- FIXME: consistent platform names should be used -->
-        <property name="target.platform" value="win.IA32" />
+        <property name="target.platform" value="windows" />
     </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" />
+        <property name="target.platform" value="linux" />
     </target>
 	
     <!-- ================================= 
@@ -88,8 +86,9 @@
         <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"
/>
+            <env key="HARMONY_LUNI_NATIVES_DIR" value="${basedir}/../modules/luni/src/main/native"
/>
+            <env key="HARMONY_ARCHIVE_NATIVES_DIR" value="${basedir}/../modules/archive/src/main/native"
/>
+            <env key="HARMONY_TARGET_PLATFORM" value="${target.platform}" />
         </exec>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/doc/vminterface/natives.cfg
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/doc/vminterface/natives.cfg?view=diff&rev=463256&r1=463255&r2=463256
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/doc/vminterface/natives.cfg (original)
+++ incubator/harmony/enhanced/classlib/trunk/doc/vminterface/natives.cfg Thu Oct 12 07:14:32
2006
@@ -436,23 +436,23 @@
 # Note that this affects IMAGE_PATH as well
 INPUT	= \
 		"$(HARMONY_DOC_DIR)/vminterface" \
-		"$(HARMONY_NATIVE_SRC_DIR)/vmi" \
-		"$(HARMONY_NATIVE_SRC_DIR)/archive" \
-		"$(HARMONY_NATIVE_SRC_DIR)/lib" \
-		"$(HARMONY_NATIVE_SRC_DIR)/luni" \
-		"$(HARMONY_NATIVE_SRC_DIR)/port" \
-		"$(HARMONY_NATIVE_SRC_DIR)/thread" \
-		"$(HARMONY_NATIVE_SRC_DIR)/zip" \
-		"$(HARMONY_NATIVE_SRC_DIR)/pool" \
-		"$(HARMONY_NATIVE_SRC_DIR)/include" \
-		"$(HARMONY_NATIVE_SHARED_SRC_DIR)/vmi" \
-		"$(HARMONY_NATIVE_SHARED_SRC_DIR)/archive" \
-		"$(HARMONY_NATIVE_SHARED_SRC_DIR)/luni" \
-		"$(HARMONY_NATIVE_SHARED_SRC_DIR)/port" \
-		"$(HARMONY_NATIVE_SHARED_SRC_DIR)/thread" \
-		"$(HARMONY_NATIVE_SHARED_SRC_DIR)/zip" \
-		"$(HARMONY_NATIVE_SHARED_SRC_DIR)/pool" \
-		"$(HARMONY_NATIVE_SHARED_SRC_DIR)/include"
+		"$(HARMONY_LUNI_NATIVES_DIR)/vmi/$(HARMONY_TARGET_PLATFORM)" \
+		"$(HARMONY_LUNI_NATIVES_DIR)/luni/$(HARMONY_TARGET_PLATFORM)" \
+		"$(HARMONY_LUNI_NATIVES_DIR)/pool/$(HARMONY_TARGET_PLATFORM)" \
+		"$(HARMONY_LUNI_NATIVES_DIR)/port/$(HARMONY_TARGET_PLATFORM)" \
+		"$(HARMONY_LUNI_NATIVES_DIR)/thread/$(HARMONY_TARGET_PLATFORM)" \
+		"$(HARMONY_LUNI_NATIVES_DIR)/include/$(HARMONY_TARGET_PLATFORM)" \
+		"$(HARMONY_LUNI_NATIVES_DIR)/vmi/shared" \
+		"$(HARMONY_LUNI_NATIVES_DIR)/luni/shared" \
+		"$(HARMONY_LUNI_NATIVES_DIR)/pool/shared" \
+		"$(HARMONY_LUNI_NATIVES_DIR)/port/shared" \
+		"$(HARMONY_LUNI_NATIVES_DIR)/thread/shared" \
+		"$(HARMONY_LUNI_NATIVES_DIR)/include/shared" \
+		"$(HARMONY_ARCHIVE_NATIVES_DIR)/zip/$(HARMONY_TARGET_PLATFORM)" \
+		"$(HARMONY_ARCHIVE_NATIVES_DIR)/archive/$(HARMONY_TARGET_PLATFORM)" \
+		"$(HARMONY_ARCHIVE_NATIVES_DIR)/zip/shared" \
+		"$(HARMONY_ARCHIVE_NATIVES_DIR)/archive/shared" \
+		"$(HARMONY_ARCHIVE_NATIVES_DIR)/include/shared"
 
 # 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 
@@ -975,8 +975,8 @@
 # contain include files that are not input files but should be processed by 
 # the preprocessor.
 
-INCLUDE_PATH           = "$(HARMONY_NATIVE_SRC_DIR)/include" \
-		         "$(HARMONY_NATIVE_SHARED_SRC_DIR)/include"
+INCLUDE_PATH           = "$(HARMONY_LUNI_NATIVES_DIR)/include/shared" \
+		"$(HARMONY_LUNI_NATIVES_DIR)/include/$(HARMONY_TARGET_PLATFORM)"
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
 # patterns (like *.h and *.hpp) to filter out the header-files in the 



Mime
View raw message