harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r951788 - in /harmony/enhanced/java/branches/mrh/jdktools: ./ make/ modules/jdktools/ modules/jpda/ modules/jpda/src/main/native/jdwp/unix/agent/ modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/ modules/jretools/ modules/samsa/ m...
Date Sat, 05 Jun 2010 23:13:45 GMT
Author: hindessm
Date: Sat Jun  5 23:13:44 2010
New Revision: 951788

URL: http://svn.apache.org/viewvc?rev=951788&view=rev
Log:
Refactor jdktools build in the same way as the previous commit for classlib.

Removed:
    harmony/enhanced/java/branches/mrh/jdktools/make/properties.xml
Modified:
    harmony/enhanced/java/branches/mrh/jdktools/build.xml
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml
    harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/build.xml
    harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile
    harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
    harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/build.xml
    harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/build.xml
    harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/unix/makefile

Modified: harmony/enhanced/java/branches/mrh/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/build.xml?rev=951788&r1=951787&r2=951788&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/build.xml Sat Jun  5 23:13:44 2010
@@ -67,10 +67,22 @@ module:
 
     <property file="${user.home}/.harmony-jdktools.properties" />
     <property name="common.resources" location="../common_resources" />
-    <import file="make/properties.xml" />
+    <property name="hy.target" location="target" />
+    <property name="hy.component" value="jdktools" />
+    <property name="hy.module" value="toplevel" />
+    <fail message="Property 'hy.target' is not defined">
+        <condition>
+            <not><isset property="hy.target" /></not>
+        </condition>
+    </fail>
+    <fail message="Property 'common.resources' is not defined">
+        <condition>
+            <not><isset property="common.resources" /></not>
+        </condition>
+    </fail>
 
     <!-- import properties for snapshot targets -->
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
 
     <!-- ================================
 	 target : rebuild

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml?rev=951788&r1=951787&r2=951788&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml Sat Jun  5 23:13:44
2010
@@ -19,11 +19,10 @@
 <project name="JDK Tools Build" default="build" basedir=".">
     <description>Build for JDK Tools component</description>
 
+    <property name="hy.component" value="jdktools" />
     <property name="hy.module" value="jdktools" />
-    <property name="hy.hdk" location="../../deploy" />
-    <import file="../../make/properties.xml" />
-    <property name="depends.dir" location="${common.resources}/depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
     <import file="${hy.hdk}/build/ant/depends.xml" />
     <property file="../../make/depends.properties" />
     <property file="${common.resources}/make/depends.properties" />
@@ -81,22 +80,23 @@
         <echo message="Cleaning ${hy.module} classes" />
         <delete file="${hy.jdk}/lib/tools.jar" />
         <delete file="${hy.jdk}/lib/tools-src.jar" />
-        <delete dir="bin/main" includeemptydirs="true" failonerror="false" />
+        <delete dir="${hy.build.mod}/java" includeemptydirs="true"
+                failonerror="false" />
     </target>
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin/test"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
         <echo message="Compiling ${hy.module} classes" />
         <ensure-javac/>
-        <mkdir dir="bin/main" />
+        <mkdir dir="${hy.build.mod}/java" />
 
         <hy.javac sourcepath=""
                   srcdir="src/main/java"
-                  destdir="bin/main">
+                  destdir="${hy.build.mod}/java">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -139,7 +139,7 @@
 
         <hy.jar.bin destfile="${hy.jdk}/lib/tools.jar"
                     manifest="META-INF/MANIFEST.MF">
-            <fileset dir="bin/main" />
+            <fileset dir="${hy.build.mod}/java" />
             <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
@@ -170,7 +170,7 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/build.xml?rev=951788&r1=951787&r2=951788&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/build.xml Sat Jun  5 23:13:44
2010
@@ -19,11 +19,10 @@
 <project name="JPDA Build" default="build" basedir=".">
     <description>Build for JPDA component</description>
 
+    <property name="hy.component" value="jdktools" />
     <property name="hy.module" value="jpda" />
-    <property name="hy.hdk" location="../../deploy" />
-    <import file="../../make/properties.xml" />
-    <property name="depends.dir" location="${common.resources}/depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
     <import file="${hy.hdk}/build/ant/depends.xml" />
     <property file="../../make/depends.properties" />
     <property file="${common.resources}/make/depends.properties" />
@@ -75,8 +74,8 @@
         <delete file="${hy.jdk}/lib/jdtstub-src.jar" />
 
         <delete includeemptydirs="true" failonerror="false">
-            <fileset dir="bin/main" />
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/main" />
+            <fileset dir="${hy.build.mod}/test" />
         </delete>
     </target>
 
@@ -112,17 +111,17 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin/test"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
         <echo message="Compiling ${hy.module} classes" />
         <ensure-javac/>
-        <mkdir dir="bin/main" />
+        <mkdir dir="${hy.build.mod}/java" />
 
         <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="bin/main">
+               destdir="${hy.build.mod}/java">
 
             <!-- HDK class library -->
             <classpath>
@@ -146,7 +145,7 @@
 
         <hy.jar.bin destfile="${hy.jdk}/lib/jdtstub.jar"
                     manifest="META-INF/MANIFEST.MF">
-            <fileset dir="bin/main" />
+            <fileset dir="${hy.build.mod}/java" />
         </hy.jar.bin>
 
         <hy.jar.src destfile="${hy.jdk}/lib/jdtstub-src.jar">
@@ -205,7 +204,7 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
  
         <mkdir dir="${tests.excludes.hdk.dir}"/>

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile?rev=951788&r1=951787&r2=951788&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile
(original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile
Sat Jun  5 23:13:44 2010
@@ -17,7 +17,8 @@
 # Makefile for module jdwp
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/jdktools/jpda/native/agent/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 COMMON=../../common/
 CMNAGENT=$(COMMON)agent/
@@ -30,34 +31,27 @@ INCLUDES += -I$(CMNAGENT)commands -I$(CM
 
 LDFLAGS += $(STDCLIBS)
 
-BUILDFILES = \
-    $(CMNAGENT)commands/ArrayReference.o \
-    $(CMNAGENT)commands/ArrayType.o \
-    $(CMNAGENT)commands/ClassLoaderReference.o \
-    $(CMNAGENT)commands/ClassObjectReference.o \
-    $(CMNAGENT)commands/ClassType.o \
-    $(CMNAGENT)commands/EventRequest.o \
-    $(CMNAGENT)commands/Method.o \
-    $(CMNAGENT)commands/ObjectReference.o \
-    $(CMNAGENT)commands/ReferenceType.o \
-    $(CMNAGENT)commands/StackFrame.o \
-    $(CMNAGENT)commands/StringReference.o \
-    $(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 \
-    core/TransportManager_pd.o
+BUILDFILES = ArrayReference.o ArrayType.o ClassLoaderReference.o \
+  ClassObjectReference.o ClassType.o EventRequest.o Method.o \
+  ObjectReference.o ReferenceType.o StackFrame.o StringReference.o \
+  ThreadGroupReference.o ThreadReference.o VirtualMachine.o \
+  Agent.o AgentEventRequest.o AgentMonitor.o ClassManager.o \
+  CommandDispatcher.o CommandHandler.o EventDispatcher.o LogManager.o \
+  MemoryManager.o ObjectManager.o OptionParser.o PacketDispatcher.o \
+  PacketParser.o RequestManager.o RequestModifier.o ThreadManager.o \
+  TransportManager.o AgentManager.o TransportManager_pd.o
 
 MDLLIBFILES = 
 
 DLLNAME = $(TOOLSDLLPATH)libjdwp.so
 
 include $(HY_HDK)/build/make/rules.mk
+
+$(HY_BIN)%.o: core/%.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(CMNAGENT)core/%.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(CMNAGENT)commands/%.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile?rev=951788&r1=951787&r2=951788&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
(original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
Sat Jun  5 23:13:44 2010
@@ -21,7 +21,8 @@
 
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/jdktools/jpda/native/dt_socket/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 COMMON=../../../common/
 CMNTRANS=$(COMMON)transport/
@@ -35,12 +36,16 @@ INCLUDES += -I$(CMNTRANS)common -I$(CMNT
 
 LDFLAGS += $(STDCLIBS)
 
-BUILDFILES = \
-    $(CMNTRANS)common/LastTransportError.o \
-    $(CMNTRANS)dt_socket/SocketTransport.o
+BUILDFILES = LastTransportError.o SocketTransport.o
 
 MDLLIBFILES = 
 
 DLLNAME = $(TOOLSDLLPATH)libdt_socket.so
 
 include $(HY_HDK)/build/make/rules.mk
+
+$(HY_BIN)%.o: $(CMNTRANS)common/%.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(CMNTRANS)dt_socket/%.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/build.xml?rev=951788&r1=951787&r2=951788&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/build.xml Sat Jun  5 23:13:44
2010
@@ -19,11 +19,10 @@
 <project name="JRE Tools Build" default="build" basedir=".">
     <description>Build for JRE Tools component</description>
 
+    <property name="hy.component" value="jdktools" />
     <property name="hy.module" value="jretools" />
-    <property name="hy.hdk" location="../../deploy" />
-    <import file="../../make/properties.xml" />
-    <property name="depends.dir" location="${common.resources}/depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
     <import file="${hy.hdk}/build/ant/depends.xml" />
     <property file="../../make/depends.properties" />
     <property file="${common.resources}/make/depends.properties" />
@@ -60,22 +59,22 @@
     <target name="-clean-java" unless="skip.java.build">
         <delete file="${hy.jre}/lib/tools.jar" />
         <delete file="${hy.jre}/lib/tools-src.jar" />
-        <delete dir="bin/main" includeemptydirs="true" failonerror="false" />
+        <delete dir="${hy.build.mod}/java" includeemptydirs="true" failonerror="false"
/>
     </target>
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin/test"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
         <echo message="Compiling ${hy.module} classes" />
         <ensure-javac/>
-        <mkdir dir="bin/main" />
+        <mkdir dir="${hy.build.mod}/java" />
 
         <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="bin/main">
+               destdir="${hy.build.mod}/java">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -107,7 +106,7 @@
 
         <hy.jar.bin destfile="${hy.jre}/lib/tools.jar"
              manifest="META-INF/MANIFEST.MF">
-            <fileset dir="bin/main" />
+            <fileset dir="${hy.build.mod}/java" />
             <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
@@ -125,7 +124,7 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/build.xml?rev=951788&r1=951787&r2=951788&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/build.xml Sat Jun  5 23:13:44
2010
@@ -19,10 +19,10 @@
 <project name="Samsa Build" default="build" basedir=".">
     <description>Build for samsa program</description>
 
+    <property name="hy.component" value="jdktools" />
     <property name="hy.module" value="samsa" />
-    <property name="hy.hdk" location="../../deploy" />
-    <import file="../../make/properties.xml" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
 
     <target name="build" depends="build-native,-test-jar"
             unless="skip.native.build"/>

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/unix/makefile?rev=951788&r1=951787&r2=951788&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/unix/makefile
(original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/unix/makefile
Sat Jun  5 23:13:44 2010
@@ -17,12 +17,16 @@
 # Makefile for 'samsa'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/jdktools/samsa/native/samsa/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
-BUILDFILES = ../samsa.o
+BUILDFILES = samsa.o
 
 EXENAME = $(LIBPATH)samsa
 
 MDLLIBFILES = 
 
 include $(HY_HDK)/build/make/rules.mk
+
+$(HY_BIN)%.o: ../%.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<



Mime
View raw message