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/05 22:05:39 UTC
svn commit: r419323 - in /incubator/harmony/enhanced/classlib/trunk: ./
depends/build/ make/ modules/archive/src/main/native/archive/linux/
modules/archive/src/main/native/archive/windows/
modules/archive/src/main/native/zip/linux/ modules/archive/src/...
Author: tellison
Date: Wed Jul 5 13:05:33 2006
New Revision: 419323
URL: http://svn.apache.org/viewvc?rev=419323&view=rev
Log:
Apply patch HARMONY-772 ([classlib] Move last of native code into modules)
Added:
incubator/harmony/enhanced/classlib/trunk/make/build-native.xml
- copied, changed from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/common/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/common/linux/
- copied from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/common/shared/
- copied from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/shared/common/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/common/windows/
- copied from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/
- copied from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/shared/
- copied from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/shared/fdlibm/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/windows/
- copied from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/pool/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/pool/linux/
- copied from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/pool/shared/
- copied from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/shared/pool/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/pool/windows/
- copied from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/ (with props)
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/linux/
- copied from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/shared/
- copied from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/shared/port/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/windows/
- copied from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/sig/ (with props)
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/sig/linux/
- copied from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/sig/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/sig/shared/
- copied from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/shared/sig/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/sig/windows/
- copied from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/ (with props)
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/linux/
- copied from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/shared/
- copied from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/shared/thread/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/windows/
- copied from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/
Removed:
incubator/harmony/enhanced/classlib/trunk/native-src/
Modified:
incubator/harmony/enhanced/classlib/trunk/build.xml
incubator/harmony/enhanced/classlib/trunk/depends/build/defines.mak
incubator/harmony/enhanced/classlib/trunk/depends/build/makefile.include
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/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/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/luni/src/main/native/ (props changed)
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/common/linux/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/common/windows/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/windows/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw
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/pool/linux/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/pool/windows/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/linux/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/windows/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/sig/linux/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/sig/windows/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/linux/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/windows/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/windows/thrdsup.h
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/modules/luni/src/main/native/vmls/linux/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/windows/makefile
incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/linux/makefile
incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile
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
Modified: incubator/harmony/enhanced/classlib/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/build.xml?rev=419323&r1=419322&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/build.xml Wed Jul 5 13:05:33 2006
@@ -87,7 +87,7 @@
Building native libs and executables...
========================================
</echo>
- <ant antfile="native-src/build.xml" inheritall="false" target="build"/>
+ <ant antfile="make/build-native.xml" inheritall="false" target="build"/>
<ant antfile="make/build-test.xml" inheritall="false"
target="support.jar"/>
@@ -127,7 +127,7 @@
================================= -->
<target name="clean">
<ant antfile="make/build-java.xml" inheritall="false" target="clean" />
- <ant antfile="native-src/build.xml" inheritall="false" target="clean" />
+ <ant antfile="make/build-native.xml" inheritall="false" target="clean" />
<!-- Removed this for now since svn diff complains with
svn: Working copy 'doc/kernel_doc' is missing or not locked
if we run it. We shouldn't really clean things that are in the
Modified: incubator/harmony/enhanced/classlib/trunk/depends/build/defines.mak
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/depends/build/defines.mak?rev=419323&r1=419322&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/depends/build/defines.mak (original)
+++ incubator/harmony/enhanced/classlib/trunk/depends/build/defines.mak Wed Jul 5 13:05:33 2006
@@ -7,7 +7,7 @@
LIBPATH=$(HY_HDK)\lib\# comment to avoid \ being treated as continuation
EXEPATH=..\# ditto
DLLPATH=$(HY_HDK)\jdk\jre\bin\# ditto
-SHARED=..\..\shared\# ditto
+SHAREDSUB=..\shared\# ditto
HYCFLAGS = \
-Ogityb1 -WX -GF -Gs -MD -Zi -Zm400 \
Modified: incubator/harmony/enhanced/classlib/trunk/depends/build/makefile.include
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/depends/build/makefile.include?rev=419323&r1=419322&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/depends/build/makefile.include (original)
+++ incubator/harmony/enhanced/classlib/trunk/depends/build/makefile.include Wed Jul 5 13:05:33 2006
@@ -26,9 +26,7 @@
EXEPATH=../
LIBPATH=$(HY_HDK)/lib/
DLLPATH=$(HY_HDK)/jdk/jre/bin/
-
-SHARED=../../shared/
-SHAREDSUB=$(SHARED)$(notdir $(CURDIR))/
+SHAREDSUB=../shared/
CFLAGS = -O1 -march=pentium3 -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT \
-DHYX86 $(VMDEBUG) -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
Copied: incubator/harmony/enhanced/classlib/trunk/make/build-native.xml (from r419269, incubator/harmony/enhanced/classlib/trunk/native-src/build.xml)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-native.xml?p2=incubator/harmony/enhanced/classlib/trunk/make/build-native.xml&p1=incubator/harmony/enhanced/classlib/trunk/native-src/build.xml&r1=419269&r2=419323&rev=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-native.xml Wed Jul 5 13:05:33 2006
@@ -56,12 +56,7 @@
<property name="depends.oss" location="../depends/oss" />
<property name="depends.libs" location="../depends/libs/${target.platform}" />
<property name="depends.files" location="../depends/files" />
- <property name="build.output" location="../native-bin/${target.platform}" />
- <property name="native.src.root" location="${basedir}/${target.platform}" />
- <property name="native.shared.src.root" location="${basedir}/shared" />
<property name="native.lib.target" location="${hy.hdk}/lib" />
-
- <property name="fdlibm.zip" location="${depends.oss}/fdlibm_5.2.zip" />
</target>
@@ -112,23 +107,6 @@
<antcall target="copy-makefile-includes" />
- <exec failonerror="true"
- executable="${make.command}"
- dir="${target.platform}">
- <env key="HY_HDK" value="${hy.hdk}" />
- <arg line="all" />
- </exec>
-
- <!-- Copy across the built shared libs -->
- <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
- <fileset dir="${target.platform}">
- <patternset includes="*${shlib.suffix}*" />
- <!-- Don't copy the VMI library. the one we build is a stub that is
- replaced by a concrete implementation by the VM-implementor -->
- <patternset excludes="*vmi*${shlib.suffix}*" />
- </fileset>
- </copy>
-
<!-- These module targets take care of building and copying their shared libs -->
<ant dir="..\modules\luni" antfile="build.xml" target="build.native.core" />
<ant dir="..\modules\archive" antfile="build.xml" target="build.native" />
@@ -180,9 +158,6 @@
</fileset>
</copy>
- <!-- Make sure the Linux launcher has execute permission -->
- <chmod file="${hy.jdk}/jre/bin/java${exe.suffix}" perm="ugo+x" />
-
<!-- Copy across dependency shared libs -->
<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
<fileset dir="${depends.libs}" includes="*${shlib.suffix}*" />
@@ -209,8 +184,8 @@
target: overlay-oss
================================= -->
<target name="overlay-oss" depends="properties">
- <unzip src="${fdlibm.zip}" dest="${native.src.root}/fdlibm/dist" />
- <chmod dir="${native.src.root}/fdlibm/dist" perm="ugo+r" />
+ <ant dir="${basedir}/../modules/luni" antfile="build.xml"
+ target="overlay-oss" />
<ant dir="${basedir}/../modules/archive" antfile="build.xml"
target="overlay-oss" />
@@ -269,9 +244,9 @@
target: clean-overlay-oss
================================= -->
<target name="clean-overlay-oss" depends="properties">
- <delete dir="${native.src.root}/fdlibm/dist" quiet="true" />
-
- <ant dir="${basedir}/../modules/archive" antfile="build.xml"
+ <ant dir="${basedir}/../modules/luni" antfile="build.xml"
+ target="clean-overlay-oss" />
+ <ant dir="${basedir}/../modules/archive" antfile="build.xml"
target="clean-overlay-oss" />
<ant dir="${basedir}/../modules/text" antfile="build.xml"
target="clean-overlay-oss" />
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=419323&r1=419322&r2=419323&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 Wed Jul 5 13:05:33 2006
@@ -18,8 +18,6 @@
include $(HY_HDK)/build/make/makefile.include
-SHAREDSUB=../shared/
-
CFLAGS += -fpic -I$(SHARED)common -I../../zlib_dist \
-I../../include/shared
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=419323&r1=419322&r2=419323&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 Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
LIBBASE=hyarchive
DLLNAME=..\$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
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=419323&r1=419322&r2=419323&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 Wed Jul 5 13:05:33 2006
@@ -18,8 +18,6 @@
include $(HY_HDK)/build/make/makefile.include
-SHAREDSUB=../shared/
-
CFLAGS += -I../../zlib_dist
BUILDFILES = $(SHAREDSUB)zcpool.o $(SHAREDSUB)zipalloc.o \
$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o
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=419323&r1=419322&r2=419323&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 Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
LIBBASE=hyzip
LIBNAME=$(LIBPATH)$(LIBBASE).lib
BUILDFILES = $(SHAREDSUB)zcpool.obj $(SHAREDSUB)zipalloc.obj \
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=419323&r1=419322&r2=419323&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 Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
include $(HY_HDK)/build/make/makefile.include
-SHAREDSUB=../shared/
ZLIB_DIST=../../zlib_dist/# Path to zlib
CFLAGS += -fpic
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=419323&r1=419322&r2=419323&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 Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
LIBBASE=hyzlib
DLLNAME=..\$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
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=419323&r1=419322&r2=419323&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 Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
include $(HY_HDK)/build/make/makefile.include
-SHAREDSUB=../shared/
CFLAGS += -fpic
BUILDFILES = $(SHAREDSUB)auth_copyright.o authnix.o
MDLLIBFILES = \
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=419323&r1=419322&r2=419323&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 Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
!include <$(HY_HDK)\build\make\defines.mak>
-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=419323&r1=419322&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Wed Jul 5 13:05:33 2006
@@ -32,148 +32,220 @@
</fileset>
<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
- use the Eclipse Java compiler. -->
+ use the Eclipse Java compiler. -->
<property name="build.compiler" value="modern" />
-
- <property file="../../make/depends.properties" />
+
+ <property file="../../make/depends.properties" />
+ <property name="fdlibm.zip" location="${depends.oss}/fdlibm_5.2.zip" />
<target name="build" depends="compile.java, build.jar" />
<target name="copy.native.includes">
- <copy todir="${hy.hdk}/include" overwrite="yes">
- <fileset dir="${hy.luni.src.main.native}/include/shared">
- <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" />
- <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">
- <fileset dir="${hy.luni.src.main.native}/include/shared">
- <include name="jni.h" />
- <include name="jniport.h" />
- </fileset>
- </copy>
+ <copy todir="${hy.hdk}/include" overwrite="yes">
+ <fileset dir="${hy.luni.src.main.native}/include/shared">
+ <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" />
+ <include name="iohelp.h" />
+ <include name="libglob.h" />
+ <include name="fdlibm.h" />
+ <include name="hymagic.h" />
+ <include name="jsig.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" />
+ <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" />
- <include name="hysock.h" />
- <include name="hyportpg.h" />
- </fileset>
- </copy>
+ <copy todir="${hy.hdk}/include" overwrite="yes">
+ <fileset dir="${hy.luni.src.main.native}/include/windows">
+ <include name="hymutex.h" />
+ <include name="jclprots.h" />
+ <include name="hysock.h" />
+ <include name="hyportpg.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" />
- <include name="hysock.h" />
- <include name="hyportpg.h" />
- </fileset>
- </copy>
- </target>
-
- <!-- Build native code -->
- <target name="build.native" depends="build.native.core, build.native.secondary" />
-
- <target name="build.native.core" >
- <exec failonerror="true"
+ <copy todir="${hy.hdk}/include" overwrite="yes">
+ <fileset dir="${hy.luni.src.main.native}/include/linux">
+ <include name="hymutex.h" />
+ <include name="jclprots.h" />
+ <include name="hysock.h" />
+ <include name="hyportpg.h" />
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- Build native code -->
+ <target name="build.native" depends="build.native.core, build.native.secondary" />
+
+ <!-- Build the core luni native components -->
+ <target name="build.native.core" >
+ <!-- Build sig dll -->
+ <exec failonerror="true"
+ executable="${make.command}"
+ dir="${hy.luni.src.main.native}/sig/${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}/sig">
+ <patternset includes="*${shlib.suffix}*" />
+ </fileset>
+ </copy>
+
+ <!-- Build common lib -->
+ <exec failonerror="true"
+ executable="${make.command}"
+ dir="${hy.luni.src.main.native}/common/${hy.os}">
+ <env key="HY_HDK" value="${hy.hdk}" />
+ </exec>
+
+ <!-- Build pool lib -->
+ <exec failonerror="true"
+ executable="${make.command}"
+ dir="${hy.luni.src.main.native}/pool/${hy.os}">
+ <env key="HY_HDK" value="${hy.hdk}" />
+ </exec>
+
+ <!-- Build thread dll -->
+ <exec failonerror="true"
+ executable="${make.command}"
+ dir="${hy.luni.src.main.native}/thread/${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}/thread">
+ <patternset includes="*${shlib.suffix}*" />
+ </fileset>
+ </copy>
+
+ <!-- Build port dll -->
+ <exec failonerror="true"
+ executable="${make.command}"
+ dir="${hy.luni.src.main.native}/port/${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}/port">
+ <patternset includes="*${shlib.suffix}*" />
+ </fileset>
+ </copy>
+
+ <!-- Build fdlibm lib -->
+ <exec failonerror="true"
+ executable="${make.command}"
+ dir="${hy.luni.src.main.native}/fdlibm/${hy.os}">
+ <env key="HY_HDK" value="${hy.hdk}" />
+ </exec>
+
+ <!-- Build vmi dll -->
+ <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 -->
+
+ <!-- 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 luni components -->
<target name="build.native.secondary" >
- <exec failonerror="true"
+ <!-- Build luni dll -->
+ <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"
+ <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+ <fileset dir="${hy.luni.src.main.native}/luni">
+ <patternset includes="*${shlib.suffix}*" />
+ </fileset>
+ </copy>
+
+ <!-- Build vmls lib -->
+ <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>
-
+
+ <!-- Build launcher executables -->
<exec failonerror="true"
executable="${make.command}"
dir="${hy.luni.src.main.native}/launcher/${hy.os}">
<env key="HY_HDK" value="${hy.hdk}" />
</exec>
- <!-- Copy across the built executables -->
+ <!-- Copy across the built executables -->
<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
<fileset dir="${hy.luni.src.main.native}/launcher">
<patternset includes="java${exe.suffix}" />
<patternset includes="javaw${exe.suffix}" />
</fileset>
</copy>
+ <!-- Make sure the Linux launcher has execute permission -->
+ <chmod file="${hy.jdk}/jre/bin/java${exe.suffix}" perm="ugo+x" />
+ </target>
+
+ <!-- Overlay OSS packages into their required locations -->
+ <target name="overlay-oss" >
+ <unzip src="${fdlibm.zip}" dest="${hy.luni.src.main.native}/fdlibm_dist" />
+ <chmod dir="${hy.luni.src.main.native}/fdlibm_dist" perm="ugo+r" />
</target>
- <!-- Clean natives -->
+ <!-- Clean overlaid OSS packages -->
+ <target name="clean-overlay-oss" >
+ <delete dir="${hy.luni.src.main.native}/fdlibm_dist" quiet="true" />
+ </target>
+
+ <!-- Clean natives -->
<target name="clean.native" if="is.windows">
- <exec failonerror="true"
+ <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" />
+ <arg line="clean" />
</exec>
- <exec failonerror="true"
+ <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" />
+ <arg line="clean" />
</exec>
- <exec failonerror="true"
+ <exec failonerror="true"
executable="${make.command}"
dir="${hy.luni.src.main.native}/launcher/${hy.os}">
<env key="HY_HDK" value="${hy.hdk}" />
- <arg line="clean" />
+ <arg line="clean" />
</exec>
- <exec failonerror="true"
+ <exec failonerror="true"
executable="${make.command}"
dir="${hy.luni.src.main.native}/vmls/${hy.os}">
<env key="HY_HDK" value="${hy.hdk}" />
- <arg line="clean" />
+ <arg line="clean" />
</exec>
</target>
@@ -184,37 +256,37 @@
<fileset refid="classes" />
<fileset dir="${hy.luni.bin.test}" />
</delete>
- <antcall target="clean.native.includes" />
+ <antcall target="clean.native.includes" />
</target>
-
+
<target name="clean.native.includes">
- <delete failonerror="false">
- <fileset dir="${hy.hdk}/include">
- <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" />
- <include name="hysock.h" />
- <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">
- <fileset dir="${hy.jdk}/include">
- <include name="jni.h" />
- <include name="jniport.h" />
- </fileset>
- </delete>
+ <delete failonerror="false">
+ <fileset dir="${hy.hdk}/include">
+ <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" />
+ <include name="hysock.h" />
+ <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">
+ <fileset dir="${hy.jdk}/include">
+ <include name="jni.h" />
+ <include name="jniport.h" />
+ </fileset>
+ </delete>
</target>
<target name="compile.java">
@@ -345,28 +417,28 @@
<target name="run.tests.impl" unless="test.noimpl">
<run-tests description="impl tests">
<junit-elements>
- <classpath>
+ <classpath>
<pathelement path="${hy.luni.bin.test}/impl"/>
<pathelement path="${hy.luni.src.test.resources}"/>
<pathelement path="../../build/tests"/>
- <pathelement path="${hy.hdk}/build/test/support.jar" />
- </classpath>
+ <pathelement path="${hy.hdk}/build/test/support.jar" />
+ </classpath>
<!-- Required for running the serialization unit tests -->
<!-- Note: will be deleted after improving -->
<!-- SerializationTest support class: all resource -->
<!-- files will be placed on the classpath -->
<jvmarg value="-DRESOURCE_DIR=${hy.luni.src.test}/resources"/>
-
+
<!-- Required by various tests that set security manager etc -->
<jvmarg value="-Djava.security.policy=../../../../support/src/test/resources/config/testing.policy" />
-
+
<!-- Required for running the java.net unit tests -->
<jvmarg value="-Dtest.ini.file=../../../../support/src/test/resources/config/localhosttest.ini" />
-
+
<batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
<fileset dir="${hy.luni.src.test}/impl/java">
- <include name="**/*Test.java"/>
+ <include name="**/*Test.java" />
</fileset>
<fileset dir="${hy.luni.src.test}/java">
<include name="**/*Test.java"/>
@@ -389,9 +461,9 @@
<exclude name="tests/api/java/net/URLClassLoaderTest.java" />
<exclude name="tests/api/java/net/URLConnectionTest.java" />
<exclude name="tests/api/java/net/URLTest.java" />
- <exclude name="tests/api/java/net/SocketPermissionTest.java" />
- </fileset>
- </batchtest>
+ <exclude name="tests/api/java/net/SocketPermissionTest.java" />
+ </fileset>
+ </batchtest>
</junit-elements>
</run-tests>
@@ -454,7 +526,7 @@
<bootclasspath>
<fileset dir="${hy.jdk}/jre/lib/boot">
<include name="**/*.jar" />
- </fileset>
+ </fileset>
</bootclasspath>
<classpath location="../../build/tests" />
<classpath location="${hy.hdk}/build/test/support.jar" />
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jul 5 13:05:33 2006
@@ -0,0 +1 @@
+fdlibm_dist
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/common/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/common/linux/makefile?rev=419323&r1=419269&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/common/linux/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/common/linux/makefile Wed Jul 5 13:05:33 2006
@@ -21,6 +21,5 @@
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 $(HY_HDK)/build/make/rules.mk
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/common/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/common/windows/makefile?rev=419323&r1=419269&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/common/windows/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/common/windows/makefile Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=$(SHARED)common\# comment to avoid \ being treated as continuation
LIBNAME=$(LIBPATH)hycommon.lib
BUILDFILES = \
@@ -26,6 +25,6 @@
locklbl.obj lock386.obj \
$(SHAREDSUB)utf8decode.obj $(SHAREDSUB)utf8encode.obj
-HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I..\..\..\modules\luni\src\main\native\include\shared /I..\..\..\modules\luni\src\main\native\include\windows
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
!include <$(HY_HDK)\build\make\rules.mak>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile?rev=419323&r1=419269&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile Wed Jul 5 13:05:33 2006
@@ -18,34 +18,35 @@
include $(HY_HDK)/build/make/makefile.include
+FDLIBM_DIST=../../fdlibm_dist/
+
BUILDFILES = \
- dist/e_acos.o dist/e_acosh.o dist/e_asin.o dist/e_atan2.o \
- dist/e_atanh.o dist/e_cosh.o dist/e_exp.o dist/e_fmod.o \
- dist/e_gamma.o dist/e_gamma_r.o dist/e_hypot.o dist/e_j0.o \
- dist/e_j1.o dist/e_jn.o dist/e_lgamma.o dist/e_lgamma_r.o \
- dist/e_log.o dist/e_log10.o dist/e_pow.o dist/e_rem_pio2.o \
- dist/e_remainder.o dist/e_scalb.o dist/e_sinh.o dist/e_sqrt.o \
- dist/k_cos.o dist/k_rem_pio2.o dist/k_sin.o dist/k_standard.o \
- dist/k_tan.o dist/s_asinh.o dist/s_atan.o dist/s_cbrt.o dist/s_ceil.o \
- dist/s_copysign.o dist/s_cos.o dist/s_erf.o dist/s_expm1.o \
- dist/s_fabs.o dist/s_finite.o dist/s_floor.o dist/s_frexp.o \
- dist/s_ilogb.o dist/s_isnan.o dist/s_ldexp.o \
+ $(FDLIBM_DIST)e_acos.o $(FDLIBM_DIST)e_acosh.o $(FDLIBM_DIST)e_asin.o $(FDLIBM_DIST)e_atan2.o \
+ $(FDLIBM_DIST)e_atanh.o $(FDLIBM_DIST)e_cosh.o $(FDLIBM_DIST)e_exp.o $(FDLIBM_DIST)e_fmod.o \
+ $(FDLIBM_DIST)e_gamma.o $(FDLIBM_DIST)e_gamma_r.o $(FDLIBM_DIST)e_hypot.o $(FDLIBM_DIST)e_j0.o \
+ $(FDLIBM_DIST)e_j1.o $(FDLIBM_DIST)e_jn.o $(FDLIBM_DIST)e_lgamma.o $(FDLIBM_DIST)e_lgamma_r.o \
+ $(FDLIBM_DIST)e_log.o $(FDLIBM_DIST)e_log10.o $(FDLIBM_DIST)e_pow.o $(FDLIBM_DIST)e_rem_pio2.o \
+ $(FDLIBM_DIST)e_remainder.o $(FDLIBM_DIST)e_scalb.o $(FDLIBM_DIST)e_sinh.o $(FDLIBM_DIST)e_sqrt.o \
+ $(FDLIBM_DIST)k_cos.o $(FDLIBM_DIST)k_rem_pio2.o $(FDLIBM_DIST)k_sin.o $(FDLIBM_DIST)k_standard.o \
+ $(FDLIBM_DIST)k_tan.o $(FDLIBM_DIST)s_asinh.o $(FDLIBM_DIST)s_atan.o $(FDLIBM_DIST)s_cbrt.o $(FDLIBM_DIST)s_ceil.o \
+ $(FDLIBM_DIST)s_copysign.o $(FDLIBM_DIST)s_cos.o $(FDLIBM_DIST)s_erf.o $(FDLIBM_DIST)s_expm1.o \
+ $(FDLIBM_DIST)s_fabs.o $(FDLIBM_DIST)s_finite.o $(FDLIBM_DIST)s_floor.o $(FDLIBM_DIST)s_frexp.o \
+ $(FDLIBM_DIST)s_ilogb.o $(FDLIBM_DIST)s_isnan.o $(FDLIBM_DIST)s_ldexp.o \
$(SHAREDSUB)s_lib_version.o \
- dist/s_log1p.o dist/s_logb.o dist/s_matherr.o dist/s_modf.o \
- dist/s_nextafter.o dist/s_rint.o dist/s_scalbn.o dist/s_signgam.o \
- dist/s_significand.o dist/s_sin.o dist/s_tan.o dist/s_tanh.o \
- dist/w_acos.o dist/w_acosh.o dist/w_asin.o dist/w_atan2.o \
- dist/w_atanh.o dist/w_cosh.o dist/w_exp.o dist/w_fmod.o \
- dist/w_gamma.o dist/w_gamma_r.o dist/w_hypot.o dist/w_j0.o \
- dist/w_j1.o dist/w_jn.o dist/w_lgamma.o dist/w_lgamma_r.o \
- dist/w_log.o dist/w_log10.o dist/w_pow.o dist/w_remainder.o \
- dist/w_scalb.o dist/w_sinh.o dist/w_sqrt.o
+ $(FDLIBM_DIST)s_log1p.o $(FDLIBM_DIST)s_logb.o $(FDLIBM_DIST)s_matherr.o $(FDLIBM_DIST)s_modf.o \
+ $(FDLIBM_DIST)s_nextafter.o $(FDLIBM_DIST)s_rint.o $(FDLIBM_DIST)s_scalbn.o $(FDLIBM_DIST)s_signgam.o \
+ $(FDLIBM_DIST)s_significand.o $(FDLIBM_DIST)s_sin.o $(FDLIBM_DIST)s_tan.o $(FDLIBM_DIST)s_tanh.o \
+ $(FDLIBM_DIST)w_acos.o $(FDLIBM_DIST)w_acosh.o $(FDLIBM_DIST)w_asin.o $(FDLIBM_DIST)w_atan2.o \
+ $(FDLIBM_DIST)w_atanh.o $(FDLIBM_DIST)w_cosh.o $(FDLIBM_DIST)w_exp.o $(FDLIBM_DIST)w_fmod.o \
+ $(FDLIBM_DIST)w_gamma.o $(FDLIBM_DIST)w_gamma_r.o $(FDLIBM_DIST)w_hypot.o $(FDLIBM_DIST)w_j0.o \
+ $(FDLIBM_DIST)w_j1.o $(FDLIBM_DIST)w_jn.o $(FDLIBM_DIST)w_lgamma.o $(FDLIBM_DIST)w_lgamma_r.o \
+ $(FDLIBM_DIST)w_log.o $(FDLIBM_DIST)w_log10.o $(FDLIBM_DIST)w_pow.o $(FDLIBM_DIST)w_remainder.o \
+ $(FDLIBM_DIST)w_scalb.o $(FDLIBM_DIST)w_sinh.o $(FDLIBM_DIST)w_sqrt.o
# CFLAGS are overriden not just appended to
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 \
+ -I. -I$(SHAREDSUB) -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include \
-ffloat-store $(VMDEBUG)
LIBNAME = $(LIBPATH)libhyfdlibm.a
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/windows/makefile?rev=419323&r1=419269&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/windows/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/windows/makefile Wed Jul 5 13:05:33 2006
@@ -18,34 +18,35 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=$(SHARED)fdlibm\# comment to avoid \ being treated as continuation
LIBNAME=$(LIBPATH)hyfdlibm.lib
+FDLIBM_DIST=..\..\fdlibm_dist\# Comment to stop line continuation
+
BUILDFILES = \
- dist/e_acos.obj dist/e_acosh.obj dist/e_asin.obj dist/e_atan2.obj \
- dist/e_atanh.obj dist/e_cosh.obj dist/e_exp.obj dist/e_fmod.obj \
- dist/e_gamma.obj dist/e_gamma_r.obj dist/e_hypot.obj dist/e_j0.obj \
- dist/e_j1.obj dist/e_jn.obj dist/e_lgamma.obj dist/e_lgamma_r.obj \
- dist/e_log.obj dist/e_log10.obj dist/e_pow.obj dist/e_rem_pio2.obj \
- dist/e_remainder.obj dist/e_scalb.obj dist/e_sinh.obj dist/e_sqrt.obj \
- dist/k_cos.obj dist/k_rem_pio2.obj dist/k_sin.obj dist/k_standard.obj \
- dist/k_tan.obj dist/s_asinh.obj dist/s_atan.obj dist/s_cbrt.obj \
- dist/s_ceil.obj dist/s_copysign.obj dist/s_cos.obj dist/s_erf.obj \
- dist/s_expm1.obj dist/s_fabs.obj dist/s_finite.obj dist/s_floor.obj \
- dist/s_frexp.obj dist/s_ilogb.obj dist/s_isnan.obj dist/s_ldexp.obj \
+ $(FDLIBM_DIST)e_acos.obj $(FDLIBM_DIST)e_acosh.obj $(FDLIBM_DIST)e_asin.obj $(FDLIBM_DIST)e_atan2.obj \
+ $(FDLIBM_DIST)e_atanh.obj $(FDLIBM_DIST)e_cosh.obj $(FDLIBM_DIST)e_exp.obj $(FDLIBM_DIST)e_fmod.obj \
+ $(FDLIBM_DIST)e_gamma.obj $(FDLIBM_DIST)e_gamma_r.obj $(FDLIBM_DIST)e_hypot.obj $(FDLIBM_DIST)e_j0.obj \
+ $(FDLIBM_DIST)e_j1.obj $(FDLIBM_DIST)e_jn.obj $(FDLIBM_DIST)e_lgamma.obj $(FDLIBM_DIST)e_lgamma_r.obj \
+ $(FDLIBM_DIST)e_log.obj $(FDLIBM_DIST)e_log10.obj $(FDLIBM_DIST)e_pow.obj $(FDLIBM_DIST)e_rem_pio2.obj \
+ $(FDLIBM_DIST)e_remainder.obj $(FDLIBM_DIST)e_scalb.obj $(FDLIBM_DIST)e_sinh.obj $(FDLIBM_DIST)e_sqrt.obj \
+ $(FDLIBM_DIST)k_cos.obj $(FDLIBM_DIST)k_rem_pio2.obj $(FDLIBM_DIST)k_sin.obj $(FDLIBM_DIST)k_standard.obj \
+ $(FDLIBM_DIST)k_tan.obj $(FDLIBM_DIST)s_asinh.obj $(FDLIBM_DIST)s_atan.obj $(FDLIBM_DIST)s_cbrt.obj \
+ $(FDLIBM_DIST)s_ceil.obj $(FDLIBM_DIST)s_copysign.obj $(FDLIBM_DIST)s_cos.obj $(FDLIBM_DIST)s_erf.obj \
+ $(FDLIBM_DIST)s_expm1.obj $(FDLIBM_DIST)s_fabs.obj $(FDLIBM_DIST)s_finite.obj $(FDLIBM_DIST)s_floor.obj \
+ $(FDLIBM_DIST)s_frexp.obj $(FDLIBM_DIST)s_ilogb.obj $(FDLIBM_DIST)s_isnan.obj $(FDLIBM_DIST)s_ldexp.obj \
$(SHAREDSUB)s_lib_version.obj \
- dist/s_log1p.obj dist/s_logb.obj dist/s_matherr.obj \
- dist/s_modf.obj dist/s_nextafter.obj dist/s_rint.obj dist/s_scalbn.obj \
- dist/s_signgam.obj dist/s_significand.obj dist/s_sin.obj dist/s_tan.obj \
- dist/s_tanh.obj dist/w_acos.obj dist/w_acosh.obj dist/w_asin.obj \
- dist/w_atan2.obj dist/w_atanh.obj dist/w_cosh.obj dist/w_exp.obj \
- dist/w_fmod.obj dist/w_gamma.obj dist/w_gamma_r.obj dist/w_hypot.obj \
- dist/w_j0.obj dist/w_j1.obj dist/w_jn.obj dist/w_lgamma.obj \
- dist/w_lgamma_r.obj dist/w_log.obj dist/w_log10.obj dist/w_pow.obj \
- dist/w_remainder.obj dist/w_scalb.obj dist/w_sinh.obj dist/w_sqrt.obj
+ $(FDLIBM_DIST)s_log1p.obj $(FDLIBM_DIST)s_logb.obj $(FDLIBM_DIST)s_matherr.obj \
+ $(FDLIBM_DIST)s_modf.obj $(FDLIBM_DIST)s_nextafter.obj $(FDLIBM_DIST)s_rint.obj $(FDLIBM_DIST)s_scalbn.obj \
+ $(FDLIBM_DIST)s_signgam.obj $(FDLIBM_DIST)s_significand.obj $(FDLIBM_DIST)s_sin.obj $(FDLIBM_DIST)s_tan.obj \
+ $(FDLIBM_DIST)s_tanh.obj $(FDLIBM_DIST)w_acos.obj $(FDLIBM_DIST)w_acosh.obj $(FDLIBM_DIST)w_asin.obj \
+ $(FDLIBM_DIST)w_atan2.obj $(FDLIBM_DIST)w_atanh.obj $(FDLIBM_DIST)w_cosh.obj $(FDLIBM_DIST)w_exp.obj \
+ $(FDLIBM_DIST)w_fmod.obj $(FDLIBM_DIST)w_gamma.obj $(FDLIBM_DIST)w_gamma_r.obj $(FDLIBM_DIST)w_hypot.obj \
+ $(FDLIBM_DIST)w_j0.obj $(FDLIBM_DIST)w_j1.obj $(FDLIBM_DIST)w_jn.obj $(FDLIBM_DIST)w_lgamma.obj \
+ $(FDLIBM_DIST)w_lgamma_r.obj $(FDLIBM_DIST)w_log.obj $(FDLIBM_DIST)w_log10.obj $(FDLIBM_DIST)w_pow.obj \
+ $(FDLIBM_DIST)w_remainder.obj $(FDLIBM_DIST)w_scalb.obj $(FDLIBM_DIST)w_sinh.obj $(FDLIBM_DIST)w_sqrt.obj
HYCFLAGS = -Oityb1 -W3 -Fd$(LIBPATH)hyfdlibm.pdb -D_IEEE_LIBM \
- -DHY_PLATFORM_DOUBLE_ORDER /I$(SHAREDSUB) /I..\..\..\modules\luni\src\main\native\include\shared /I..\..\..\modules\luni\src\main\native\include\windows
+ -DHY_PLATFORM_DOUBLE_ORDER /I$(SHAREDSUB) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include
.c.obj:
$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.c
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile?rev=419323&r1=419322&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
include $(HY_HDK)/build/make/makefile.include
-SHAREDSUB=../shared/
BUILDFILES = $(SHAREDSUB)main.o $(SHAREDSUB)cmain.o \
$(SHAREDSUB)launcher_copyright.o $(SHAREDSUB)strbuf.o \
$(SHAREDSUB)libhlp.o
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae?rev=419323&r1=419322&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
EXENAME=$(EXEPATH)java.exe
HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw?rev=419323&r1=419322&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
EXENAME=$(EXEPATH)javaw.exe
BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)main.obj \
winmain.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj
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=419323&r1=419322&r2=419323&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 Wed Jul 5 13:05:33 2006
@@ -18,8 +18,6 @@
include $(HY_HDK)/build/make/makefile.include
-SHAREDSUB=../shared/
-
CFLAGS += -fpic
BUILDFILES = \
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=419323&r1=419322&r2=419323&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 Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
LIBBASE=hyluni
DLLNAME=..\$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/pool/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/pool/linux/makefile?rev=419323&r1=419269&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/pool/linux/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/pool/linux/makefile Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
include $(HY_HDK)/build/make/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/modules/luni/src/main/native/pool/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/pool/windows/makefile?rev=419323&r1=419269&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/pool/windows/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/pool/windows/makefile Wed Jul 5 13:05:33 2006
@@ -18,9 +18,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
-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 <$(HY_HDK)\build\make\rules.mak>
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jul 5 13:05:33 2006
@@ -0,0 +1,4 @@
+*.dll
+*.map
+*.pdb
+*.so
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/linux/makefile?rev=419323&r1=419269&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/linux/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/linux/makefile Wed Jul 5 13:05:33 2006
@@ -18,8 +18,7 @@
include $(HY_HDK)/build/make/makefile.include
-CFLAGS += -fpic -DHYPORT_LIBRARY_DEFINE \
- -I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
+CFLAGS += -fpic -DHYPORT_LIBRARY_DEFINE
BUILDFILES = \
$(SHAREDSUB)port_copyright.o hycpu.o $(SHAREDSUB)hyerror.o \
@@ -31,7 +30,7 @@
$(SHAREDSUB)hystr.o $(SHAREDSUB)hystrftime.o $(SHAREDSUB)hystsl.o \
hysysinfo.o hytime.o $(SHAREDSUB)hytlshelpers.o hytty.o hyvmem.o
-MDLLIBFILES = ../libhythr.so $(LIBPATH)libhycommon.a ../libhysig.so
+MDLLIBFILES = $(DLLPATH)libhythr.so $(LIBPATH)libhycommon.a $(DLLPATH)libhysig.so
DLLNAME = ../libhyprt.so
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/windows/makefile?rev=419323&r1=419269&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/windows/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/windows/makefile Wed Jul 5 13:05:33 2006
@@ -18,12 +18,11 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=$(SHARED)port\# comment to avoid \ being treated as continuation
LIBBASE=hyprt
DLLNAME=..\$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
-HYCFLAGS = $(HYCFLAGS) -DHYPORT_LIBRARY_DEFINE /I$(SHAREDSUB) /I..\..\..\modules\luni\src\main\native\include\shared /I..\..\..\modules\luni\src\main\native\include\windows
+HYCFLAGS = $(HYCFLAGS) -DHYPORT_LIBRARY_DEFINE /I$(SHAREDSUB)
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
BUILDFILES = \
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/sig/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jul 5 13:05:33 2006
@@ -0,0 +1,4 @@
+*.dll
+*.map
+*.pdb
+*.so
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/sig/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/sig/linux/makefile?rev=419323&r1=419269&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/sig/linux/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/sig/linux/makefile Wed Jul 5 13:05:33 2006
@@ -18,7 +18,7 @@
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
+CFLAGS += -fpic
BUILDFILES = $(SHAREDSUB)hysig_copyright.o hysiglinux.o hysigunix.o
DLLNAME = ../libhysig.so
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/sig/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/sig/windows/makefile?rev=419323&r1=419269&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/sig/windows/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/sig/windows/makefile Wed Jul 5 13:05:33 2006
@@ -18,13 +18,11 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=$(SHARED)sig\# comment to avoid \ being treated as continuation
LIBBASE=hysig
DLLNAME=..\$(LIBBASE).dll
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."
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jul 5 13:05:33 2006
@@ -0,0 +1,4 @@
+*.dll
+*.map
+*.pdb
+*.so
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/linux/makefile?rev=419323&r1=419269&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/linux/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/linux/makefile Wed Jul 5 13:05:33 2006
@@ -18,7 +18,7 @@
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
+CFLAGS += -fpic
BUILDFILES = \
$(SHAREDSUB)thread_copyright.o thrhelp.o thrspinlock.o hythread.o \
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/windows/makefile?rev=419323&r1=419269&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/windows/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/windows/makefile Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=$(SHARED)thread\# comment to avoid \ being treated as continuation
LIBBASE=hythr
DLLNAME=..\$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
@@ -30,7 +29,7 @@
# TOFIX $(LIBBASE).def should be a dependency on all libs
VIRTFILES = $(LIBBASE).res
-HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /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
MDLLIBFILES = $(LIBPATH)hypool.lib $(LIBPATH)hycommon.lib
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/windows/thrdsup.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/windows/thrdsup.h?rev=419323&r1=419269&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/windows/thrdsup.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/windows/thrdsup.h Wed Jul 5 13:05:33 2006
@@ -38,7 +38,7 @@
/* this file might be included from a directory other than thread. Use a pseudo-absolute path to make
* sure that we find thrtypes.h in the right place. Only IBMC needs this.
*/
-#include "../thread/thrtypes.h"
+#include "thrtypes.h"
void initialize_thread_priority PROTOTYPE ((hythread_t thread));
IDATA init_thread_library PROTOTYPE ((void));
extern const int priority_map[];
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=419323&r1=419322&r2=419323&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 Wed Jul 5 13:05:33 2006
@@ -18,8 +18,6 @@
include $(HY_HDK)/build/make/makefile.include
-SHAREDSUB=../shared/
-
CFLAGS += -fpic
BUILDFILES = $(SHAREDSUB)vmi_copyright.o $(SHAREDSUB)vmi.o
MDLLIBFILES = $(LIBPATH)libhypool.a
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=419323&r1=419322&r2=419323&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 Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
LIBBASE=vmi
LIBNAME=$(LIBPATH)$(LIBBASE).lib
HYCFLAGS = $(HYCFLAGS) -DHYPORT_LIBRARY_DEFINE
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/linux/makefile?rev=419323&r1=419322&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/linux/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/linux/makefile Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
include $(HY_HDK)/build/make/makefile.include
-SHAREDSUB=../shared/
CFLAGS += -I../../include/shared -I../../include/linux
BUILDFILES = $(SHAREDSUB)vmls.o
LIBNAME = $(LIBPATH)libhyvmls.a
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/windows/makefile?rev=419323&r1=419322&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/windows/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/windows/makefile Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
LIBNAME=$(LIBPATH)hyvmls.lib
BUILDFILES = \
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/linux/makefile?rev=419323&r1=419322&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/linux/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/linux/makefile Wed Jul 5 13:05:33 2006
@@ -18,13 +18,13 @@
include $(HY_HDK)/build/make/makefile.include
-CFLAGS += -fpic -I$(SHARED)common -I$(SHARED)fdlibm
+CFLAGS += -fpic
BUILDFILES = \
../shared/DirectBufferUtil.o ../shared/AddressUtil.o
MDLLIBFILES = \
- $(LIBPATH)libhycommon.a $(LIBPATH)libhyzip.a \
+ $(LIBPATH)libhycommon.a $(LIBPATH)libhyzip.a \
$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a
DLLNAME = ../libhynio.so
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile?rev=419323&r1=419322&r2=419323&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
LIBBASE=hynio
DLLNAME=..\$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
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=419323&r1=419322&r2=419323&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 Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
include $(HY_HDK)/build/make/makefile.include
-SHAREDSUB=../shared/
CFLAGS += -fpic -I../../icu4c
BUILDFILES = text_copyright.o $(SHAREDSUB)BidiWrapper.o
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=419323&r1=419322&r2=419323&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 Wed Jul 5 13:05:33 2006
@@ -18,7 +18,6 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
LIBBASE=hytext
DLLNAME=..\$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib