Return-Path: 
 <commits-return-20449-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 78850 invoked from network); 29 Nov 2006 18:56:20 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 29 Nov 2006 18:56:20 -0000
Received: (qmail 97230 invoked by uid 500); 29 Nov 2006 18:56:29 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 97210 invoked by uid 500); 29 Nov 2006 18:56:29 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 97201 invoked by uid 99); 29 Nov 2006 18:56:29 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Nov 2006 10:56:29 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Nov 2006 10:56:17 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1E3CB1A9846; Wed, 29 Nov 2006 10:55:39 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r480680 - in /harmony/enhanced/jdktools/trunk: ./ make/
 modules/jpda/ modules/jpda/make/
 modules/jpda/src/main/native/jdwp/linux/agent/
 modules/jpda/src/main/native/jdwp/linux/transport/ modules/launcher/
 modules/launcher/src/main/native/la...
Date: Wed, 29 Nov 2006 18:55:38 -0000
To: commits@harmony.apache.org
From: geirm@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061129185539.1E3CB1A9846@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: geirm
Date: Wed Nov 29 10:55:36 2006
New Revision: 480680

URL: http://svn.apache.org/viewvc?view=rev&rev=480680
Log:
more tweaks to the build 

- trying to decouple as much as I can from HDK for now
- we now can build and place everything in the 
   deploy/jkd structure



Added:
    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
Modified:
    harmony/enhanced/jdktools/trunk/build.xml
    harmony/enhanced/jdktools/trunk/make/build-native.xml
    harmony/enhanced/jdktools/trunk/make/properties.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/make/hyproperties.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/agent/makefile
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/transport/makefile
    harmony/enhanced/jdktools/trunk/modules/launcher/build.xml
    harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/linux/makefile

Modified: harmony/enhanced/jdktools/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/build.xml?view=diff&rev=480680&r1=480679&r2=480680
==============================================================================
--- harmony/enhanced/jdktools/trunk/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/build.xml Wed Nov 29 10:55:36 2006
@@ -53,11 +53,14 @@
     
     <!-- set the path root for the classlib : must be relative to the build directory -->
     <property name="external.HDK.loc" value="../working_classlib/deploy" />
+    <property name="external.DRLVM.loc" value="../working_vm/build/deploy" />
     <property name="external.resources.loc" value="../common_resources" />
 
     <property name="external.resources" location="${external.resources.loc}" />
 
+    <property name="harmony.jdktools" location="${basedir}"/>
     <property name="hy.hdk" location="${external.HDK.loc}" />
+    <property name="hy.drlvm" location="${external.DRLVM.loc}" />
     <property name="hy.jdk" location="deploy/jdk" />
 
     <!-- import properties for snapshot targets -->
@@ -100,6 +103,8 @@
         </echo>
         <ant antfile="make/build-java.xml" inheritall="false" target="build">
             <property name="hy.hdk" value="${hy.hdk}"/>
+	        <property name="hy.drlvm" value="${hy.drlvm}"/>
+		    <property name="harmony.jdktools" value="${harmony.jdktools}"/>
             <property name="external.resources" value="${external.resources}"/>
         </ant>
     </target>
@@ -111,7 +116,11 @@
          ================================= -->
     <target name="clean-java" 
             description="Removes the compiled java code" >
-        <ant antfile="make/build-java.xml" inheritall="false" target="clean" />
+        <ant antfile="make/build-java.xml" inheritall="false" target="clean">
+	        <property name="hy.hdk" value="${hy.hdk}"/>
+	        <property name="hy.drlvm" value="${hy.drlvm}"/>
+		    <property name="harmony.jdktools" value="${harmony.jdktools}"/>
+        </ant>
     </target>
 
     <!-- ================================
@@ -136,6 +145,9 @@
         </echo>
         <ant antfile="make/build-native.xml" inheritall="false" target="build">
             <property name="hy.hdk" value="${hy.hdk}"/>
+            <property name="hy.drlvm" value="${hy.drlvm}"/>
+		    <property name="harmony.jdktools" value="${harmony.jdktools}"/>
+		    <property name="harmony.jdktools" value="${harmony.jdktools}"/>
         </ant>
     </target>
 
@@ -147,7 +159,11 @@
     <target name="clean-native"
         description="Removes the compiled native code" >
 
-        <ant antfile="make/build-native.xml" inheritall="false" target="clean" />
+        <ant antfile="make/build-native.xml" inheritall="false" target="clean">
+            <property name="hy.hdk" value="${hy.hdk}"/>
+            <property name="hy.drlvm" value="${hy.drlvm}"/>
+		    <property name="harmony.jdktools" value="${harmony.jdktools}"/>
+        </ant>
     </target>
 
     <target name="test"

Modified: harmony/enhanced/jdktools/trunk/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/build-native.xml?view=diff&rev=480680&r1=480679&r2=480680
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/build-native.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/build-native.xml Wed Nov 29 10:55:36 2006
@@ -68,7 +68,15 @@
     	
     	<!-- These module targets take care of building and copying
              their shared libs -->
-    	<ant dir="modules/launcher" antfile="build.xml" target="build-native" />
+    	<ant dir="modules/launcher" antfile="build.xml" target="build-native">
+            <property name="hy.drlvm" value="${hy.drlvm}"/>
+		    <property name="harmony.jdktools" value="${harmony.jdktools}"/>
+		</ant>
+        
+    	<ant dir="modules/jpda" antfile="build.xml" target="build-native">
+            <property name="hy.drlvm" value="${hy.drlvm}"/>
+		    <property name="harmony.jdktools" value="${harmony.jdktools}"/>
+		</ant>
     </target>
 
 
@@ -79,7 +87,14 @@
         depends="-make-clean" />
 
     <target name="-make-clean">
-    	<ant dir="modules/launcher" antfile="build.xml" target="clean-native" />
+    	<ant dir="modules/launcher" antfile="build.xml" target="clean-native">
+            <property name="hy.drlvm" value="${hy.drlvm}"/>
+		    <property name="harmony.jdktools" value="${harmony.jdktools}"/>
+		</ant>
+    	<ant dir="modules/jpda" antfile="build.xml" target="clean-native">
+            <property name="hy.drlvm" value="${hy.drlvm}"/>
+		    <property name="harmony.jdktools" value="${harmony.jdktools}"/>
+		</ant>
     	<delete dir="${native.lib.target}" />
     </target>
 

Added: harmony/enhanced/jdktools/trunk/make/defines.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/defines.mak?view=auto&rev=480680
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/defines.mak (added)
+++ harmony/enhanced/jdktools/trunk/make/defines.mak Wed Nov 29 10:55:36 2006
@@ -0,0 +1,30 @@
+# 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.
+
+APPVER=4.0
+TARGETOS=WIN95
+_WIN32_IE=0x0500
+SEHMAP = TRUE
+!include <win32.mak>
+
+LIBPATH=$(HY_HDK)\lib\# comment to avoid \ being treated as continuation
+EXEPATH=..\# ditto
+DLLPATH=$(HY_HDK)\jdk\jre\bin\# ditto
+SHAREDSUB=..\shared\# ditto
+
+HYCFLAGS = \
+  -Ogityb1 -WX -GF -Gs -MD -Zi -Zm400 \
+  -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ -DWINVER=0x0400 \
+  $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I.

Added: harmony/enhanced/jdktools/trunk/make/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/defines.mk?view=auto&rev=480680
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/defines.mk (added)
+++ harmony/enhanced/jdktools/trunk/make/defines.mk Wed Nov 29 10:55:36 2006
@@ -0,0 +1,33 @@
+# 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.
+
+#
+# Configuration Makefile
+#
+
+CXX = $(CC)
+CPP = $(CC) -E
+AS = as
+AR = ar
+DLL_LD = $(CC)
+CXX_DLL_LD = $(CXX)
+
+EXEPATH=../
+LIBPATH=$(HY_HDK)/lib/
+DLLPATH=$(HY_HDK)/jdk/jre/bin/
+SHAREDSUB=../shared/
+
+CFLAGS = -O1 $(HY_CFLAGS) -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT \
+         -D$(HY_ARCH_DEFINE) $(VMDEBUG) -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)

Added: harmony/enhanced/jdktools/trunk/make/makefile.include
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/makefile.include?view=auto&rev=480680
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/makefile.include (added)
+++ harmony/enhanced/jdktools/trunk/make/makefile.include Wed Nov 29 10:55:36 2006
@@ -0,0 +1,33 @@
+# 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.
+
+#
+# Configuration Makefile
+#
+
+CXX = $(CC)
+CPP = $(CC) -E
+AS = as
+AR = ar
+DLL_LD = $(CC)
+CXX_DLL_LD = $(CXX)
+
+EXEPATH=../
+LIBPATH=$(HY_HDK)/lib/
+DLLPATH=$(HY_HDK)/jdk/jre/bin/
+SHAREDSUB=../shared/
+
+CFLAGS = -O1 $(HY_CFLAGS) -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT \
+         -D$(HY_ARCH_DEFINE) $(VMDEBUG) -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)

Modified: harmony/enhanced/jdktools/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/properties.xml?view=diff&rev=480680&r1=480679&r2=480680
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/properties.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/properties.xml Wed Nov 29 10:55:36 2006
@@ -277,10 +277,13 @@
         <attribute name="dir" />
         <attribute name="target" default="" />
         <sequential>
+            <echo> LOCAL MAKE DEFN L ${hy.drlvm} @{dir}</echo>
             <exec failonerror="true"
                   executable="${make.command}"
                   dir="@{dir}">
                 <env key="HY_HDK" value="${hy.hdk}" />
+                <env key="HY_DRLVM" value="${hy.drlvm}" />
+                <env key="HY_JDKTOOLS" value="${harmony.jdktools}" />
                 <env key="HY_ARCH" value="${hy.arch}" />
                 <env key="HY_OS" value="${hy.os}" />
                 <env key="HY_PLATFORM" value="${hy.platform}" />

Added: harmony/enhanced/jdktools/trunk/make/rules.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/rules.mak?view=auto&rev=480680
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/rules.mak (added)
+++ harmony/enhanced/jdktools/trunk/make/rules.mak Wed Nov 29 10:55:36 2006
@@ -0,0 +1,59 @@
+# 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.
+
+.c.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.c
+
+.cpp.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.cpp
+
+.asm.obj:
+	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
+
+.rc.res:
+	rc -I..\include $<
+
+all: $(DLLNAME) $(EXENAME) $(LIBNAME)
+
+!ifdef LIBNAME
+$(LIBNAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+	$(implib) /NOLOGO -subsystem:windows -out:$(LIBNAME) \
+	$(HYLDFLAGS) -machine:$(CPU) \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+!endif
+
+!ifdef DLLNAME
+$(DLLNAME): $(LIBNAME)
+	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
+	-entry:_DllMainCRTStartup@12 -dll /BASE:$(DLLBASE) -machine:$(CPU) \
+        $(COMMENT) \
+	-subsystem:windows -out:$@ -map:$*.map \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES) \
+	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib \
+        comdlg32.lib winspool.lib  $(LIBPATH)$(*F).exp
+!endif
+
+!ifdef EXENAME
+$(EXENAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+	link /NOLOGO $(EXEFLAGS) /debug /opt:icf /opt:ref $(VMLINK) \
+	-out:$(EXENAME) -machine:$(CPU) setargv.obj  \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(EXEDLLFILES) 
+!endif
+
+clean:
+    -del $(BUILDFILES) *.res *.pdb \
+             $(LIBNAME) $(LIBNAME:.lib=.exp) \
+             $(DLLNAME) $(DLLNAME:.dll=.pdb) $(DLLNAME:.dll=.map) \
+             $(EXENAME) $(EXENAME:.exe=.pdb) >nul 2>&1

Added: harmony/enhanced/jdktools/trunk/make/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/rules.mk?view=auto&rev=480680
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/rules.mk (added)
+++ harmony/enhanced/jdktools/trunk/make/rules.mk Wed Nov 29 10:55:36 2006
@@ -0,0 +1,44 @@
+# 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.
+
+#
+# Configuration Makefile
+#
+
+CXXFLAGS=$(CFLAGS)
+
+all: $(DLLNAME) $(EXENAME) $(LIBNAME)
+
+$(LIBNAME): $(BUILDFILES)
+	$(AR) rcv $@ $(BUILDFILES)
+
+$(DLLNAME): $(BUILDFILES) $(MDLLIBFILES)
+	$(DLL_LD) -shared -Wl,--version-script,$(@F:.so=.exp) \
+	-Wl,-soname=$(@F) $(VMLINK) -o $@ \
+	$(BUILDFILES) $(SYSLIBFILES) \
+	-Xlinker --start-group $(MDLLIBFILES) -Xlinker --end-group \
+	-lc -lm -ldl $(LDFLAGS)
+
+$(EXENAME): $(BUILDFILES) $(MDLLIBFILES)
+	$(CC) $(VMLINK) \
+	$(BUILDFILES) \
+	-Xlinker --start-group $(MDLLIBFILES) -Xlinker --end-group \
+	-o $@ -lm -lpthread -lc -ldl \
+	-Xlinker -z -Xlinker origin \
+	-Xlinker -rpath -Xlinker \$$ORIGIN/ \
+	-Xlinker -rpath-link -Xlinker $(HY_HDK)/jdk/jre/bin
+
+clean:
+	-rm -f $(BUILDFILES) $(DLLNAME) $(EXENAME) $(LIBNAME)

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/build.xml?view=diff&rev=480680&r1=480679&r2=480680
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/build.xml Wed Nov 29 10:55:36 2006
@@ -21,146 +21,37 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <import file="../../make/properties.xml" />
 
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
     
-    <fileset id="classes" dir="${hy.build}">
-        <or>
-            <present targetdir="${hy.luni.src.main.java}" />
-            <present targetdir="${hy.luni.src.main.java}">
-                <mapper type="regexp"
-                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
-                        to="\1.java"/>
-            </present>
-        </or>
-    </fileset>
-
     <property file="../../make/depends.properties" />
-    <property name="fdlibm.zip" location="${depends.oss}/fdlibm_5.2.zip" />
-    <property name="exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}" />
 
-    <target name="build" depends="compile-java, copy-resources, 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="hysocket.h" />
-                <include name="gp.h" />
-                <include name="iohelp.h" />
-                <include name="exceptions.h" />
-                <include name="libglob.h" />
-                <include name="strhelp.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" />
-                <include name="jvmti.h" />
-            </fileset>
-        </copy>
-
-        <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="jclprots.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="jclprots.h" />
-            </fileset>
-        </copy>
-    </target>
+    <target name="build"/>
 
     <!-- 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" >
+    <target name="build-native">
+        
+        <!-- Build agent shared lib -->
+        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os}/agent" />
+        
+        <!-- Build transport shared lib -->
+        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os}/transport" />
 
-        <!-- Build fdlibm lib -->
-        <make dir="${hy.luni.src.main.native}/fdlibm/${hy.os}" />
-
-        <!-- Build vmi dll -->
-        <make dir="${hy.luni.src.main.native}/vmi/${hy.os}" />
-
-        <!-- 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" >
-        <!-- Build luni dll -->
-        <make dir="${hy.luni.src.main.native}/luni/${hy.os}" />
+        <!-- copy to our local jdk skeleton -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="${hy.luni.src.main.native}/luni">
+            <fileset dir="${hy.jpda.src.main.native}/jdwp/${hy.os}">
                 <patternset includes="*${shlib.suffix}*" />
             </fileset>
         </copy>
-
-        <!-- Build vmls lib -->
-        <make dir="${hy.luni.src.main.native}/vmls/${hy.os}" />
-
-        <!-- Build launcher executables -->
-        <make dir="${hy.luni.src.main.native}/launcher/${hy.os}" />
-
-        <!-- 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 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">
-        <make dir="${hy.luni.src.main.native}/fdlibm/${hy.os}" target="clean" />
-        <make dir="${hy.luni.src.main.native}/vmi/${hy.os}" target="clean" />
-        <make dir="${hy.luni.src.main.native}/luni/${hy.os}" target="clean" />
-        <make dir="${hy.luni.src.main.native}/vmls/${hy.os}" target="clean" />
-        <make dir="${hy.luni.src.main.native}/launcher/${hy.os}"
-              target="clean" />
+        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os}/agent" target="clean" />
+        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os}/transport" target="clean" />
     </target>
 
     <target name="test" depends="-test-module">

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/make/hyproperties.xml?view=diff&rev=480680&r1=480679&r2=480680
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/make/hyproperties.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/make/hyproperties.xml Wed Nov 29 10:55:36 2006
@@ -19,7 +19,7 @@
 -->
 
 <hy>
-   <luni location=".">
+   <jpda location=".">
       <src>
          <main>
             <java location="src/main/java" />
@@ -36,12 +36,10 @@
         <test location="bin/test" />
       </bin>
       <packaging>
-        <jarname>luni</jarname>
+        <jarname>jpda</jarname>
       </packaging>
-   </luni>
+   </jpda>
 
-   <hdk location="../../deploy" />
-   <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
    <tests>

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/agent/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/agent/makefile?view=diff&rev=480680&r1=480679&r2=480680
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/agent/makefile (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/agent/makefile Wed Nov 29 10:55:36 2006
@@ -20,7 +20,7 @@
 
 #
 
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_JDKTOOLS)/make/makefile.include
 
 COMMON=../../common/
 CMNAGENT=$(COMMON)agent/
@@ -61,4 +61,4 @@
 
 DLLNAME = ../libjdwp.so
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_JDKTOOLS)/make/rules.mk

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/transport/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/transport/makefile?view=diff&rev=480680&r1=480679&r2=480680
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/transport/makefile (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/transport/makefile Wed Nov 29 10:55:36 2006
@@ -21,7 +21,7 @@
 
 #
 
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_JDKTOOLS)/make/makefile.include
 
 COMMON=../../common/
 CMNTRANS=$(COMMON)transport/
@@ -44,4 +44,4 @@
 
 DLLNAME = ../libdt_socket.so
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_JDKTOOLS)/make/rules.mk

Modified: harmony/enhanced/jdktools/trunk/modules/launcher/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/launcher/build.xml?view=diff&rev=480680&r1=480679&r2=480680
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/launcher/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/launcher/build.xml Wed Nov 29 10:55:36 2006
@@ -21,7 +21,7 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <import file="../../make/properties.xml" />
 
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
@@ -33,6 +33,8 @@
 
     <target name="build" >
 
+        <echo>Launcher : ${hy.drlvm}  ${harmony.jdktools} </echo>
+            
         <!-- Build launcher executables -->
         <make dir="${hy.luni.src.main.native}/launcher/${hy.os}" />
 
@@ -57,6 +59,9 @@
 
     <!-- Clean natives -->
     <target name="clean">
+        <echo>
+Cleaning launcher natives
+        </echo>
         <make dir="${hy.luni.src.main.native}/launcher/${hy.os}"
               target="clean" />
     </target>

Modified: harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/linux/makefile?view=diff&rev=480680&r1=480679&r2=480680
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/linux/makefile (original)
+++ harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/linux/makefile Wed Nov 29 10:55:36 2006
@@ -17,7 +17,7 @@
 # Makefile for 'launcher'
 #
 
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_JDKTOOLS)/make/makefile.include
 
 BUILDFILES = $(SHAREDSUB)main.o $(SHAREDSUB)cmain.o \
 	$(SHAREDSUB)launcher_copyright.o $(SHAREDSUB)strbuf.o \
@@ -26,4 +26,4 @@
 	$(DLLPATH)libhythr.so $(DLLPATH)libhysig.so
 EXENAME = $(EXEPATH)java
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_JDKTOOLS)/make/rules.mk