harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r418088 - in /incubator/harmony/enhanced/classlib/trunk: modules/archive/ modules/archive/src/main/native/archive/ modules/archive/src/main/native/archive/linux/ modules/archive/src/main/native/archive/shared/ modules/archive/src/main/nativ...
Date Thu, 29 Jun 2006 17:19:58 GMT
Author: hindessm
Date: Thu Jun 29 10:19:55 2006
New Revision: 418088

URL: http://svn.apache.org/viewvc?rev=418088&view=rev
Log:
Applied changes from "[#HARMONY-709] [classlib] Move auth, archive and text natives to modules".

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/linux/
      - copied from r418078, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/
      - copied from r418078, incubator/harmony/enhanced/classlib/trunk/native-src/shared/archive/
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/
      - copied from r418078, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/linux/
      - copied from r418078, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/shared/
      - copied from r418078, incubator/harmony/enhanced/classlib/trunk/native-src/shared/auth/
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/
      - copied from r418078, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/iohelp.h
      - copied unchanged from r418078, incubator/harmony/enhanced/classlib/trunk/native-src/shared/common/iohelp.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/libglob.h
      - copied unchanged from r418078, incubator/harmony/enhanced/classlib/trunk/native-src/shared/common/libglob.h
    incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/native/
    incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/
    incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/
      - copied from r418078, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/
    incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/shared/
      - copied from r418078, incubator/harmony/enhanced/classlib/trunk/native-src/shared/text/
    incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/
      - copied from r418078, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/
Removed:
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/archive/
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/auth/
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/common/iohelp.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/common/libglob.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/text/
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/auth/make/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/text/make/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/build.xml
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/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/win.IA32/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/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml?rev=418088&r1=418087&r2=418088&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml Thu Jun 29 10:19:55
2006
@@ -34,6 +34,7 @@
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
+	<property name="zlib.zip" location="${depends.oss}/zlib_1.2.3.zip" />
 
     <target name="build" depends="compile.java, build.jar" />
 	
@@ -43,6 +44,42 @@
 		<include name="zipsup.h" />
 	    </fileset>
 	</copy>
+    </target>
+	
+	<target name="overlay-oss">
+		<mkdir dir="${hy.archive.src.main.native}/zlib_dist" />
+		<unzip src="${zlib.zip}" dest="${hy.archive.src.main.native}/zlib_dist" />
+		<chmod dir="${hy.archive.src.main.native}/zlib_dist" perm="ugo+r" />
+	</target>
+	
+	<target name="clean-overlay-oss">
+		<delete dir="${hy.archive.src.main.native}/zlib_dist" quiet="true" />
+	</target>
+
+	<!-- Build native code -->
+    <target name="build.native" >
+		<exec failonerror="true" 
+              executable="${make.command}" 
+              dir="${hy.archive.src.main.native}/archive/${hy.os}">
+            <env key="HY_HDK" value="${hy.hdk}" />
+        </exec>
+
+		<!-- Copy the built shared libs over to the jre/bin dir -->
+		<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+			<fileset dir="${hy.archive.src.main.native}/archive">
+                <patternset includes="*${shlib.suffix}*" />
+            </fileset>
+        </copy>
+    </target>
+	
+	<!-- Clean natives -->
+    <target name="clean.native">
+		<exec failonerror="true" 
+              executable="${make.command}" 
+              dir="${hy.archive.src.main.native}/archive/${hy.os}">
+            <env key="HY_HDK" value="${hy.hdk}" />
+		    <arg line="clean" />
+        </exec>
     </target>
 
     <target name="test" depends="build, compile.tests, run.tests" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/linux/makefile?rev=418088&r1=418078&r2=418088&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/linux/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/linux/makefile
Thu Jun 29 10:19:55 2006
@@ -18,16 +18,18 @@
 
 include $(HY_HDK)/build/make/makefile.include
 
-CFLAGS += -fpic -I$(SHARED)common -I../zlib/dist \
-	-I../../../modules/archive/src/main/native/include/shared
+SHAREDSUB=../shared/
+
+CFLAGS += -fpic -I$(SHARED)common -I../../zlib_dist \
+	-I../../include/shared
 
 BUILDFILES = $(SHAREDSUB)archive_copyright.o $(SHAREDSUB)jclcrc32.o \
 	$(SHAREDSUB)zip.o $(SHAREDSUB)adler32.o $(SHAREDSUB)inflater.o \
 	$(SHAREDSUB)jarfile.o $(SHAREDSUB)deflater.o $(SHAREDSUB)archiveglob.o
 
 MDLLIBFILES = \
-	../libhysig.so $(LIBPATH)libhyzip.a ../libhyzlib.so $(LIBPATH)libhycommon.a \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a ../libhythr.so ../libvmi.so
+	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a
\
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
 
 DLLNAME=../libhyarchive.so
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile?rev=418088&r1=418078&r2=418088&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile
Thu Jun 29 10:19:55 2006
@@ -18,12 +18,12 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-SHAREDSUB=$(SHARED)archive\# comment to avoid \ being treated as continuation
+SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
 LIBBASE=hyarchive
 DLLNAME=..\$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
-HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I..\zlib\dist \
-	   /I..\..\..\modules\archive\src\main\native\include\shared
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I..\..\zlib_dist \
+	   /I..\..\include\shared
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml?rev=418088&r1=418087&r2=418088&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml Thu Jun 29 10:19:55 2006
@@ -47,6 +47,32 @@
     <target name="build" depends="compile.java, build.jar" />
 
     <target name="test" depends="build, compile.tests, run.tests" />
+	
+	<!-- Build native code -->
+    <target name="build.native" >
+		<exec failonerror="true" 
+              executable="${make.command}" 
+              dir="${hy.auth.src.main.native}/auth/${hy.os}">
+            <env key="HY_HDK" value="${hy.hdk}" />
+        </exec>
+
+		<!-- Copy the built shared libs over to the jre/bin dir -->
+		<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+			<fileset dir="${hy.auth.src.main.native}/auth">
+                <patternset includes="*${shlib.suffix}*" />
+            </fileset>
+        </copy>
+    </target>
+	
+	<!-- Clean natives -->
+    <target name="clean.native">
+		<exec failonerror="true" 
+              executable="${make.command}" 
+              dir="${hy.auth.src.main.native}/auth/${hy.os}">
+            <env key="HY_HDK" value="${hy.hdk}" />
+		    <arg line="clean" />
+        </exec>
+    </target>
 
     <target name="clean">
         <delete failonerror="false">

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/make/hyproperties.xml?rev=418088&r1=418087&r2=418088&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/make/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/make/hyproperties.xml Thu Jun 29
10:19:55 2006
@@ -20,6 +20,7 @@
       <src>
          <main>
             <java location="src/main/java/common" />
+            <native location="src/main/native" />
         	<resources location="src/main/resources" />
          </main>
          <test>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/linux/makefile?rev=418088&r1=418078&r2=418088&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/linux/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/linux/makefile
Thu Jun 29 10:19:55 2006
@@ -18,11 +18,12 @@
 
 include $(HY_HDK)/build/make/makefile.include
 
+SHAREDSUB=../shared/
 CFLAGS += -fpic 
 BUILDFILES = $(SHAREDSUB)auth_copyright.o authnix.o
 MDLLIBFILES = \
-        ../libhysig.so $(LIBPATH)libhyzip.a ../libhyzlib.so $(LIBPATH)libhycommon.a \
-        $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a ../libhythr.so ../libvmi.so
+        $(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a
\
+        $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
 
 DLLNAME = ../libhyauth.so
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile?rev=418088&r1=418078&r2=418088&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile
Thu Jun 29 10:19:55 2006
@@ -18,7 +18,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-SHAREDSUB=$(SHARED)auth\# comment to avoid \ being treated as continuation
+SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
 LIBBASE=hyauth
 DLLNAME=..\$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=418088&r1=418087&r2=418088&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Thu Jun 29 10:19:55 2006
@@ -49,6 +49,8 @@
 		<include name="hysocket.h" />
 		<include name="hyporterror.h" />
 		<include name="gp.h" />
+	    <include name="iohelp.h" />
+	    <include name="libglob.h" />
 	    </fileset>
 	</copy>
 	<copy todir="${hy.jdk}/include" overwrite="yes">
@@ -154,7 +156,9 @@
 		<include name="hyporterror.h" />
 		<include name="gp.h" />
  		<include name="hysock.h" />
-		<include name="hyportpg.h" />	    	
+		<include name="hyportpg.h" />	 
+    	<include name="iohelp.h" />
+	    <include name="libglob.h" />
 	    </fileset>
 	</delete>
 	<delete failonerror="false">

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml?rev=418088&r1=418087&r2=418088&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml Thu Jun 29 10:19:55 2006
@@ -34,10 +34,48 @@
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
+	
+	<property name="iculib.zip" location="${depends.oss}/icu4c-3.4-harmony.zip" />
 
     <target name="build" depends="compile.java, build.jar" />
 
     <target name="test" depends="build, compile.tests, run.tests" />
+	
+	<target name="overlay-oss">
+		<mkdir dir="${hy.text.src.main.native}/icu4c/unicode" />
+	   	<unzip src="${iculib.zip}" dest="${hy.text.src.main.native}/icu4c/unicode" />
+	     <chmod dir="${hy.text.src.main.native}/icu4c/unicode" perm="ugo+r" />
+	</target>
+	
+	<target name="clean-overlay-oss">
+		<delete dir="${hy.text.src.main.native}/icu4c" quiet="true" />
+	</target>
+	
+	<!-- Build native code -->
+    <target name="build.native" >
+		<exec failonerror="true" 
+              executable="${make.command}" 
+              dir="${hy.text.src.main.native}/text/${hy.os}">
+            <env key="HY_HDK" value="${hy.hdk}" />
+        </exec>
+
+		<!-- Copy the built shared libs over to the jre/bin dir -->
+		<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+			<fileset dir="${hy.text.src.main.native}/text">
+                <patternset includes="*${shlib.suffix}*" />
+            </fileset>
+        </copy>
+    </target>
+	
+	<!-- Clean natives -->
+    <target name="clean.native">
+		<exec failonerror="true" 
+              executable="${make.command}" 
+              dir="${hy.text.src.main.native}/text/${hy.os}">
+            <env key="HY_HDK" value="${hy.hdk}" />
+		    <arg line="clean" />
+        </exec>
+    </target>
 
     <target name="clean">
         <delete failonerror="false">

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/make/hyproperties.xml?rev=418088&r1=418087&r2=418088&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/make/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/make/hyproperties.xml Thu Jun 29
10:19:55 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/modules/text/src/main/native/text/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/makefile?rev=418088&r1=418078&r2=418088&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/makefile
Thu Jun 29 10:19:55 2006
@@ -18,13 +18,14 @@
 
 include $(HY_HDK)/build/make/makefile.include
 
-CFLAGS += -fpic
+SHAREDSUB=../shared/
+CFLAGS += -fpic -I../../icu4c
 BUILDFILES = text_copyright.o $(SHAREDSUB)BidiWrapper.o
 
 MDLLIBFILES = \
-	unicode/libicuuc.so.34 \
-	../libhysig.so $(LIBPATH)libhyzip.a ../libhyzlib.so $(LIBPATH)libhycommon.a \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a ../libhythr.so ../libvmi.so
+	../../icu4c/unicode/libicuuc.so.34 \
+	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a
\
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
 
 DLLNAME = ../libhytext.so
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/makefile?rev=418088&r1=418078&r2=418088&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/makefile
Thu Jun 29 10:19:55 2006
@@ -18,19 +18,19 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-SHAREDSUB=$(SHARED)text\# comment to avoid \ being treated as continuation
+SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
 LIBBASE=hytext
 DLLNAME=..\$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def 
-HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I../../icu4c
 BUILDFILES = text_copyright.obj $(SHAREDSUB)BidiWrapper.obj
 VIRTFILES = hytext.res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = \
   $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib
\
-  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib unicode\icuuc.lib
+  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib ..\..\icu4c\unicode\icuuc.lib
 
 DLLBASE=0x13300000
 COMMENT=/comment:"Text component native code. (c) Copyright 1993, 2005 The Apache Software
Foundation or its licensors, as applicable."

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=418088&r1=418087&r2=418088&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/build.xml Thu Jun 29 10:19:55 2006
@@ -62,8 +62,6 @@
     	<property name="native.lib.target" location="${hy.hdk}/lib" />
 
         <property name="fdlibm.zip" location="${depends.oss}/fdlibm_5.2.zip" />
-        <property name="zlib.zip" location="${depends.oss}/zlib_1.2.3.zip" />
-        <property name="iculib.zip" location="${depends.oss}/icu4c-3.4-harmony.zip" />
     </target>
 
 
@@ -130,11 +128,23 @@
                 <patternset excludes="*vmi*${shlib.suffix}*" />
             </fileset>
         </copy>
+    	<!-- On Linux we want to copy the libvmi.so into the deploy/lib
+    	directory so that the natives can link against it. This is only used at
+    	build time - at runtime the libvmi.so provided by the VM implementation
+    	is loaded -->
+    	<copy todir="${hy.hdk}/lib" overwrite="yes" failonerror="false">
+    		<fileset dir="${target.platform}">
+    			<include name="libvmi.so"/>
+    		</fileset>
+    	</copy>
 
     	<!-- These module targets take care of building and copying their shared libs -->
+    	<ant dir="..\modules\auth" antfile="build.xml" target="build.native" />
+    	<ant dir="..\modules\archive" antfile="build.xml" target="build.native" />
+    	<ant dir="..\modules\text" antfile="build.xml" target="build.native" />
     	<ant dir="..\modules\prefs" antfile="build.xml" target="build.native" />
     	<ant dir="..\modules\luni" antfile="build.xml" target="build.native" />
-    	<ant dir="..\modules\nio" antfile="build.xml" target="build.native" />    	
+        <ant dir="..\modules\nio" antfile="build.xml" target="build.native" />    

     </target>
 
 
@@ -151,10 +161,13 @@
             <arg line="clean" />
         </exec>
     	
+    	<ant dir="..\modules\auth" antfile="build.xml" target="clean.native" />
+    	<ant dir="..\modules\archive" antfile="build.xml" target="clean.native" />
+       	<ant dir="..\modules\text" antfile="build.xml" target="clean.native" />
     	<ant dir="..\modules\prefs" antfile="build.xml" target="clean.native" />
     	<ant dir="..\modules\luni" antfile="build.xml" target="clean.native" />
     	<ant dir="..\modules\nio" antfile="build.xml" target="clean.native" />
-    		
+    	
     	<delete dir="${native.lib.target}" />
     	
     	<antcall target="clean-makefile-includes" />
@@ -207,12 +220,11 @@
         <unzip src="${fdlibm.zip}" dest="${native.src.root}/fdlibm/dist" />
         <chmod dir="${native.src.root}/fdlibm/dist" perm="ugo+r" />
 
-        <unzip src="${zlib.zip}" dest="${native.src.root}/zlib/dist" />
-        <chmod dir="${native.src.root}/zlib/dist" perm="ugo+r" />
-
-		<mkdir dir="${native.src.root}/text/unicode" />
-    	<unzip src="${iculib.zip}" dest="${native.src.root}/text/unicode" />
-        <chmod dir="${native.src.root}/text/unicode" perm="ugo+r" />
+    	<ant dir="${basedir}/../modules/archive" antfile="build.xml" 
+			target="overlay-oss" />        
+    	
+    	<ant dir="${basedir}/../modules/text" antfile="build.xml" 
+    				target="overlay-oss" /> 
     </target>
 
     <!-- ================================= 
@@ -266,8 +278,11 @@
          ================================= -->
     <target name="clean-overlay-oss" depends="properties">
         <delete dir="${native.src.root}/fdlibm/dist" quiet="true" />
-        <delete dir="${native.src.root}/zlib/dist" quiet="true" />
-        <delete dir="${native.src.root}/text/unicode" quiet="true" />
+    	
+    	<ant dir="${basedir}/../modules/archive" antfile="build.xml" 
+    				target="clean-overlay-oss" />
+    	<ant dir="${basedir}/../modules/text" antfile="build.xml" 
+    	    				target="clean-overlay-oss" />
     </target>
 
 </project>

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile?rev=418088&r1=418087&r2=418088&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile Thu Jun 29 10:19:55
2006
@@ -18,11 +18,7 @@
 
 all: \
 	_sig _common _pool _thread _port _fdlibm _zip \
-	_zlib _vmi _luni _archive _auth \
-	_text
-
-_auth:
-	(cd auth && $(MAKE) )
+	_zlib _vmi _luni
 
 _pool: 
 	(cd pool && $(MAKE) )
@@ -54,14 +50,7 @@
 _luni: _common _sig _zip _zlib _pool _fdlibm _thread _vmi
 	(cd luni && $(MAKE) )
 	
-_archive: _common _sig _zip _zlib _pool _fdlibm _thread _vmi
-	(cd archive && $(MAKE) )
-	
-_text: _sig _zip _zlib _pool _fdlibm _thread _vmi
-	(cd text && $(MAKE) )
-
 clean:
-	(cd auth && $(MAKE) clean )
 	(cd sig && $(MAKE) clean )
 	(cd pool  && $(MAKE) clean )
 	(cd thread && $(MAKE) clean )
@@ -72,6 +61,4 @@
 	(cd vmi && $(MAKE) clean )
 	(cd common && $(MAKE) clean )
 	(cd luni && $(MAKE) clean )
-	(cd archive && $(MAKE) clean )
-	(cd text && $(MAKE) clean )
 

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=418088&r1=418087&r2=418088&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 Thu Jun 29
10:19:55 2006
@@ -18,7 +18,8 @@
 
 include $(HY_HDK)/build/make/makefile.include
 
-CFLAGS += -I../zlib/dist -I../../../modules/archive/src/main/native/include/shared
+CFLAGS += -I../../../modules/archive/src/main/native/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=418088&r1=418087&r2=418088&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 Thu Jun
29 10:19:55 2006
@@ -18,12 +18,14 @@
 
 include $(HY_HDK)/build/make/makefile.include
 
-CFLAGS += -fpic -I../../../modules/archive/src/main/native/include/shared
+ARCHIVE_NATIVE=../../../modules/archive/src/main/native/# temporary addition until zlib moves
into archive module
+
+CFLAGS += -fpic -I$(ARCHIVE_NATIVE)include/shared
 
 BUILDFILES = \
-	$(SHAREDSUB)zlib_copyright.o dist/adler32.o dist/compress.o \
-	dist/crc32.o dist/deflate.o dist/infback.o dist/inffast.o \
-	dist/inflate.o dist/inftrees.o dist/trees.o dist/uncompr.o dist/zutil.o
+	$(SHAREDSUB)zlib_copyright.o $(ARCHIVE_NATIVE)zlib_dist/adler32.o $(ARCHIVE_NATIVE)zlib_dist/compress.o
\
+	$(ARCHIVE_NATIVE)zlib_dist/crc32.o $(ARCHIVE_NATIVE)zlib_dist/deflate.o $(ARCHIVE_NATIVE)zlib_dist/infback.o
$(ARCHIVE_NATIVE)zlib_dist/inffast.o \
+	$(ARCHIVE_NATIVE)zlib_dist/inflate.o $(ARCHIVE_NATIVE)zlib_dist/inftrees.o $(ARCHIVE_NATIVE)zlib_dist/trees.o
$(ARCHIVE_NATIVE)zlib_dist/uncompr.o $(ARCHIVE_NATIVE)zlib_dist/zutil.o
 
 DLLNAME = ../libhyzlib.so
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile?rev=418088&r1=418087&r2=418088&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile Thu Jun 29 10:19:55
2006
@@ -20,14 +20,8 @@
 
 all: \
 	_sig _pool _thread _port _fdlibm _zip \
-	_zlib _common _luni _vmi _auth \
-	_archive _text
+	_zlib _common _luni _vmi
 
-_auth:
-	cd auth
-	$(MAKE) /NOLOGO
-	cd ..
-	
 _pool: 
 	cd pool
 	$(MAKE) /NOLOGO
@@ -76,32 +70,13 @@
 _luni: _common _sig _zip _zlib _pool _fdlibm _thread _vmi
 	cd luni
 	$(MAKE) /NOLOGO
-	cd ..
-
-_archive: _common _sig _zip _zlib _pool _fdlibm _thread
-	cd archive
-	$(MAKE) /NOLOGO
-	cd ..
-
-_text: _sig _zip _zlib _pool _fdlibm _thread
-	cd text
-	$(MAKE) /NOLOGO
 	cd ..	
 
 clean:
-	cd auth
-	$(MAKE) /NOLOGO clean
-	cd ..
-	cd archive
-	$(MAKE) /NOLOGO clean
-	cd ..
 	cd common
 	$(MAKE) /NOLOGO clean
 	cd ..
 	cd luni
-	$(MAKE) /NOLOGO clean
-	cd ..
-	cd text
 	$(MAKE) /NOLOGO clean
 	cd ..
 	cd vmi

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=418088&r1=418087&r2=418088&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 Thu Jun 29
10:19:55 2006
@@ -23,6 +23,7 @@
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 BUILDFILES = $(SHAREDSUB)zcpool.obj $(SHAREDSUB)zipalloc.obj \
 	$(SHAREDSUB)zipcache.obj $(SHAREDSUB)zipsup.obj
-HYCFLAGS = $(HYCFLAGS) /I..\zlib\dist /I..\..\..\modules\archive\src\main\native\include\shared
+HYCFLAGS = $(HYCFLAGS) /I..\..\..\modules\archive\src\main\native\zlib_dist \
+	/I..\..\..\modules\archive\src\main\native\include\shared
 
 !include <$(HY_HDK)\build\make\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=418088&r1=418087&r2=418088&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 Thu Jun 29
10:19:55 2006
@@ -23,18 +23,20 @@
 DLLNAME=..\$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 
+ARCHIVE_NATIVE=..\..\..\modules\archive\src\main\native\# temporary addition until zlib moves
into archive module
+
 # override HYCFLAGS to get different warning behaviour (W3 not WX)
 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. /I..\..\..\modules\archive\src\main\native\include\shared
+  $(VMDEBUG) /I..\include /I$(SHARED)include /I. /I$(ARCHIVE_NATIVE)include\shared
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-  $(SHAREDSUB)zlib_copyright.obj dist\adler32.obj dist\compress.obj \
-  dist\crc32.obj dist\deflate.obj dist\gzio.obj dist\infback.obj \
-  dist\inffast.obj dist\inflate.obj dist\inftrees.obj dist\trees.obj \
-  dist\uncompr.obj dist\zutil.obj
+  $(SHAREDSUB)zlib_copyright.obj $(ARCHIVE_NATIVE)zlib_dist\adler32.obj $(ARCHIVE_NATIVE)zlib_dist\compress.obj
\
+  $(ARCHIVE_NATIVE)zlib_dist\crc32.obj $(ARCHIVE_NATIVE)zlib_dist\deflate.obj $(ARCHIVE_NATIVE)zlib_dist\gzio.obj
$(ARCHIVE_NATIVE)zlib_dist\infback.obj \
+  $(ARCHIVE_NATIVE)zlib_dist\inffast.obj $(ARCHIVE_NATIVE)zlib_dist\inflate.obj $(ARCHIVE_NATIVE)zlib_dist\inftrees.obj
$(ARCHIVE_NATIVE)zlib_dist\trees.obj \
+  $(ARCHIVE_NATIVE)zlib_dist\uncompr.obj $(ARCHIVE_NATIVE)zlib_dist\zutil.obj
 
 VIRTFILES = $(LIBBASE).res
 DLLBASE=0x11700000



Mime
View raw message