You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/07/04 15:04:55 UTC
svn commit: r418998 - in /incubator/harmony/enhanced/classlib/trunk:
modules/archive/ modules/archive/src/main/native/zip/
modules/archive/src/main/native/zip/linux/
modules/archive/src/main/native/zip/shared/
modules/archive/src/main/native/zip/window...
Author: tellison
Date: Tue Jul 4 06:04:53 2006
New Revision: 418998
URL: http://svn.apache.org/viewvc?rev=418998&view=rev
Log:
Apply patch HARMONY-744 ([classlib] Move vmi, zip, zlib and luni natives to their relevant modules)
Added:
incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/
incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/linux/
- copied from r418996, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/
incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/shared/
- copied from r418996, incubator/harmony/enhanced/classlib/trunk/native-src/shared/zip/
incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/windows/
- copied from r418996, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/
incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/ (with props)
incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/linux/
- copied from r418996, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/
incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/shared/
- copied from r418996, incubator/harmony/enhanced/classlib/trunk/native-src/shared/zlib/
incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/windows/
- copied from r418996, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/fdlibm.h
- copied unchanged from r418996, incubator/harmony/enhanced/classlib/trunk/native-src/shared/fdlibm/fdlibm.h
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hymagic.h
- copied unchanged from r418996, incubator/harmony/enhanced/classlib/trunk/native-src/shared/fdlibm/hymagic.h
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/ (with props)
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/
- copied from r418996, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/
- copied from r418996, incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/
- copied from r418996, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/linux/
- copied from r418996, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/shared/
- copied from r418996, incubator/harmony/enhanced/classlib/trunk/native-src/shared/vmi/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/windows/
- copied from r418996, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/
Removed:
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/
incubator/harmony/enhanced/classlib/trunk/native-src/shared/fdlibm/fdlibm.h
incubator/harmony/enhanced/classlib/trunk/native-src/shared/fdlibm/hymagic.h
incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/
incubator/harmony/enhanced/classlib/trunk/native-src/shared/vmi/
incubator/harmony/enhanced/classlib/trunk/native-src/shared/zip/
incubator/harmony/enhanced/classlib/trunk/native-src/shared/zlib/
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/linux/makefile
incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/windows/makefile
incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/linux/makefile
incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/windows/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/linux/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/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/win.IA32/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=418998&r1=418997&r2=418998&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml Tue Jul 4 06:04:53 2006
@@ -58,13 +58,28 @@
<!-- Build native code -->
<target name="build.native" >
+ <exec failonerror="true"
+ executable="${make.command}"
+ dir="${hy.archive.src.main.native}/zip/${hy.os}">
+ <env key="HY_HDK" value="${hy.hdk}" />
+ </exec>
+
+ <exec failonerror="true"
+ executable="${make.command}"
+ dir="${hy.archive.src.main.native}/zlib/${hy.os}">
+ <env key="HY_HDK" value="${hy.hdk}" />
+ </exec>
+ <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+ <fileset dir="${hy.archive.src.main.native}/zlib">
+ <patternset includes="*${shlib.suffix}*" />
+ </fileset>
+ </copy>
+
<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}*" />
@@ -74,6 +89,18 @@
<!-- Clean natives -->
<target name="clean.native">
+ <exec failonerror="true"
+ executable="${make.command}"
+ dir="${hy.archive.src.main.native}/zip/${hy.os}">
+ <env key="HY_HDK" value="${hy.hdk}" />
+ <arg line="clean" />
+ </exec>
+ <exec failonerror="true"
+ executable="${make.command}"
+ dir="${hy.archive.src.main.native}/zlib/${hy.os}">
+ <env key="HY_HDK" value="${hy.hdk}" />
+ <arg line="clean" />
+ </exec>
<exec failonerror="true"
executable="${make.command}"
dir="${hy.archive.src.main.native}/archive/${hy.os}">
Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/linux/makefile?rev=418998&r1=418996&r2=418998&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/linux/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/linux/makefile Tue Jul 4 06:04:53 2006
@@ -18,8 +18,9 @@
include $(HY_HDK)/build/make/makefile.include
-CFLAGS += -I../../../modules/archive/src/main/native/zlib_dist \
- -I../../../modules/archive/src/main/native/include/shared
+SHAREDSUB=../shared/
+
+CFLAGS += -I../../zlib_dist
BUILDFILES = $(SHAREDSUB)zcpool.o $(SHAREDSUB)zipalloc.o \
$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o
LIBNAME = $(LIBPATH)libhyzip.a
Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/windows/makefile?rev=418998&r1=418996&r2=418998&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/windows/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/windows/makefile Tue Jul 4 06:04:53 2006
@@ -18,12 +18,11 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=$(SHARED)zip\# comment to avoid \ being treated as continuation
+SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
LIBBASE=hyzip
LIBNAME=$(LIBPATH)$(LIBBASE).lib
BUILDFILES = $(SHAREDSUB)zcpool.obj $(SHAREDSUB)zipalloc.obj \
$(SHAREDSUB)zipcache.obj $(SHAREDSUB)zipsup.obj
-HYCFLAGS = $(HYCFLAGS) /I..\..\..\modules\archive\src\main\native\zlib_dist \
- /I..\..\..\modules\archive\src\main\native\include\shared
+HYCFLAGS = $(HYCFLAGS) /I..\..\zlib_dist
!include <$(HY_HDK)\build\make\rules.mak>
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jul 4 06:04:53 2006
@@ -0,0 +1,4 @@
+*.dll
+*.map
+*.pdb
+*.so
Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/linux/makefile?rev=418998&r1=418996&r2=418998&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/linux/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/linux/makefile Tue Jul 4 06:04:53 2006
@@ -18,14 +18,15 @@
include $(HY_HDK)/build/make/makefile.include
-ARCHIVE_NATIVE=../../../modules/archive/src/main/native/# temporary addition until zlib moves into archive module
+SHAREDSUB=../shared/
+ZLIB_DIST=../../zlib_dist/# Path to zlib
-CFLAGS += -fpic -I$(ARCHIVE_NATIVE)include/shared
+CFLAGS += -fpic
BUILDFILES = \
- $(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
+ $(SHAREDSUB)zlib_copyright.o $(ZLIB_DIST)adler32.o $(ZLIB_DIST)compress.o \
+ $(ZLIB_DIST)crc32.o $(ZLIB_DIST)deflate.o $(ZLIB_DIST)infback.o $(ZLIB_DIST)inffast.o \
+ $(ZLIB_DIST)inflate.o $(ZLIB_DIST)inftrees.o $(ZLIB_DIST)trees.o $(ZLIB_DIST)uncompr.o $(ZLIB_DIST)zutil.o
DLLNAME = ../libhyzlib.so
Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/windows/makefile?rev=418998&r1=418996&r2=418998&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/windows/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/windows/makefile Tue Jul 4 06:04:53 2006
@@ -18,25 +18,25 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=$(SHARED)zlib\# comment to avoid \ being treated as continuation
+SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
LIBBASE=hyzlib
DLLNAME=..\$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
-ARCHIVE_NATIVE=..\..\..\modules\archive\src\main\native\# temporary addition until zlib moves into archive module
+ZLIB_DIST=..\..\zlib_dist\# Path to zlib
# 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$(ARCHIVE_NATIVE)include\shared
+ $(VMDEBUG)
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
BUILDFILES = \
- $(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
+ $(SHAREDSUB)zlib_copyright.obj $(ZLIB_DIST)adler32.obj $(ZLIB_DIST)compress.obj \
+ $(ZLIB_DIST)crc32.obj $(ZLIB_DIST)deflate.obj $(ZLIB_DIST)gzio.obj $(ZLIB_DIST)infback.obj \
+ $(ZLIB_DIST)inffast.obj $(ZLIB_DIST)inflate.obj $(ZLIB_DIST)inftrees.obj $(ZLIB_DIST)trees.obj \
+ $(ZLIB_DIST)uncompr.obj $(ZLIB_DIST)zutil.obj
VIRTFILES = $(LIBBASE).res
DLLBASE=0x11700000
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=418998&r1=418997&r2=418998&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Tue Jul 4 06:04:53 2006
@@ -51,6 +51,8 @@
<include name="gp.h" />
<include name="iohelp.h" />
<include name="libglob.h" />
+ <include name="fdlibm.h" />
+ <include name="hymagic.h" />
</fileset>
</copy>
<copy todir="${hy.jdk}/include" overwrite="yes">
@@ -87,25 +89,55 @@
</target>
<!-- Build native code -->
- <target name="build.native" >
+ <target name="build.native" depends="build.native.core, build.native.secondary" />
+
+ <target name="build.native.core" >
+ <exec failonerror="true"
+ executable="${make.command}"
+ dir="${hy.luni.src.main.native}/vmi/${hy.os}">
+ <env key="HY_HDK" value="${hy.hdk}" />
+ </exec>
+
+ <!-- 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="${hy.luni.src.main.native}/vmi">
+ <include name="libvmi.so"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- Build secondary native code -->
+ <target name="build.native.secondary" >
+ <exec failonerror="true"
+ executable="${make.command}"
+ dir="${hy.luni.src.main.native}/luni/${hy.os}">
+ <env key="HY_HDK" value="${hy.hdk}" />
+ </exec>
+ <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+ <fileset dir="${hy.luni.src.main.native}/luni">
+ <patternset includes="*${shlib.suffix}*" />
+ </fileset>
+ </copy>
+
<exec failonerror="true"
executable="${make.command}"
dir="${hy.luni.src.main.native}/vmls/${hy.os}">
<env key="HY_HDK" value="${hy.hdk}" />
</exec>
+ <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+ <fileset dir="${hy.luni.src.main.native}/vmls">
+ <patternset includes="*${shlib.suffix}*" />
+ </fileset>
+ </copy>
+
<exec failonerror="true"
executable="${make.command}"
dir="${hy.luni.src.main.native}/launcher/${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.luni.src.main.native}/vmls">
- <patternset includes="*${shlib.suffix}*" />
- </fileset>
- </copy>
-
<!-- Copy across the built executables -->
<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
<fileset dir="${hy.luni.src.main.native}/launcher">
@@ -117,6 +149,18 @@
<!-- Clean natives -->
<target name="clean.native" if="is.windows">
+ <exec failonerror="true"
+ executable="${make.command}"
+ dir="${hy.luni.src.main.native}/vmi/${hy.os}">
+ <env key="HY_HDK" value="${hy.hdk}" />
+ <arg line="clean" />
+ </exec>
+ <exec failonerror="true"
+ executable="${make.command}"
+ dir="${hy.luni.src.main.native}/luni/${hy.os}">
+ <env key="HY_HDK" value="${hy.hdk}" />
+ <arg line="clean" />
+ </exec>
<exec failonerror="true"
executable="${make.command}"
dir="${hy.luni.src.main.native}/launcher/${hy.os}">
@@ -159,6 +203,8 @@
<include name="hyportpg.h" />
<include name="iohelp.h" />
<include name="libglob.h" />
+ <include name="fdlibm.h" />
+ <include name="hymagic.h" />
</fileset>
</delete>
<delete failonerror="false">
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jul 4 06:04:53 2006
@@ -0,0 +1,4 @@
+*.dll
+*.map
+*.pdb
+*.so
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile?rev=418998&r1=418996&r2=418998&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile Tue Jul 4 06:04:53 2006
@@ -18,8 +18,9 @@
include $(HY_HDK)/build/make/makefile.include
-CFLAGS += -fpic -I$(SHARED)common -I$(SHARED)fdlibm \
- -I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
+SHAREDSUB=../shared/
+
+CFLAGS += -fpic
BUILDFILES = \
$(SHAREDSUB)luni_copyright.o $(SHAREDSUB)file.o procimpl.o \
@@ -36,8 +37,8 @@
OSNetworkSystemLinux.o
MDLLIBFILES = \
- $(LIBPATH)libhycommon.a ../libhysig.so $(LIBPATH)libhyzip.a ../libhyzlib.so \
- $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a ../libhythr.so ../libvmi.so
+ $(LIBPATH)libhycommon.a $(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
+ $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
DLLNAME = ../libhyluni.so
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile?rev=418998&r1=418996&r2=418998&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile Tue Jul 4 06:04:53 2006
@@ -18,12 +18,11 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=$(SHARED)luni\# comment to avoid \ being treated as continuation
+SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
LIBBASE=hyluni
DLLNAME=..\$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
-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
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
BUILDFILES = \
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/linux/makefile?rev=418998&r1=418996&r2=418998&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/linux/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/linux/makefile Tue Jul 4 06:04:53 2006
@@ -18,9 +18,11 @@
include $(HY_HDK)/build/make/makefile.include
-CFLAGS += -fpic -I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
+SHAREDSUB=../shared/
+
+CFLAGS += -fpic
BUILDFILES = $(SHAREDSUB)vmi_copyright.o $(SHAREDSUB)vmi.o
-MDLLIBFILES = $(LIBPATH)libhyzip.a $(LIBPATH)libhypool.a
+MDLLIBFILES = $(LIBPATH)libhypool.a
DLLNAME = ../libvmi.so
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/windows/makefile?rev=418998&r1=418996&r2=418998&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/windows/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/windows/makefile Tue Jul 4 06:04:53 2006
@@ -18,10 +18,10 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=$(SHARED)vmi\# comment to avoid \ being treated as continuation
+SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
LIBBASE=vmi
LIBNAME=$(LIBPATH)$(LIBBASE).lib
-HYCFLAGS = $(HYCFLAGS) -DHYPORT_LIBRARY_DEFINE /I..\..\..\modules\luni\src\main\native\include\shared /I..\..\..\modules\luni\src\main\native\include\windows
+HYCFLAGS = $(HYCFLAGS) -DHYPORT_LIBRARY_DEFINE
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
BUILDFILES = $(SHAREDSUB)vmi_copyright.obj $(SHAREDSUB)vmi.obj
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=418998&r1=418997&r2=418998&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/build.xml Tue Jul 4 06:04:53 2006
@@ -128,22 +128,14 @@
<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\luni" antfile="build.xml" target="build.native.core" />
<ant dir="..\modules\archive" antfile="build.xml" target="build.native" />
+ <ant dir="..\modules\auth" 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\luni" antfile="build.xml" target="build.native.secondary" />
<ant dir="..\modules\nio" antfile="build.xml" target="build.native" />
</target>
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=418998&r1=418997&r2=418998&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile Tue Jul 4 06:04:53 2006
@@ -17,8 +17,7 @@
#
all: \
- _sig _common _pool _thread _port _fdlibm _zip \
- _zlib _vmi _luni
+ _sig _common _pool _thread _port _fdlibm
_pool:
(cd pool && $(MAKE) )
@@ -38,27 +37,11 @@
_fdlibm:
(cd fdlibm && $(MAKE) )
-_zip:
- (cd zip && $(MAKE) )
-
-_zlib:
- (cd zlib && $(MAKE) )
-
-_vmi: _zip _pool
- (cd vmi && $(MAKE) )
-
-_luni: _common _sig _zip _zlib _pool _fdlibm _thread _vmi
- (cd luni && $(MAKE) )
-
clean:
(cd sig && $(MAKE) clean )
+ (cd common && $(MAKE) clean )
(cd pool && $(MAKE) clean )
(cd thread && $(MAKE) clean )
(cd port && $(MAKE) clean )
(cd fdlibm && $(MAKE) clean )
- (cd zip && $(MAKE) clean )
- (cd zlib && $(MAKE) clean )
- (cd vmi && $(MAKE) clean )
- (cd common && $(MAKE) clean )
- (cd luni && $(MAKE) clean )
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=418998&r1=418997&r2=418998&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile Tue Jul 4 06:04:53 2006
@@ -19,19 +19,13 @@
!include <ntwin32.mak>
all: \
- _sig _pool _thread _port _fdlibm _zip \
- _zlib _common _luni _vmi
+ _sig _common _pool _thread _port _fdlibm
_pool:
cd pool
$(MAKE) /NOLOGO
cd ..
-_vmi: _zip _pool
- cd vmi
- $(MAKE) /NOLOGO
- cd ..
-
_thread: _pool _common
cd thread
$(MAKE) /NOLOGO
@@ -52,36 +46,12 @@
$(MAKE) /NOLOGO
cd ..
-_zip:
- cd zip
- $(MAKE) /NOLOGO
- cd ..
-
-_zlib:
- cd zlib
- $(MAKE) /NOLOGO
- cd ..
-
_common:
cd common
$(MAKE) /NOLOGO
cd ..
-_luni: _common _sig _zip _zlib _pool _fdlibm _thread _vmi
- cd luni
- $(MAKE) /NOLOGO
- cd ..
-
clean:
- cd common
- $(MAKE) /NOLOGO clean
- cd ..
- cd luni
- $(MAKE) /NOLOGO clean
- cd ..
- cd vmi
- $(MAKE) /NOLOGO clean
- cd ..
cd fdlibm
$(MAKE) /NOLOGO clean
cd ..
@@ -97,10 +67,7 @@
cd thread
$(MAKE) /NOLOGO clean
cd ..
- cd zip
- $(MAKE) /NOLOGO clean
- cd ..
- cd zlib
+ cd common
$(MAKE) /NOLOGO clean
cd ..