harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r412357 - in /incubator/harmony/enhanced/classlib/trunk: modules/archive/make/ modules/archive/make/common/ modules/archive/src/main/native/ modules/archive/src/main/native/include/ modules/archive/src/main/native/include/shared/ modules/lu...
Date Wed, 07 Jun 2006 10:17:28 GMT
Author: tellison
Date: Wed Jun  7 03:17:22 2006
New Revision: 412357

URL: http://svn.apache.org/viewvc?rev=412357&view=rev
Log:
Apply patch HARMONY-561 (Modularise native include directories)

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/include/
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/include/shared/
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/include/shared/zipsup.h
      - copied, changed from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/zipsup.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/linux/
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/linux/hymutex.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/hymutex.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/linux/jclprots.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/jclprots.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/gp.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/gp.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/harmony.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/harmony.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hycomp.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hycomp.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hypool.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hypool.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hyport.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hyport.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hyporterror.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hyporterror.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hysocket.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hysocket.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hythread.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hythread.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hyvmls.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hyvmls.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/jni.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/jni.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/jniport.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/jniport.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/jsig.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/jsig.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/jvmpi.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/jvmpi.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/jvmri.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/jvmri.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/jvmti.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/jvmti.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/portsock.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/portsock.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/vmi.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/vmi.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/hymutex.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/hymutex.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/jclprots.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/jclprots.h
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/hysignal.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/hysignal.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/fltconst.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/fltconst.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/port/hystatic.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hystatic.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/port/hystdarg.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/hystdarg.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/port/ute_module.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/ute_module.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/port/ute_pd.h
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/ute_pd.h
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/apache.ico
      - copied unchanged from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/apache.ico
Removed:
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/native-src/build.xml
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile.include
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hysl.c
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/sig/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/zip/zipsup.c
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/defines.mak
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/java.rc
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/javaw.rc
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/hysl.c
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml Wed Jun  7 03:17:22
2006
@@ -51,8 +51,15 @@
         <ant dir="make/common" target="build.jar" />
         <ant dir="make/common" target="copy.resources" />
     </target>
-
-
+	
+	<target name="copy.native.includes">
+		<copy todir="${hy.hdk}/include" overwrite="yes">
+			<fileset dir="${hy.archive.src.main.native}/include/shared">
+				<include name="zipsup.h" />
+			</fileset>
+		</copy>
+	</target>
+	
     <target name="test" depends="build">
         <ant dir="make/common" target="compile.tests" />
         <ant dir="make/common" target="run.tests" />
@@ -61,6 +68,14 @@
     <target name="clean">
         <delete dir="${hy.archive.bin.main}" />
         <delete dir="${hy.archive.bin.test}" />
+    	<antcall target="clean.native.includes" />
     </target>
 
+	<target name="clean.native.includes">
+		<delete failonerror="false">
+			<fileset dir="${hy.hdk}/include">
+				<include name="zipsup.h" />
+			</fileset>
+		</delete>
+	</target>
 </project>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml
Wed Jun  7 03:17:22 2006
@@ -20,6 +20,7 @@
       <src>
          <main>
             <java location="src/main/java" />
+            <native location="src/main/native" />
         	<resources location="src/main/resources" />
          </main>
          <test>

Copied: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/include/shared/zipsup.h
(from r412346, incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/zipsup.h)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/include/shared/zipsup.h?p2=incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/include/shared/zipsup.h&p1=incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/zipsup.h&r1=412346&r2=412357&rev=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/shared/include/zipsup.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/include/shared/zipsup.h
Wed Jun  7 03:17:22 2006
@@ -25,6 +25,8 @@
 #endif
 #include "hyport.h"
   typedef struct HyZipCachePool HyZipCachePool;
+  
+#define HY_ZIP_DLL_NAME "hyzlib"
 
 #define ZIP_INTERNAL_MAX  80
 #define ZIP_CM_Reduced1  2

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml Wed Jun  7 03:17:22
2006
@@ -69,7 +69,50 @@
         <ant dir="make/common" target="copy.resources" />
     </target>
 
-
+	<target name="copy.native.includes">
+		<copy todir="${hy.hdk}/include" overwrite="yes">
+			<fileset dir="${hy.luni.src.main.native}/include/shared">
+				<include name="harmony.h" />
+				<include name="vmi.h" />
+				<include name="hyvmls.h" />
+				<include name="hypool.h" />
+				<include name="hyport.h" />
+				<include name="hythread.h" />
+				<include name="hycomp.h" />
+				<include name="hysocket.h" />
+				<include name="hyporterror.h" />
+				<include name="gp.h" />
+			</fileset>
+		</copy>
+		<copy todir="${hy.jdk}/include" overwrite="yes">
+			<fileset dir="${hy.luni.src.main.native}/include/shared">
+				<include name="jni.h" />
+				<include name="jniport.h" />
+			</fileset>
+		</copy>
+			
+		<antcall target="copy.native.includes.windows" />
+		<antcall target="copy.native.includes.linux" />
+	</target>
+	
+	<target name="copy.native.includes.windows" if="is.windows">
+		<copy todir="${hy.hdk}/include" overwrite="yes">
+			<fileset dir="${hy.luni.src.main.native}/include/windows">
+    			<include name="hymutex.h" />
+    			<include name="jclprots.h" />
+    		</fileset>
+		</copy>
+	</target>
+	
+	<target name="copy.native.includes.linux" if="is.linux">
+		<copy todir="${hy.hdk}/include" overwrite="yes">
+			<fileset dir="${hy.luni.src.main.native}/include/linux">
+    			<include name="hymutex.h" />
+    			<include name="jclprots.h" />
+    		</fileset>
+		</copy>
+	</target>
+	
     <target name="test" depends="build">
         <ant dir="make/common" target="compile.tests" />
         <ant dir="make/common" target="run.tests" />
@@ -78,6 +121,32 @@
     <target name="clean">
         <delete dir="${hy.luni.bin.main}" />
         <delete dir="${hy.luni.bin.test}" />
+    	<antcall target="clean.native.includes" />
     </target>
+	
+	<target name="clean.native.includes">
+		<delete failonerror="false">
+			<fileset dir="${hy.hdk}/include">
+				<include name="harmony.h" />
+				<include name="vmi.h" />
+				<include name="hyvmls.h" />
+				<include name="hypool.h" />
+				<include name="hyport.h" />
+				<include name="hythread.h" />
+				<include name="hymutex.h" />
+				<include name="jclprots.h" />
+				<include name="hycomp.h" />
+				<include name="hysocket.h" />
+				<include name="hyporterror.h" />
+				<include name="gp.h" />
+			</fileset>
+		</delete>
+		<delete failonerror="false">
+			<fileset dir="${hy.jdk}/include">
+				<include name="jni.h" />
+				<include name="jniport.h" />
+			</fileset>
+		</delete>
+	</target>
 
 </project>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/hyproperties.xml?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/hyproperties.xml Wed
Jun  7 03:17:22 2006
@@ -20,6 +20,7 @@
       <src>
          <main>
             <java location="src/main/java" />
+            <native location="src/main/native" />
         	<resources location="src/main/resources" />
          </main>
          <test>

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/build.xml?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/build.xml Wed Jun  7 03:17:22 2006
@@ -36,21 +36,21 @@
           target: build
          ================================= -->
     <target name="build"
-            depends="overlay-oss, make-all, layout" />
+            depends="overlay-oss, copy-includes, make-all, layout" />
 
 
     <!-- ================================= 
           target: clean              
          ================================= -->
     <target name="clean"
-            depends="make-clean, clean-overlay-oss, clean-layout" />
+            depends="clean-overlay-oss, make-clean, clean-includes, clean-layout" />
 
 
     <!-- ================================= 
           target: properties
          ================================= -->
     <target name="properties" depends="init, windows-properties, linux-properties">
-        <property name="hy.hdk" location="../deploy" />
+        <property name="hy.hdk" location="${basedir}/../deploy" />
     	<property name="hy.jdk" location="${hy.hdk}/jdk" />
         <property name="depends.oss" location="../depends/oss" />
         <property name="depends.libs" location="../depends/libs/${target.platform}" />
@@ -108,6 +108,7 @@
         <exec failonerror="true" 
             executable="${make.command}" 
             dir="${target.platform}">
+        	<env key="HY_HDK" value="${hy.hdk}" />
             <arg line="all" />
         </exec>
     </target>
@@ -120,6 +121,7 @@
         <exec failonerror="true" 
             executable="${make.command}" 
             dir="${target.platform}">
+        	<env key="HY_HDK" value="${hy.hdk}" />
             <arg line="clean" />
         </exec>
     	
@@ -169,16 +171,6 @@
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${depends.libs}" includes="*${shlib.suffix}*" />
         </copy>
-
-        <!-- Copy across JNI include files -->
-        <copy todir="${hy.jdk}/include" overwrite="yes">
-            <fileset dir="${native.shared.src.root}/include">
-                <include name="jni.h" />
-            </fileset>
-            <fileset dir="${native.shared.src.root}/include">
-                <include name="jniport.h" />
-            </fileset>
-        </copy>
     </target>
 
 
@@ -211,6 +203,30 @@
     	<unzip src="${iculib.zip}" dest="${native.src.root}/text/unicode" />
         <chmod dir="${native.src.root}/text/unicode" perm="ugo+r" />
     </target>
+
+    <!-- ================================= 
+          target: copy-includes              
+         ================================= -->
+	<target name="copy-includes" >
+		<!-- Call copy.native.includes targets to copy across global includes to 
+		    		 deploy/includes/harmony -->
+    	<ant dir="${basedir}/../modules/archive" antfile="make/build.xml" 
+    		target="copy.native.includes" />
+    	<ant dir="${basedir}/../modules/luni" antfile="make/build.xml" 
+    		target="copy.native.includes" />
+	</target>
+	
+	<!-- ================================= 
+          target: clean-includes              
+         ================================= -->
+	<target name="clean-includes" >
+		<!-- Call clean.native.includes targets to delete global includes under
+		    		 deploy/includes/harmony -->
+    	<ant dir="${basedir}/../modules/archive" antfile="make/build.xml" 
+    		target="clean.native.includes" />
+    	<ant dir="${basedir}/../modules/luni" antfile="make/build.xml" 
+    		target="clean.native.includes" />
+	</target>
 
     <!-- ================================= 
           target: clean-overlay-oss              

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile Wed Jun
 7 03:17:22 2006
@@ -18,7 +18,8 @@
 
 include ../makefile.include
 
-CFLAGS += -fpic -I$(SHARED)common -I../zlib/dist
+CFLAGS += -fpic -I$(SHARED)common -I../zlib/dist \
+	-I../../../modules/archive/src/main/native/include/shared
 
 BUILDFILES = $(SHAREDSUB)archive_copyright.o $(SHAREDSUB)jclcrc32.o \
 	$(SHAREDSUB)zip.o $(SHAREDSUB)adler32.o $(SHAREDSUB)inflater.o \

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile Wed Jun
 7 03:17:22 2006
@@ -21,5 +21,6 @@
 BUILDFILES = $(SHAREDSUB)libglob.o $(SHAREDSUB)iohelp.o \
 	$(SHAREDSUB)utf8encode.o $(SHAREDSUB)utf8decode.o
 LIBNAME = $(LIBPATH)libhycommon.a
+CFLAGS += -I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
 
 include ../rules.mk

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile Wed Jun
 7 03:17:22 2006
@@ -45,6 +45,7 @@
 CFLAGS= -O0 -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -DHYX86 -D_IEEE_LIBM \
         -DHY_PLATFORM_DOUBLE_ORDER \
 	-I../include -I. -I$(SHARED)include -I$(SHAREDSUB) \
+	-I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
\
 	-ffloat-store $(VMDEBUG)
 
 LIBNAME = $(LIBPATH)libhyfdlibm.a

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile Wed Jun
 7 03:17:22 2006
@@ -18,7 +18,8 @@
 
 include ../makefile.include
 
-CFLAGS += -fpic -I$(SHARED)common -I$(SHARED)fdlibm
+CFLAGS += -fpic -I$(SHARED)common -I$(SHARED)fdlibm \
+	-I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
 
 BUILDFILES = \
 	$(SHAREDSUB)luni_copyright.o $(SHAREDSUB)file.o procimpl.o \

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile.include
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile.include?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile.include (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile.include Wed Jun
 7 03:17:22 2006
@@ -24,10 +24,11 @@
 CXX_DLL_LD = $(CXX)
 
 EXEPATH=../
+#DEPLOY=../../../deploy/
 LIBPATH=../lib/
 
 SHARED=../../shared/
 SHAREDSUB=$(SHARED)$(notdir $(CURDIR))/
 
 CFLAGS = -O1 -march=pentium3 -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT \
-         -DHYX86 $(VMDEBUG) -I../include -I$(SHARED)include -I. -I$(SHAREDSUB)
+         -DHYX86 $(VMDEBUG) -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/makefile Wed Jun
 7 03:17:22 2006
@@ -18,6 +18,7 @@
 
 include ../makefile.include
 
+CFLAGS += -I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
 BUILDFILES = $(SHAREDSUB)pool.o $(SHAREDSUB)pool_cap.o
 LIBNAME = $(LIBPATH)libhypool.a
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hysl.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hysl.c?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hysl.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hysl.c Wed Jun  7
03:17:22 2006
@@ -53,7 +53,6 @@
 /* End copy */
 
 #include "hyport.h"
-#include "hylib.h"
 #include "portnls.h"
 
 #define PLATFORM_DLL_EXTENSION ".so"

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile Wed Jun
 7 03:17:22 2006
@@ -18,7 +18,8 @@
 
 include ../makefile.include
 
-CFLAGS += -fpic -DHYPORT_LIBRARY_DEFINE
+CFLAGS += -fpic -DHYPORT_LIBRARY_DEFINE \
+	-I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
 
 BUILDFILES = \
 	$(SHAREDSUB)port_copyright.o hycpu.o $(SHAREDSUB)hyerror.o \

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/sig/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/sig/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/sig/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/sig/makefile Wed Jun 
7 03:17:22 2006
@@ -18,7 +18,7 @@
 
 include ../makefile.include
 
-CFLAGS += -fpic
+CFLAGS += -fpic -I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
 BUILDFILES = $(SHAREDSUB)hysig_copyright.o hysiglinux.o hysigunix.o
 DLLNAME = ../libhysig.so
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile Wed Jun
 7 03:17:22 2006
@@ -18,7 +18,7 @@
 
 include ../makefile.include
 
-CFLAGS += -fpic
+CFLAGS += -fpic -I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
 
 BUILDFILES = \
 	$(SHAREDSUB)thread_copyright.o thrhelp.o thrspinlock.o hythread.o \

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile Wed Jun 
7 03:17:22 2006
@@ -18,7 +18,7 @@
 
 include ../makefile.include
 
-CFLAGS += -fpic
+CFLAGS += -fpic -I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
 BUILDFILES = $(SHAREDSUB)vmi_copyright.o $(SHAREDSUB)vmi.o
 MDLLIBFILES = ../lib/libhyzip.a ../lib/libhypool.a
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile Wed Jun
 7 03:17:22 2006
@@ -18,6 +18,7 @@
 
 include ../makefile.include
 
+CFLAGS += -I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
 BUILDFILES = $(SHAREDSUB)vmls.o
 LIBNAME = $(LIBPATH)libhyvmls.a
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile Wed Jun 
7 03:17:22 2006
@@ -18,7 +18,7 @@
 
 include ../makefile.include
 
-CFLAGS += -I../zlib/dist 
+CFLAGS += -I../zlib/dist -I../../../modules/archive/src/main/native/include/shared
 BUILDFILES = $(SHAREDSUB)zcpool.o $(SHAREDSUB)zipalloc.o \
 	$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o
 LIBNAME = $(LIBPATH)libhyzip.a

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile Wed Jun
 7 03:17:22 2006
@@ -18,7 +18,7 @@
 
 include ../makefile.include
 
-CFLAGS += -fpic
+CFLAGS += -fpic -I../../../modules/archive/src/main/native/include/shared
 
 BUILDFILES = \
 	$(SHAREDSUB)zlib_copyright.o dist/adler32.o dist/compress.o \

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/zip/zipsup.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/shared/zip/zipsup.c?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/shared/zip/zipsup.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/zip/zipsup.c Wed Jun  7 03:17:22
2006
@@ -23,7 +23,6 @@
 
 #include "hyport.h"
 #include "zipsup.h"
-#include "hylib.h"
 #include "hyzipnls.h"
 
 #include "zlib.h"

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile Wed Jun
 7 03:17:22 2006
@@ -22,7 +22,8 @@
 LIBBASE=hyarchive
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
-HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I..\zlib\dist
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I..\zlib\dist \
+	   /I..\..\..\modules\archive\src\main\native\include\shared
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile Wed Jun
 7 03:17:22 2006
@@ -26,6 +26,6 @@
 	locklbl.obj lock386.obj \
 	$(SHAREDSUB)utf8decode.obj $(SHAREDSUB)utf8encode.obj
 
-HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I..\..\..\modules\luni\src\main\native\include\shared
/I..\..\..\modules\luni\src\main\native\include\windows
 
 !include <..\rules.mak>

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/defines.mak
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/defines.mak?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/defines.mak (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/defines.mak Wed Jun  7 03:17:22
2006
@@ -4,7 +4,8 @@
 SEHMAP = TRUE
 !include <win32.mak>
 
-LIBPATH=..\lib\# comment to avoid \ being treated as continuation
+#DEPLOY=..\..\..\deploy\# comment to avoid \ being treated as continuation
+LIBPATH=..\lib\# ditto
 EXEPATH=..\# ditto
 DLLPATH=..\# ditto
 SHARED=..\..\shared\# ditto
@@ -12,4 +13,4 @@
 HYCFLAGS = \
   -Ogityb1 -WX -GF -Gs -MD -Zi -Zm400 \
   -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ -DWINVER=0x0400 \
-  $(VMDEBUG) /I..\include /I$(SHARED)include /I.
+  $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I.

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/makefile Wed Jun
 7 03:17:22 2006
@@ -45,7 +45,7 @@
   dist/w_remainder.obj dist/w_scalb.obj dist/w_sinh.obj dist/w_sqrt.obj
 
 HYCFLAGS = -Oityb1 -W3 -Fd$(LIBPATH)hyfdlibm.pdb -D_IEEE_LIBM \
-	 -DHY_PLATFORM_DOUBLE_ORDER /I$(SHAREDSUB)
+	 -DHY_PLATFORM_DOUBLE_ORDER /I$(SHAREDSUB) /I..\..\..\modules\luni\src\main\native\include\shared
/I..\..\..\modules\luni\src\main\native\include\windows
 
 .c.obj:
         $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.c

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/java.rc
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/java.rc?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/java.rc (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/java.rc Wed Jun
 7 03:17:22 2006
@@ -46,4 +46,4 @@
 	END
 END
 
-100	ICON	DISCARDABLE	"../include/apache.ico"
+100	ICON	DISCARDABLE	"apache.ico"

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/javaw.rc
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/javaw.rc?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/javaw.rc (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/javaw.rc Wed Jun
 7 03:17:22 2006
@@ -46,4 +46,4 @@
 	END
 END
 
-100	ICON	DISCARDABLE	"../include/apache.ico"
+100	ICON	DISCARDABLE	"apache.ico"

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile Wed Jun  7
03:17:22 2006
@@ -22,7 +22,8 @@
 LIBBASE=hyluni
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
-HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I$(SHARED)fdlibm
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I$(SHARED)fdlibm \
+	   /I..\..\..\modules\luni\src\main\native\include\shared /I..\..\..\modules\luni\src\main\native\include\windows
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile Wed Jun  7
03:17:22 2006
@@ -21,5 +21,6 @@
 SHAREDSUB=$(SHARED)pool\# comment to avoid \ being treated as continuation
 LIBNAME=$(LIBPATH)hypool.lib
 BUILDFILES = $(SHAREDSUB)pool.obj $(SHAREDSUB)pool_cap.obj
+HYCFLAGS = $(HYCFLAGS) /I..\..\..\modules\luni\src\main\native\include\shared /I..\..\..\modules\luni\src\main\native\include\windows
 
 !include <..\rules.mak>

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/hysl.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/hysl.c?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/hysl.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/hysl.c Wed Jun  7 03:17:22
2006
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <malloc.h>
-#include "hylib.h"
 #include "portnls.h"
 
 #if !defined(HINSTANCE_ERROR)

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile Wed Jun  7
03:17:22 2006
@@ -23,7 +23,7 @@
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 
-HYCFLAGS = $(HYCFLAGS) -DHYPORT_LIBRARY_DEFINE /I$(SHAREDSUB)
+HYCFLAGS = $(HYCFLAGS) -DHYPORT_LIBRARY_DEFINE /I$(SHAREDSUB) /I..\..\..\modules\luni\src\main\native\include\shared
/I..\..\..\modules\luni\src\main\native\include\windows
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile Wed Jun  7
03:17:22 2006
@@ -24,6 +24,7 @@
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 BUILDFILES = $(SHAREDSUB)hysig_copyright.obj hysigwin.obj
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
+HYCFLAGS = $(HYCFLAGS) /I..\..\..\modules\luni\src\main\native\include\shared /I..\..\..\modules\luni\src\main\native\include\windows
 VIRTFILES = $(LIBBASE).res
 DLLBASE=0x13100000
 COMMENT=/comment:"Signal handling support DLL. (c) Copyright 1993, 2005 The Apache Software
Foundation or its licensors, as applicable."

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile Wed Jun
 7 03:17:22 2006
@@ -30,7 +30,7 @@
 
 # TOFIX $(LIBBASE).def should be a dependency on all libs
 VIRTFILES = $(LIBBASE).res
-HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I..\..\..\modules\luni\src\main\native\include\shared
/I..\..\..\modules\luni\src\main\native\include\windows
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def 
 
 MDLLIBFILES = ..\lib\hypool.lib ..\lib\hycommon.lib

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile Wed Jun  7
03:17:22 2006
@@ -21,7 +21,7 @@
 SHAREDSUB=$(SHARED)vmi\# comment to avoid \ being treated as continuation
 LIBBASE=vmi
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
-HYCFLAGS = $(HYCFLAGS) -DHYPORT_LIBRARY_DEFINE
+HYCFLAGS = $(HYCFLAGS) -DHYPORT_LIBRARY_DEFINE /I..\..\..\modules\luni\src\main\native\include\shared
/I..\..\..\modules\luni\src\main\native\include\windows
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = $(SHAREDSUB)vmi_copyright.obj $(SHAREDSUB)vmi.obj

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile Wed Jun  7
03:17:22 2006
@@ -24,6 +24,6 @@
 BUILDFILES = \
 	$(SHAREDSUB)vmls.obj
 
-HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I..\..\..\modules\luni\src\main\native\include\shared
/I..\..\..\modules\luni\src\main\native\include\windows
 
 !include <..\rules.mak>

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile Wed Jun  7
03:17:22 2006
@@ -23,6 +23,6 @@
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 BUILDFILES = $(SHAREDSUB)zcpool.obj $(SHAREDSUB)zipalloc.obj \
 	$(SHAREDSUB)zipcache.obj $(SHAREDSUB)zipsup.obj
-HYCFLAGS = $(HYCFLAGS) /I..\zlib\dist
+HYCFLAGS = $(HYCFLAGS) /I..\zlib\dist /I..\..\..\modules\archive\src\main\native\include\shared
 
 !include <..\rules.mak>

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile?rev=412357&r1=412356&r2=412357&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile Wed Jun  7
03:17:22 2006
@@ -27,7 +27,7 @@
 HYCFLAGS = \
   -Ogityb1 -W3 -GF -Gs -MD -Zi -Zm400 \
   -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ -DWINVER=0x0400 \
-  $(VMDEBUG) /I..\include /I$(SHARED)include /I.
+  $(VMDEBUG) /I..\include /I$(SHARED)include /I. /I..\..\..\modules\archive\src\main\native\include\shared
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \



Mime
View raw message