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/06/26 19:36:02 UTC
svn commit: r417248 - in /incubator/harmony/enhanced/classlib/trunk:
depends/build/ modules/luni/ modules/luni/src/main/native/launcher/
modules/luni/src/main/native/launcher/linux/
modules/luni/src/main/native/launcher/shared/ modules/luni/src/main/na...
Author: tellison
Date: Mon Jun 26 10:35:59 2006
New Revision: 417248
URL: http://svn.apache.org/viewvc?rev=417248&view=rev
Log:
Apply patch HARMONY-668 (Move vmls and launcher natives to luni module)
Added:
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/ (with props)
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/
- copied from r417236, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile
- copied, changed from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/
- copied from r417236, incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c
- copied unchanged from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/cmain.c
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/hyexelibnls.h
- copied unchanged from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/hyexelibnls.h
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/launcher_copyright.c
- copied unchanged from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/launcher_copyright.c
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/libhlp.c
- copied unchanged from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/libhlp.c
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/libhlp.h
- copied unchanged from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/libhlp.h
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c
- copied unchanged from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/main.c
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/strbuf.c
- copied unchanged from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/strbuf.c
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/
- copied from r417236, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/apache.ico
- copied unchanged from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/apache.ico
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/java.rc
- copied unchanged from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/java.rc
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/javaw.rc
- copied unchanged from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/javaw.rc
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile
- copied unchanged from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae
- copied, changed from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javae
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw
- copied, changed from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javaw
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/winmain.c
- copied unchanged from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/winmain.c
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/linux/
- copied from r417236, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/linux/makefile
- copied, changed from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/shared/
- copied from r417236, incubator/harmony/enhanced/classlib/trunk/native-src/shared/vmls/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/shared/vmls.c
- copied unchanged from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/shared/vmls/vmls.c
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/shared/vmls.h
- copied unchanged from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/shared/vmls/vmls.h
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/windows/
- copied from r417236, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/windows/makefile
- copied, changed from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile
Removed:
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/
incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/
incubator/harmony/enhanced/classlib/trunk/native-src/shared/vmls/
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/
Modified:
incubator/harmony/enhanced/classlib/trunk/depends/build/defines.mak
incubator/harmony/enhanced/classlib/trunk/depends/build/makefile.include
incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
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/archive/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile
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=417248&r1=417247&r2=417248&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/depends/build/defines.mak (original)
+++ incubator/harmony/enhanced/classlib/trunk/depends/build/defines.mak Mon Jun 26 10:35:59 2006
@@ -6,7 +6,7 @@
LIBPATH=$(HY_HDK)\lib\# comment to avoid \ being treated as continuation
EXEPATH=..\# ditto
-DLLPATH=..\# ditto
+DLLPATH=$(HY_HDK)\jdk\jre\bin\# ditto
SHARED=..\..\shared\# ditto
HYCFLAGS = \
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=417248&r1=417247&r2=417248&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/depends/build/makefile.include (original)
+++ incubator/harmony/enhanced/classlib/trunk/depends/build/makefile.include Mon Jun 26 10:35:59 2006
@@ -25,6 +25,7 @@
EXEPATH=../
LIBPATH=$(HY_HDK)/lib/
+DLLPATH=$(HY_HDK)/jdk/jre/bin/
SHARED=../../shared/
SHAREDSUB=$(SHARED)$(notdir $(CURDIR))/
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=417248&r1=417247&r2=417248&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Mon Jun 26 10:35:59 2006
@@ -85,6 +85,51 @@
</copy>
</target>
+ <!-- Build native code -->
+ <target name="build.native" >
+ <exec failonerror="true"
+ executable="${make.command}"
+ dir="${hy.luni.src.main.native}/vmls/${hy.os}">
+ <env key="HY_HDK" value="${hy.hdk}" />
+ </exec>
+ <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">
+ <patternset includes="java${exe.suffix}" />
+ <patternset includes="javaw${exe.suffix}" />
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- Clean natives -->
+ <target name="clean.native" if="is.windows">
+ <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" />
+ </exec>
+ <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" />
+ </exec>
+ </target>
+
<target name="test" depends="build, compile.tests, run.tests" />
<target name="clean">
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 26 10:35:59 2006
@@ -0,0 +1,2 @@
+*.exe
+*.pdb
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile (from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/makefile)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile&p1=incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/makefile&r1=417247&r2=417248&rev=417248&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile Mon Jun 26 10:35:59 2006
@@ -18,10 +18,11 @@
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
-MDLLIBFILES = ../libhyprt.so ../libhythr.so
+MDLLIBFILES = $(DLLPATH)libhyprt.so $(DLLPATH)libhythr.so
EXENAME = $(EXEPATH)java
include $(HY_HDK)/build/make/rules.mk
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae (from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javae)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae&p1=incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javae&r1=417247&r2=417248&rev=417248&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javae (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae Mon Jun 26 10:35:59 2006
@@ -18,7 +18,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=$(SHARED)launcher\# comment to avoid \ being treated as continuation
+SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
EXENAME=$(EXEPATH)java.exe
HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw (from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javaw)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw&p1=incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javaw&r1=417247&r2=417248&rev=417248&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javaw (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw Mon Jun 26 10:35:59 2006
@@ -18,7 +18,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=$(SHARED)launcher\# comment to avoid \ being treated as continuation
+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
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/linux/makefile (from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/linux/makefile?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/linux/makefile&p1=incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile&r1=417247&r2=417248&rev=417248&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/linux/makefile Mon Jun 26 10:35:59 2006
@@ -18,7 +18,8 @@
include $(HY_HDK)/build/make/makefile.include
-CFLAGS += -I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
+SHAREDSUB=../shared/
+CFLAGS += -I../../include/shared -I../../include/linux
BUILDFILES = $(SHAREDSUB)vmls.o
LIBNAME = $(LIBPATH)libhyvmls.a
Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/windows/makefile (from r417247, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/windows/makefile?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/windows/makefile&p1=incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile&r1=417247&r2=417248&rev=417248&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/windows/makefile Mon Jun 26 10:35:59 2006
@@ -18,12 +18,12 @@
!include <$(HY_HDK)\build\make\defines.mak>
-SHAREDSUB=$(SHARED)vmls\# comment to avoid \ being treated as continuation
+SHAREDSUB=..\shared\# comment to avoid \ being treated as continuation
LIBNAME=$(LIBPATH)hyvmls.lib
BUILDFILES = \
$(SHAREDSUB)vmls.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) /I..\..\include\shared /I..\..\include\windows
!include <$(HY_HDK)\build\make\rules.mak>
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=417248&r1=417247&r2=417248&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/build.xml Mon Jun 26 10:35:59 2006
@@ -121,7 +121,19 @@
<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\prefs" antfile="build.xml" target="build.native" />
+ <ant dir="..\modules\luni" antfile="build.xml" target="build.native" />
</target>
@@ -139,6 +151,7 @@
</exec>
<ant dir="..\modules\prefs" antfile="build.xml" target="clean.native" />
+ <ant dir="..\modules\luni" antfile="build.xml" target="clean.native" />
<delete dir="${native.lib.target}" />
@@ -153,24 +166,6 @@
depends="properties"
description="Construct the correct directory structure for native binaries">
- <!-- 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>
-
- <!-- Copy across the built executables -->
- <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
- <fileset dir="${target.platform}">
- <patternset includes="java${exe.suffix}" />
- <patternset includes="javaw${exe.suffix}" />
- </fileset>
- </copy>
-
<!-- NLS catalog files -->
<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
<fileset dir="${depends.files}">
@@ -246,14 +241,14 @@
target: copy-makefile-includes
================================= -->
<target name="copy-makefile-includes" depends="properties" >
- <!-- copy generic defines and rules for each platform into a shared
- place -->
+ <!-- copy generic defines and rules for each platform into a shared
+ place -->
<mkdir dir="${hy.hdk}/build/make" />
<copy todir="${hy.hdk}/build/make" overwrite="yes">
- <fileset dir="${depends.build}">
- <include name="*" />
- </fileset>
- </copy>
+ <fileset dir="${depends.build}">
+ <include name="*" />
+ </fileset>
+ </copy>
</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=417248&r1=417247&r2=417248&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile Mon Jun 26 10:35:59 2006
@@ -19,7 +19,7 @@
all: \
_sig _common _pool _thread _port _fdlibm _zip \
_zlib _vmi _luni _archive _auth \
- _text _vmls _launcher
+ _text
_auth:
(cd auth && $(MAKE) )
@@ -60,12 +60,6 @@
_text: _sig _zip _zlib _pool _fdlibm _thread _vmi
(cd text && $(MAKE) )
-_vmls: _thread _port
- (cd vmls && $(MAKE) )
-
-_launcher: _thread _port
- (cd launcher && $(MAKE) )
-
clean:
(cd auth && $(MAKE) clean )
(cd sig && $(MAKE) clean )
@@ -80,5 +74,4 @@
(cd luni && $(MAKE) clean )
(cd archive && $(MAKE) clean )
(cd text && $(MAKE) clean )
- (cd vmls && $(MAKE) clean )
- (cd launcher && $(MAKE) clean )
+
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile?rev=417248&r1=417247&r2=417248&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile Mon Jun 26 10:35:59 2006
@@ -20,7 +20,7 @@
SHAREDSUB=$(SHARED)archive\# comment to avoid \ being treated as continuation
LIBBASE=hyarchive
-DLLNAME=$(DLLPATH)$(LIBBASE).dll
+DLLNAME=..\$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I..\zlib\dist \
/I..\..\..\modules\archive\src\main\native\include\shared
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/makefile?rev=417248&r1=417247&r2=417248&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/makefile Mon Jun 26 10:35:59 2006
@@ -20,7 +20,7 @@
SHAREDSUB=$(SHARED)auth\# comment to avoid \ being treated as continuation
LIBBASE=hyauth
-DLLNAME=$(DLLPATH)$(LIBBASE).dll
+DLLNAME=..\$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
BUILDFILES = $(SHAREDSUB)auth_copyright.obj authwin32.obj
VIRTFILES = $(LIBBASE).res
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile?rev=417248&r1=417247&r2=417248&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile Mon Jun 26 10:35:59 2006
@@ -20,7 +20,7 @@
SHAREDSUB=$(SHARED)luni\# comment to avoid \ being treated as continuation
LIBBASE=hyluni
-DLLNAME=$(DLLPATH)$(LIBBASE).dll
+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
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=417248&r1=417247&r2=417248&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile Mon Jun 26 10:35:59 2006
@@ -21,8 +21,7 @@
all: \
_sig _pool _thread _port _fdlibm _zip \
_zlib _common _luni _vmi _auth \
- _archive _launcher _text \
- _vmls
+ _archive _text
_auth:
cd auth
@@ -89,16 +88,6 @@
$(MAKE) /NOLOGO
cd ..
-_vmls: _thread _port
- cd vmls
- $(MAKE) /NOLOGO
- cd ..
-
-_launcher: _port _thread
- cd launcher
- $(MAKE) /NOLOGO
- cd ..
-
clean:
cd auth
$(MAKE) /NOLOGO clean
@@ -106,9 +95,6 @@
cd archive
$(MAKE) /NOLOGO clean
cd ..
- cd launcher
- $(MAKE) /NOLOGO clean
- cd ..
cd common
$(MAKE) /NOLOGO clean
cd ..
@@ -142,6 +128,4 @@
cd zlib
$(MAKE) /NOLOGO clean
cd ..
- cd vmls
- $(MAKE) /NOLOGO clean
- cd ..
+
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile?rev=417248&r1=417247&r2=417248&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile Mon Jun 26 10:35:59 2006
@@ -20,7 +20,7 @@
SHAREDSUB=$(SHARED)port\# comment to avoid \ being treated as continuation
LIBBASE=hyprt
-DLLNAME=$(DLLPATH)$(LIBBASE).dll
+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
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile?rev=417248&r1=417247&r2=417248&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile Mon Jun 26 10:35:59 2006
@@ -20,7 +20,7 @@
SHAREDSUB=$(SHARED)sig\# comment to avoid \ being treated as continuation
LIBBASE=hysig
-DLLNAME=$(DLLPATH)$(LIBBASE).dll
+DLLNAME=..\$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
BUILDFILES = $(SHAREDSUB)hysig_copyright.obj hysigwin.obj
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile?rev=417248&r1=417247&r2=417248&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile Mon Jun 26 10:35:59 2006
@@ -20,7 +20,7 @@
SHAREDSUB=$(SHARED)text\# comment to avoid \ being treated as continuation
LIBBASE=hytext
-DLLNAME=$(DLLPATH)$(LIBBASE).dll
+DLLNAME=..\$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile?rev=417248&r1=417247&r2=417248&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile Mon Jun 26 10:35:59 2006
@@ -20,7 +20,7 @@
SHAREDSUB=$(SHARED)thread\# comment to avoid \ being treated as continuation
LIBBASE=hythr
-DLLNAME=$(DLLPATH)$(LIBBASE).dll
+DLLNAME=..\$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
BUILDFILES = \
Re: svn commit: r417248 - in /incubator/harmony/enhanced/classlib/trunk: depends/build/ modules/luni/ modules/luni/src/main/native/launcher/ modules/luni/src/main/native/launcher/linux/ modules/luni/src/main/native/launcher/shared/ modules/luni/src/main/na...
Posted by Gregory Shimansky <gs...@gmail.com>.
Hello Tim
I've got another classlib build problem on linux. In the file below I had to
add $(DLLPATH)libhysig.so to MDLLIBFILES list or I get this error from
linker:
Execute:Java13CommandLauncher: Executing 'make' with
[exec] cc \
[exec] ../shared/main.o ../shared/cmain.o ../shared/launcher_copyright.o ../shared/strbuf.o ../shared/libhlp.o
\
[exec] -g -Xlinker --start-group /home/gregory/work/Harmony/harmony/enhanced/classlib/trunk/deploy/jdk/jre/bin/libhyprt.so /home/gregory/work/Harmony/harmony/enhanced/classlib/trunk/deploy/jdk/jre/bin/libhythr.so -Xlinker --end-group
\
[exec] -o ../java -lm -lpthread -lc -ldl \
[exec] -Xlinker -z -Xlinker origin \
[exec] -Xlinker -rpath -Xlinker \$ORIGIN/ \
[exec] -Xlinker -rpath-link -Xlinker ..
[exec] /usr/lib/gcc/i686-pc-linux-gnu/3.4.6/../../../../i686-pc-linux-gnu/bin/ld:
warning: libhysig.so, needed
by /home/gregory/work/Harmony/harmony/enhanced/classlib/trunk/deploy/jdk/jre/bin/libhyprt.so,
not found (try using -rpath or -rpath-link)
[exec] /home/gregory/work/Harmony/harmony/enhanced/classlib/trunk/deploy/jdk/jre/bin/libhyprt.so:
undefined reference to `jsig_primary_signal@HYSIG_0.1'
[exec] /home/gregory/work/Harmony/harmony/enhanced/classlib/trunk/deploy/jdk/jre/bin/libhyprt.so:
undefined reference to `signal@HYSIG_0.1'
[exec] /home/gregory/work/Harmony/harmony/enhanced/classlib/trunk/deploy/jdk/jre/bin/libhyprt.so:
undefined reference to `jsig_primary_sigaction@HYSIG_0.1'
[exec] /home/gregory/work/Harmony/harmony/enhanced/classlib/trunk/deploy/jdk/jre/bin/libhyprt.so:
undefined reference to `jsig_handler@HYSIG_0.1'
[exec] collect2: ld returned 1 exit status
[exec] make: *** [../java] Ошибка 1
On Monday 26 June 2006 21:36 tellison@apache.org wrote:
> Author: tellison
> Date: Mon Jun 26 10:35:59 2006
> New Revision: 417248
>
> URL: http://svn.apache.org/viewvc?rev=417248&view=rev
> Log:
> Apply patch HARMONY-668 (Move vmls and launcher natives to luni module)
<snip/>
> ===========================================================================
>=== ---
> incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/ma
>kefile (original) +++
> incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/laun
>cher/linux/makefile Mon Jun 26 10:35:59 2006 @@ -18,10 +18,11 @@
>
> 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
> -MDLLIBFILES = ../libhyprt.so ../libhythr.so
> +MDLLIBFILES = $(DLLPATH)libhyprt.so $(DLLPATH)libhythr.so
> EXENAME = $(EXEPATH)java
>
> include $(HY_HDK)/build/make/rules.mk
<snip/>
--
Gregory Shimansky, Intel Middleware Products Division
---------------------------------------------------------------------
Terms of use : http://incubator.apache.org/harmony/mailing.html
To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
For additional commands, e-mail: harmony-dev-help@incubator.apache.org