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 2007/05/02 18:05:54 UTC
svn commit: r534526 - in /harmony/enhanced: classlib/trunk/modules/luni/
classlib/trunk/modules/luni/src/main/native/launcher/shared/
classlib/trunk/modules/luni/src/main/native/launcher/unix/
classlib/trunk/modules/luni/src/main/native/launcher/window...
Author: tellison
Date: Wed May 2 09:05:52 2007
New Revision: 534526
URL: http://svn.apache.org/viewvc?view=rev&rev=534526
Log:
Moving launcher to jdktools, and fixing up jdktools to build against a HDK properly.
(This is a work in progress.)
Added:
harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/
- copied from r534390, harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/
harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/shared/cmain.c
- copied unchanged from r534390, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c
harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/shared/libhlp.c
- copied unchanged from r534390, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/libhlp.c
harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/shared/main.c
- copied unchanged from r534390, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c
harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/shared/main_hlp.h
- copied unchanged from r534390, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main_hlp.h
harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/unix/
- copied from r534390, harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/linux/
harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/unix/main_hlp.c
- copied unchanged from r534390, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/main_hlp.c
harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/unix/makefile
- copied unchanged from r534390, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/makefile
harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/main_hlp.c
- copied unchanged from r534390, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/main_hlp.c
harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javae
- copied, changed from r534390, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae
harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javaw
- copied, changed from r534390, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw
harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/winmain.c
- copied unchanged from r534390, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/winmain.c
harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/unix/
- copied from r534390, harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/linux/
Removed:
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/
harmony/enhanced/jdktools/trunk/make/defines.mak
harmony/enhanced/jdktools/trunk/make/defines.mk
harmony/enhanced/jdktools/trunk/make/makefile.include
harmony/enhanced/jdktools/trunk/make/rules.mak
harmony/enhanced/jdktools/trunk/make/rules.mk
harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/
harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/linux/
harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/linux/
Modified:
harmony/enhanced/classlib/trunk/modules/luni/build.xml
harmony/enhanced/jdktools/trunk/make/properties.xml
harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/agent/makefile (contents, props changed)
harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/makefile (contents, props changed)
harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/makefile
harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/makefile (contents, props changed)
harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/unix/makefile (contents, props changed)
harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile (contents, props changed)
harmony/enhanced/trunk/build.xml
Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?view=diff&rev=534526&r1=534525&r2=534526
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Wed May 2 09:05:52 2007
@@ -130,21 +130,6 @@
<!-- Build vmls lib -->
<make dir="${hy.luni.src.main.native}/vmls/${hy.os.family}" />
- <!-- Build launcher executables -->
- <make dir="${hy.luni.src.main.native}/launcher/${hy.os.family}" />
-
- <!-- 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}" />
- <include name="*${progdb.suffix}*" if="is.windows" />
- </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 -->
@@ -164,8 +149,6 @@
<make dir="${hy.luni.src.main.native}/vmi/${hy.os.family}" target="clean" />
<make dir="${hy.luni.src.main.native}/luni/${hy.os.family}" target="clean" />
<make dir="${hy.luni.src.main.native}/vmls/${hy.os.family}" target="clean" />
- <make dir="${hy.luni.src.main.native}/launcher/${hy.os.family}"
- target="clean" />
</target>
<target name="test" depends="-test-module">
Modified: harmony/enhanced/jdktools/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/properties.xml?view=diff&rev=534526&r1=534525&r2=534526
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/properties.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/properties.xml Wed May 2 09:05:52 2007
@@ -315,6 +315,8 @@
<env key="HY_CFG" value="${hy.cfg}" />
<env key="HY_ARCH" value="${hy.arch}" />
<env key="HY_OS" value="${hy.os}" />
+ <env key="HY_NO_SIG" value="false" />
+ <env key="HY_NO_THR" value="false" />
<env key="HY_PLATFORM" value="${hy.platform}" />
<env key="HY_CFLAGS" value="${hy.cflags}" />
<env key="HY_ARCH_DEFINE" value="${hy.arch.define}" />
Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/agent/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/agent/makefile?view=diff&rev=534526&r1=534390&r2=534526
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/agent/makefile (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/agent/makefile Wed May 2 09:05:52 2007
@@ -20,15 +20,15 @@
#
-include $(HY_JDKTOOLS)/make/defines.mk
+include $(HY_HDK)/build/make/defines.mk
COMMON=../../common/
CMNAGENT=$(COMMON)agent/
-HY_CFLAGS += -I$(CMNAGENT)commands -I$(CMNAGENT)core \
- -I$(COMMON)generic -Icore
+HYCFLAGS += -I$(CMNAGENT)commands -I$(CMNAGENT)core \
+ -I$(COMMON)generic -Icore
-HY_LDFLAGS += -lstdc++ -lgcc_s
+HYLDFLAGS += -lstdc++ -lgcc_s
BUILDFILES = \
$(CMNAGENT)commands/ArrayReference.o \
@@ -57,4 +57,4 @@
DLLNAME = ../libjdwp.so
-include $(HY_JDKTOOLS)/make/rules.mk
+include $(HY_HDK)/build/make/rules.mk
Propchange: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/agent/makefile
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/makefile?view=diff&rev=534526&r1=534390&r2=534526
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/makefile (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/makefile Wed May 2 09:05:52 2007
@@ -21,15 +21,15 @@
#
-include $(HY_JDKTOOLS)/make/defines.mk
+include $(HY_HDK)/build/make/defines.mk
COMMON=../../common/
CMNTRANS=$(COMMON)transport/
-HY_CFLAGS += -I$(CMNTRANS)common -I$(CMNTRANS)dt_socket \
- -I$(COMMON)generic -Idt_socket
+HYCFLAGS += -I$(CMNTRANS)common -I$(CMNTRANS)dt_socket \
+ -I$(COMMON)generic -Idt_socket
-HY_LDFLAGS += -lstdc++ -lgcc_s
+HYLDFLAGS += -lstdc++ -lgcc_s
BUILDFILES = \
$(CMNTRANS)common/LastTransportError.o \
@@ -39,4 +39,4 @@
DLLNAME = ../libdt_socket.so
-include $(HY_JDKTOOLS)/make/rules.mk
+include $(HY_HDK)/build/make/rules.mk
Propchange: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/makefile
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/makefile?view=diff&rev=534526&r1=534525&r2=534526
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/makefile (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/makefile Wed May 2 09:05:52 2007
@@ -1,72 +1,69 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Makefile for module jdwp
-# export HY_HDK=/home/geir/dev/apache/harmony/enhanced/trunk/working_classlib/deploy/
-# export HY_DRLVM=/home/geir/dev/apache/harmony/enhanced/trunk/working_vm/build/deploy/
-
-#
-
-!include <$(HY_JDKTOOLS)\make\defines.mak>
-
-COMMON=..\..\common\# comment to avoid \ being treated as continuation
-CMNAGENT=$(COMMON)agent\# comment to avoid \ being treated as continuation
-
-LIBBASE=jdwp
-DLLNAME=..\$(LIBBASE).dll
-LIBNAME=$(LIBPATH)$(LIBBASE).lib
-
-INCLUDES = $(INCLUDES) \
- -I$(CMNAGENT)commands -I$(CMNAGENT)core \
- -I$(COMMON)generic -Icore
-
-HY_CFLAGS = $(HY_CFLAGS) $(INCLUDES) -GX -wd4290
-
-HY_LDFLAGS = $(HY_LDFLAGS) -def:$(LIBBASE).def
-
-BUILDFILES = \
- $(CMNAGENT)commands\ArrayReference.obj \
- $(CMNAGENT)commands\ArrayType.obj \
- $(CMNAGENT)commands\ClassLoaderReference.obj \
- $(CMNAGENT)commands\ClassObjectReference.obj \
- $(CMNAGENT)commands\ClassType.obj \
- $(CMNAGENT)commands\EventRequest.obj \
- $(CMNAGENT)commands\Method.obj \
- $(CMNAGENT)commands\ObjectReference.obj \
- $(CMNAGENT)commands\ReferenceType.obj \
- $(CMNAGENT)commands\StackFrame.obj \
- $(CMNAGENT)commands\StringReference.obj \
- $(CMNAGENT)commands\ThreadGroupReference.obj \
- $(CMNAGENT)commands\ThreadReference.obj \
- $(CMNAGENT)commands\VirtualMachine.obj \
- $(CMNAGENT)core\Agent.obj $(CMNAGENT)core\AgentEventRequest.obj $(CMNAGENT)core\AgentMonitor.obj \
- $(CMNAGENT)core\ClassManager.obj $(CMNAGENT)core\CommandDispatcher.obj $(CMNAGENT)core\CommandHandler.obj \
- $(CMNAGENT)core\EventDispatcher.obj $(CMNAGENT)core\LogManager.obj $(CMNAGENT)core\MemoryManager.obj \
- $(CMNAGENT)core\ObjectManager.obj $(CMNAGENT)core\OptionParser.obj $(CMNAGENT)core\PacketDispatcher.obj \
- $(CMNAGENT)core\PacketParser.obj $(CMNAGENT)core\RequestManager.obj $(CMNAGENT)core\RequestModifier.obj \
- $(CMNAGENT)core\ThreadManager.obj $(CMNAGENT)core\TransportManager.obj \
- core\TransportManager_pd.obj
-
-VIRTFILES =
-
-SYSLIBFILES =
-
-MDLLIBFILES =
-
-DLLBASE=0x13200000
-COMMENT=/comment:"JDWP agent native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."
-
-!include <$(HY_JDKTOOLS)\make\rules.mak>
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Makefile for module jdwp
+#
+
+!include <$(HY_HDK)\build\make\defines.mak>
+
+COMMON=..\..\common\# comment to avoid \ being treated as continuation
+CMNAGENT=$(COMMON)agent\# comment to avoid \ being treated as continuation
+
+LIBBASE=jdwp
+DLLNAME=..\$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+
+INCLUDES = $(INCLUDES) \
+ -I$(CMNAGENT)commands -I$(CMNAGENT)core \
+ -I$(COMMON)generic -Icore
+
+HYCFLAGS = $(HYCFLAGS) $(INCLUDES) -GX -wd4290
+
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
+
+BUILDFILES = \
+ $(CMNAGENT)commands\ArrayReference.obj \
+ $(CMNAGENT)commands\ArrayType.obj \
+ $(CMNAGENT)commands\ClassLoaderReference.obj \
+ $(CMNAGENT)commands\ClassObjectReference.obj \
+ $(CMNAGENT)commands\ClassType.obj \
+ $(CMNAGENT)commands\EventRequest.obj \
+ $(CMNAGENT)commands\Method.obj \
+ $(CMNAGENT)commands\ObjectReference.obj \
+ $(CMNAGENT)commands\ReferenceType.obj \
+ $(CMNAGENT)commands\StackFrame.obj \
+ $(CMNAGENT)commands\StringReference.obj \
+ $(CMNAGENT)commands\ThreadGroupReference.obj \
+ $(CMNAGENT)commands\ThreadReference.obj \
+ $(CMNAGENT)commands\VirtualMachine.obj \
+ $(CMNAGENT)core\Agent.obj $(CMNAGENT)core\AgentEventRequest.obj $(CMNAGENT)core\AgentMonitor.obj \
+ $(CMNAGENT)core\ClassManager.obj $(CMNAGENT)core\CommandDispatcher.obj $(CMNAGENT)core\CommandHandler.obj \
+ $(CMNAGENT)core\EventDispatcher.obj $(CMNAGENT)core\LogManager.obj $(CMNAGENT)core\MemoryManager.obj \
+ $(CMNAGENT)core\ObjectManager.obj $(CMNAGENT)core\OptionParser.obj $(CMNAGENT)core\PacketDispatcher.obj \
+ $(CMNAGENT)core\PacketParser.obj $(CMNAGENT)core\RequestManager.obj $(CMNAGENT)core\RequestModifier.obj \
+ $(CMNAGENT)core\ThreadManager.obj $(CMNAGENT)core\TransportManager.obj \
+ core\TransportManager_pd.obj
+
+VIRTFILES =
+
+SYSLIBFILES =
+
+MDLLIBFILES =
+
+DLLBASE=0x13200000
+COMMENT=/comment:"JDWP agent native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."
+
+!include <$(HY_HDK)\build\make\rules.mak>
Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/makefile?view=diff&rev=534526&r1=534525&r2=534526
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/makefile (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/makefile Wed May 2 09:05:52 2007
@@ -16,12 +16,8 @@
#
# Makefile for module jdwp - transport
#
-# export HY_HDK=/home/geir/dev/apache/harmony/enhanced/trunk/working_classlib/deploy/
-# export HY_DRLVM=/home/geir/dev/apache/harmony/enhanced/trunk/working_vm/build/deploy/
-#
-
-!include <$(HY_JDKTOOLS)\make\defines.mak>
+!include <$(HY_HDK)\build\make\defines.mak>
COMMON=..\..\common\# comment to avoid \ being treated as continuation
CMNTRANS=$(COMMON)transport\# comment to avoid \ being treated as continuation
@@ -34,9 +30,9 @@
-I$(CMNTRANS)common -I$(CMNTRANS)dt_socket \
-I$(COMMON)generic -Idt_socket
-HY_CFLAGS = $(HY_CFLAGS) $(INCLUDES) -GX -wd4290
+HYCFLAGS = $(HYCFLAGS) $(INCLUDES) -GX -wd4290
-HY_LDFLAGS = $(HY_LDFLAGS) -def:dt_socket\$(LIBBASE).def
+HYLDFLAGS = $(HYLDFLAGS) -def:dt_socket\$(LIBBASE).def
BUILDFILES = \
$(CMNTRANS)common\LastTransportError.obj \
@@ -51,4 +47,4 @@
DLLBASE=0x13200000
COMMENT=/comment:"JDWP socket transport native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."
-!include <$(HY_JDKTOOLS)\make\rules.mak>
+!include <$(HY_HDK)\build\make\rules.mak>
Propchange: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/makefile
------------------------------------------------------------------------------
svn:eol-style = native
Copied: harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javae (from r534390, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javae?view=diff&rev=534526&p1=harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae&r1=534390&p2=harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javae&r2=534526
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae (original)
+++ harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javae Wed May 2 09:05:52 2007
@@ -24,6 +24,7 @@
BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)cmain.obj \
$(SHAREDSUB)main.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj
+
!IF "$(HY_NO_THR)" == "false"
MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt.lib
!ELSE
Copied: harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javaw (from r534390, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javaw?view=diff&rev=534526&p1=harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw&r1=534390&p2=harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javaw&r2=534526
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw (original)
+++ harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javaw Wed May 2 09:05:52 2007
@@ -23,12 +23,14 @@
HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)main.obj \
- winmain.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj
+ winmain.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj
+
!IF "$(HY_NO_THR)" == "false"
MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt.lib
!ELSE
BUILDFILES = $(BUILDFILES) main_hlp.obj
!ENDIF
+
VIRTFILES = javaw.res
EXEFLAGS=$(guilflags) -subsystem:windows
EXEDLLFILES=$(guilibsdll)
Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/unix/makefile?view=diff&rev=534526&r1=534390&r2=534526
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/unix/makefile (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/unix/makefile Wed May 2 09:05:52 2007
@@ -17,10 +17,10 @@
# Makefile for 'samsa'
#
-include $(HY_JDKTOOLS)/make/defines.mk
+include $(HY_HDK)/build/make/defines.mk
BUILDFILES = ../samsa.o
EXENAME = samsa
-include $(HY_JDKTOOLS)/make/rules.mk
+include $(HY_HDK)/build/make/rules.mk
Propchange: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/unix/makefile
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile?view=diff&rev=534526&r1=534525&r2=534526
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile Wed May 2 09:05:52 2007
@@ -17,11 +17,11 @@
# Makefile for module samsa
#
-!include <$(HY_JDKTOOLS)\make\defines.mak>
+!include <$(HY_HDK)\build\make\defines.mak>
EXENAME = samsa.exe
BUILDFILES = ..\samsa.obj
EXEFLAGS=$(conlflags) -subsystem:console
EXEDLLFILES=$(conlibsdll)
-!include <$(HY_JDKTOOLS)\make\rules.mak>
+!include <$(HY_HDK)\build\make\rules.mak>
Propchange: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?view=diff&rev=534526&r1=534525&r2=534526
==============================================================================
--- harmony/enhanced/trunk/build.xml (original)
+++ harmony/enhanced/trunk/build.xml Wed May 2 09:05:52 2007
@@ -66,9 +66,9 @@
build_vm,
build_commonresources,
build_jdktools,
- assemble_artifacts,
+ assemble_artifacts,
bundle_hdk,
- bundle_jdk,
+ bundle_jdk,
bundle_jre"/>
<!-- =============================================================================== -->