You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ge...@apache.org on 2006/12/11 20:45:22 UTC
svn commit: r485841 - in
/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows:
agent/jdwp.def agent/makefile transport/dt_socket/SocketTransport_pd.h
transport/dt_socket/dt_socket.def transport/makefile
Author: geirm
Date: Mon Dec 11 11:45:22 2006
New Revision: 485841
URL: http://svn.apache.org/viewvc?view=rev&rev=485841
Log:
HARMONY-2180
additions to fix build on windows
Added:
harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/jdwp.def
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/dt_socket/dt_socket.def
harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/makefile
Modified:
harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/SocketTransport_pd.h
Added: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/jdwp.def
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/jdwp.def?view=auto&rev=485841
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/jdwp.def (added)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/jdwp.def Mon Dec 11 11:45:22 2006
@@ -0,0 +1,7 @@
+LIBRARY JDWP
+
+SECTIONS
+ .data READ WRITE
+ .text EXECUTE READ
+
+EXPORTS
Added: 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=auto&rev=485841
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/makefile (added)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/makefile Mon Dec 11 11:45:22 2006
@@ -0,0 +1,72 @@
+# 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
+
+HYCFLAGS = \
+ -GX -wd4290 \
+ -I$(HY_DRLVM)\jdk\include -I. \
+ -I$(CMNAGENT)commands -I$(CMNAGENT)core \
+ -I$(COMMON)generic -Icore $(HYCFLAGS)
+
+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_JDKTOOLS)\make\rules.mak>
Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/SocketTransport_pd.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/SocketTransport_pd.h?view=diff&rev=485841&r1=485840&r2=485841
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/SocketTransport_pd.h (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/SocketTransport_pd.h Mon Dec 11 11:45:22 2006
@@ -32,6 +32,10 @@
#ifndef _SOCKETTRANSPORT_PD_H
#define _SOCKETTRANSPORT_PD_H
+#if defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_)
+#undef _WINSOCKAPI_
+#endif
+
#include <Winsock2.h>
#include <Ws2tcpip.h>
Added: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/dt_socket.def
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/dt_socket.def?view=auto&rev=485841
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/dt_socket.def (added)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/dt_socket.def Mon Dec 11 11:45:22 2006
@@ -0,0 +1,7 @@
+LIBRARY dt_socket
+
+SECTIONS
+ .data READ WRITE
+ .text EXECUTE READ
+
+EXPORTS
Added: 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=auto&rev=485841
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/makefile (added)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/makefile Mon Dec 11 11:45:22 2006
@@ -0,0 +1,54 @@
+# 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 - 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>
+
+COMMON=..\..\common\# comment to avoid \ being treated as continuation
+CMNTRANS=$(COMMON)transport\# comment to avoid \ being treated as continuation
+
+LIBBASE=dt_socket
+DLLNAME=..\$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+
+HYCFLAGS = $(HYCFLAGS) \
+ -GX -wd4290 \
+ -I$(HY_HDK)\include -I$(HY_DRLVM)\jdk\jre\include -I. \
+ -I$(CMNTRANS)common -I$(CMNTRANS)dt_socket \
+ -I$(COMMON)generic -Idt_socket
+
+HYLDFLAGS = $(HYLDFLAGS) -def:dt_socket\$(LIBBASE).def
+
+BUILDFILES = \
+ $(CMNTRANS)common\LastTransportError.obj \
+ $(CMNTRANS)dt_socket\SocketTransport.obj
+
+VIRTFILES =
+
+SYSLIBFILES =
+
+MDLLIBFILES =
+
+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>