harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r818225 [2/2] - in /harmony/enhanced: classlib/trunk/depends/build/ classlib/trunk/depends/build/platform/ classlib/trunk/modules/archive/ classlib/trunk/modules/archive/src/main/native/archive/ classlib/trunk/modules/archive/src/main/nativ...
Date Wed, 23 Sep 2009 19:46:51 GMT
Modified: harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/build.xml?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/build.xml Wed Sep 23 19:46:48 2009
@@ -136,30 +136,36 @@
     </target>
 
     <!-- Build native code -->
-    <target name="build-native">
+    <target name="build-native"
+            depends="-build-native-common,-build-native-windows" />
+
+    <target name="-build-native-common">
         
         <echo message="Compiling JPDA natives" />
 
         <!-- Build agent shared lib -->
-        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/agent" />
+        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/agent">
+            <make-elements>
+                <arg line="TOOLSDLLPATH=${jdktools.deploy.dir}/jre/bin/" />
+            </make-elements>
+        </make>
         
         <!-- Build socket transport shared lib -->
-        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/transport/dt_socket"
/>
-
-        <antcall target="-build-native-windows" />
-
-        <!-- copy to our local jdk skeleton -->
-        <copy todir="${jdktools.deploy.dir}/jre/bin" overwrite="yes">
-            <fileset dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}">
-                <include name="*${shlib.suffix}"/>
-                <include name="*${progdb.suffix}" if="is.windows" />
-            </fileset>
-        </copy>
+        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/transport/dt_socket">
+            <make-elements>
+                <arg line="TOOLSDLLPATH=${jdktools.deploy.dir}/jre/bin/" />
+            </make-elements>
+        </make>
     </target>
 
     <target name="-build-native-windows" if="is.windows">
         <!-- Build shared memory transport shared lib on Windows -->
-        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/transport/dt_shmem"
/>
+        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/transport/dt_shmem">
+            <make-elements>
+                <arg line="TOOLSDLLPATH=${jdktools.deploy.dir}/jre/bin/" />
+            </make-elements>
+        </make>
+
     </target>
 
     <!-- internal target for local and global test run sequence -->
@@ -180,15 +186,33 @@
     </target>
 
     <!-- Clean natives -->
-    <target name="clean-native">
+    <target name="clean-native"
+            depends="-clean-native-common,-clean-native-windows" />
+
+    <target name="-clean-native-common">
         <echo message="Cleaning JPDA natives" />
-        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/agent" target="clean"
/>
-        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/transport/dt_socket"
target="clean" />
-        <antcall target="-clean-native-windows" />
+        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/agent"
+              target="clean">
+            <make-elements>
+                <arg line="TOOLSDLLPATH=${jdktools.deploy.dir}/jre/bin/" />
+            </make-elements>
+        </make>
+
+        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/transport/dt_socket"
+              target="clean">
+            <make-elements>
+                <arg line="TOOLSDLLPATH=${jdktools.deploy.dir}/jre/bin/" />
+            </make-elements>
+        </make>
     </target>
 
     <target name="-clean-native-windows" if="is.windows">
-        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/transport/dt_shmem"
target="clean" />
+        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/transport/dt_shmem"
+              target="clean">
+            <make-elements>
+                <arg line="TOOLSDLLPATH=${jdktools.deploy.dir}/jre/bin/" />
+            </make-elements>
+        </make>
     </target>
 
     <!-- Compile JDWP tests always with debug info included -->

Propchange: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -45,16 +45,19 @@
     $(CMNAGENT)commands/ThreadGroupReference.o \
     $(CMNAGENT)commands/ThreadReference.o \
     $(CMNAGENT)commands/VirtualMachine.o \
-    $(CMNAGENT)core/Agent.o $(CMNAGENT)core/AgentEventRequest.o $(CMNAGENT)core/AgentMonitor.o
\
-    $(CMNAGENT)core/ClassManager.o $(CMNAGENT)core/CommandDispatcher.o $(CMNAGENT)core/CommandHandler.o
\
-    $(CMNAGENT)core/EventDispatcher.o $(CMNAGENT)core/LogManager.o $(CMNAGENT)core/MemoryManager.o
\
-    $(CMNAGENT)core/ObjectManager.o $(CMNAGENT)core/OptionParser.o $(CMNAGENT)core/PacketDispatcher.o
\
-    $(CMNAGENT)core/PacketParser.o $(CMNAGENT)core/RequestManager.o $(CMNAGENT)core/RequestModifier.o
\
-    $(CMNAGENT)core/ThreadManager.o $(CMNAGENT)core/TransportManager.o $(CMNAGENT)core/AgentManager.o
\
+    $(CMNAGENT)core/Agent.o $(CMNAGENT)core/AgentEventRequest.o \
+    $(CMNAGENT)core/AgentMonitor.o $(CMNAGENT)core/ClassManager.o \
+    $(CMNAGENT)core/CommandDispatcher.o $(CMNAGENT)core/CommandHandler.o \
+    $(CMNAGENT)core/EventDispatcher.o $(CMNAGENT)core/LogManager.o \
+    $(CMNAGENT)core/MemoryManager.o $(CMNAGENT)core/ObjectManager.o \
+    $(CMNAGENT)core/OptionParser.o $(CMNAGENT)core/PacketDispatcher.o \
+    $(CMNAGENT)core/PacketParser.o $(CMNAGENT)core/RequestManager.o \
+    $(CMNAGENT)core/RequestModifier.o $(CMNAGENT)core/ThreadManager.o \
+    $(CMNAGENT)core/TransportManager.o $(CMNAGENT)core/AgentManager.o \
     core/TransportManager_pd.o
 
 MDLLIBFILES = 
 
-DLLNAME = ../libjdwp.so
+DLLNAME = $(TOOLSDLLPATH)libjdwp.so
 
 include $(HY_HDK)/build/make/rules.mk

Propchange: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/
            ('svn:ignore' removed)

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
Wed Sep 23 19:46:48 2009
@@ -41,6 +41,6 @@
 
 MDLLIBFILES = 
 
-DLLNAME = ../../libdt_socket.so
+DLLNAME = $(TOOLSDLLPATH)libdt_socket.so
 
 include $(HY_HDK)/build/make/rules.mk

Propchange: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/
            ('svn:ignore' removed)

Propchange: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -23,7 +23,7 @@
 CMNAGENT=$(COMMON)agent\# comment to avoid \ being treated as continuation
 
 LIBBASE=jdwp
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(TOOLSDLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 
 INCLUDES = $(INCLUDES) \

Propchange: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/
            ('svn:ignore' removed)

Propchange: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Sep 23 19:46:48 2009
@@ -1,2 +1 @@
 *.obj
-*.pdb

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile
Wed Sep 23 19:46:48 2009
@@ -23,7 +23,7 @@
 CMNTRANS=$(COMMON)transport\# comment to avoid \ being treated as continuation
 
 LIBBASE=dt_shmem
-DLLNAME=..\..\$(LIBBASE).dll
+DLLNAME=$(TOOLSDLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 
 INCLUDES = $(INCLUDES) \

Propchange: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/
            ('svn:ignore' removed)

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile
Wed Sep 23 19:46:48 2009
@@ -23,7 +23,7 @@
 CMNTRANS=$(COMMON)transport\# comment to avoid \ being treated as continuation
 
 LIBBASE=dt_socket
-DLLNAME=..\..\$(LIBBASE).dll
+DLLNAME=$(TOOLSDLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 
 INCLUDES = $(INCLUDES) \

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/build.xml?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/build.xml Wed Sep 23 19:46:48 2009
@@ -42,7 +42,7 @@
     <target name="build-tests" />
     <target name="test-module" depends="prepare-exclude, run-tests" />
 
-    <target name="build-native" depends="-compile-native, -copy-native-exe, -copy-native-exe-windows,
-copy-native-progdb, -copy-native-data" />
+    <target name="build-native" depends="-compile-native, -copy-native-exe, -copy-native-exe-windows,
-copy-native-data" />
 
     <!-- compile universal samsa binary -->
     <target name="-compile-native" >
@@ -58,7 +58,7 @@
     <target name="-copy-native-exe" >
 
         <property name="hy.samsa.exe"
-                  location="${hy.samsa.src.main.native}/samsa/${hy.os.family}/samsa${exe.suffix}"
/>
+                  location="${hy.hdk}/lib/samsa${exe.suffix}" />
 
         <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/java${exe.suffix}"
/>
         <chmod file="${jdktools.deploy.dir}/bin/java${exe.suffix}" perm="ugo+x" />
@@ -119,33 +119,13 @@
 
     <!-- copy windows javaw executable -->
     <target name="-copy-native-exe-windows" if="is.windows" >
-        <property name="hy.javaw.exe"
-                  location="${hy.samsa.src.main.native}/samsa/${hy.os.family}/javaw${exe.suffix}"
/>
-
-        <copy file="${hy.javaw.exe}" tofile="${jdktools.deploy.dir}/bin/javaw${exe.suffix}"
/>
-        <chmod file="${jdktools.deploy.dir}/bin/javaw${exe.suffix}" perm="ugo+x" />
-    </target>
-
-    <!-- copy samsa symbol info for different tools -->
-    <target name="-copy-native-progdb" if="is.windows" >
-
-        <property name="hy.samsa.progdb"
-                  location="${hy.samsa.src.main.native}/samsa/${hy.os.family}/samsa${progdb.suffix}"
/>
-        <property name="hy.javaw.progdb"
-                  location="${hy.samsa.src.main.native}/samsa/${hy.os.family}/javaw${progdb.suffix}"
/>
-
-        <copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/java${progdb.suffix}"
/>
-        <copy file="${hy.javaw.progdb}" tofile="${jdktools.deploy.dir}/bin/javaw${progdb.suffix}"
/>
-        <copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/javac${progdb.suffix}"
/>
-        <copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/javah${progdb.suffix}"
/>
-        <copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/javadoc${progdb.suffix}"
/>
-        <copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/javap${progdb.suffix}"
/>
-        <copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/jarsigner${progdb.suffix}"
/>
-    	<copy file="${hy.samsa.progdb}" tofile="${jretools.deploy.dir}/bin/unpack200${progdb.suffix}"
/>
-    	<copy file="${hy.samsa.progdb}" tofile="${jretools.deploy.dir}/bin/pack200${progdb.suffix}"
/>
-    	<copy file="${hy.samsa.progdb}" tofile="${jretools.deploy.dir}/bin/keytool${progdb.suffix}"
/>
-        <copy file="${hy.samsa.progdb}" tofile="${jretools.deploy.dir}/bin/policytool${progdb.suffix}"
/>
+        <property name="hy.samsaw.exe"
+                  location="${hy.hdk}/lib/samsaw${exe.suffix}" />
 
+        <copy file="${hy.samsaw.exe}"
+              tofile="${jdktools.deploy.dir}/bin/javaw${exe.suffix}" />
+        <chmod file="${jdktools.deploy.dir}/bin/javaw${exe.suffix}"
+               perm="ugo+x" />
     </target>
 
     <!-- copy samsa configuration data for different tools -->

Propchange: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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
Sep 23 19:46:48 2009
@@ -21,7 +21,7 @@
 
 BUILDFILES = ../samsa.o
 
-EXENAME = samsa
+EXENAME = $(LIBPATH)samsa
 
 MDLLIBFILES = 
 

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile.javae
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile.javae?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile.javae
(original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile.javae
Wed Sep 23 19:46:48 2009
@@ -19,7 +19,8 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-EXENAME = samsa.exe
+EXEBASE = samsa
+EXENAME = $(LIBPATH)$(EXEBASE).exe
 BUILDFILES = ..\samsa.obj
 EXEFLAGS=$(conlflags) -subsystem:console
 EXEDLLFILES=$(conlibsdll)

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile.javaw
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile.javaw?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile.javaw
(original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile.javaw
Wed Sep 23 19:46:48 2009
@@ -19,7 +19,8 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-EXENAME = javaw.exe
+EXEBASE = samsaw
+EXENAME = $(LIBPATH)$(EXEBASE).exe
 BUILDFILES = javaw.obj ..\samsa.obj
 EXEFLAGS=$(conlflags) -subsystem:windows
 EXEDLLFILES=$(guilibsdll)

Modified: harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/trunk/build.xml (original)
+++ harmony/enhanced/trunk/build.xml Wed Sep 23 19:46:48 2009
@@ -326,12 +326,16 @@
         <!-- copy the classlib/deploy tree as the hdk
              filtering out the jre, as that comes from
              working_vm -->
+        <!-- TODO: classlib files should come from classlib.  So we
+             should filter out classlib files when copying out of
+             working_vm and *not* when copying out of
+             working_classlib.  And if necessary add specific excludes
+             so we know exactly why it is not done in the obvious
+             way. -->
         <copy todir="${target.dir}/hdk">
             <fileset dir="working_classlib/deploy">
                 <exclude name="**/jre/**/*" />
-                <exclude name="**/jdk/lib/*" />
                 <exclude name="**/jdk/include/*" />
-                <exclude name="**/*.pdb" unless="copy.progdb" />
             </fileset>
         </copy>
 
@@ -339,15 +343,14 @@
         <!-- set overwrite flag to take hythr from VM -->
         <copy todir="${target.dir}/hdk" overwrite="true">
             <fileset dir="working_vm/deploy">
+                <!-- TODO: where should these .pdb files go? -->
                 <exclude name="**/*.pdb" unless="copy.progdb" />
             </fileset>
         </copy>
 
         <!-- now copy the working_jdktools/deploy/jdk -->
         <copy todir="${target.dir}/hdk/jdk/">
-            <fileset dir="working_jdktools/deploy/jdk">
-                <exclude name="**/*.pdb" unless="copy.progdb" />
-            </fileset>
+            <fileset dir="working_jdktools/deploy/jdk" />
         </copy>
     </target>
 



Mime
View raw message