harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r1027390 [6/6] - in /harmony/enhanced/java/trunk: ./ classlib/ classlib/depends/build/ classlib/make/ classlib/modules/accessibility/ classlib/modules/accessibility/make/ classlib/modules/annotation/ classlib/modules/annotation/make/ classl...
Date Tue, 26 Oct 2010 07:13:30 GMT
Modified: harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile
(original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile
Tue Oct 26 07:13:24 2010
@@ -17,7 +17,8 @@
 # Makefile for module jdwp - dt_shmem transport
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\jdktools\jpda\native\dt_shmem\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 COMMON=..\..\..\common\# comment to avoid \ being treated as continuation
 CMNTRANS=$(COMMON)transport\# comment to avoid \ being treated as continuation
@@ -35,9 +36,7 @@ HYCFLAGS = $(HYCFLAGS) $(INCLUDES) -GX -
 
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
-BUILDFILES = \
-    $(CMNTRANS)common\LastTransportError.obj \
-    SharedMemTransport.obj
+BUILDFILES = $(HY_BIN)LastTransportError.obj $(HY_BIN)SharedMemTransport.obj
 
 VIRTFILES = 
 
@@ -47,3 +46,11 @@ DLLBASE=0x13200000
 COMMENT=/comment:"JDWP shmem transport native code. (c) Copyright 2008 The Apache Software
Foundation or its licensors, as applicable."
 
 !include <$(HY_HDK)\build\make\rules.mak>
+
+{$(CMNTRANS)common}.cpp{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+        $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(CMNTRANS)dt_shmem}.cpp{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+        $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<

Modified: harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile
(original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile
Tue Oct 26 07:13:24 2010
@@ -17,7 +17,8 @@
 # Makefile for module jdwp - dt_socket transport
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\jdktools\jpda\native\dt_socket\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 COMMON=..\..\..\common\# comment to avoid \ being treated as continuation
 CMNTRANS=$(COMMON)transport\# comment to avoid \ being treated as continuation
@@ -35,17 +36,23 @@ HYCFLAGS = $(HYCFLAGS) $(INCLUDES) -GX -
 
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
-BUILDFILES = \
-    $(CMNTRANS)common\LastTransportError.obj \
-    $(CMNTRANS)dt_socket\SocketTransport.obj 
+BUILDFILES = $(HY_BIN)LastTransportError.obj $(HY_BIN)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_HDK)\build\make\rules.mak>
+
+{$(CMNTRANS)common}.cpp{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+        $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(CMNTRANS)dt_socket}.cpp{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+        $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<

Modified: harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml Tue Oct 26 07:13:24 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/trunk/jdktools/modules/jretools/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jretools/make/run-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jretools/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jretools/make/run-test.xml Tue Oct 26 07:13:24
2010
@@ -23,7 +23,9 @@
     <property file="../test.properties" />
 
     <property name="work.dir" value=".." />
-    <property name="target.dir" value=".." />
+    <property name="hy.test.root" value=".." />
+    <property name="hy.component" value="jdktools" />
+    <property name="hy.module" value="jretools" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/trunk/jdktools/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/samsa/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/samsa/build.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/samsa/build.xml Tue Oct 26 07:13:24 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/trunk/jdktools/modules/samsa/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/samsa/make/run-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/samsa/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/samsa/make/run-test.xml Tue Oct 26 07:13:24
2010
@@ -23,7 +23,9 @@
     <property file="../test.properties" />
 
     <property name="work.dir" value=".." />
-    <property name="target.dir" value=".." />
+    <property name="hy.test.root" value=".." />
+    <property name="hy.component" value="jdktools" />
+    <property name="hy.module" value="samsa" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/trunk/jdktools/modules/samsa/src/main/native/samsa/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/samsa/src/main/native/samsa/unix/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/samsa/src/main/native/samsa/unix/makefile
(original)
+++ harmony/enhanced/java/trunk/jdktools/modules/samsa/src/main/native/samsa/unix/makefile
Tue Oct 26 07:13:24 2010
@@ -17,9 +17,10 @@
 # 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
 
@@ -30,3 +31,7 @@ MDLLIBFILES = 
 endif
 
 include $(HY_HDK)/build/make/rules.mk
+
+$(HY_BIN)%.o: ../%.c
+	@mkdir -p ${@D}
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<

Modified: harmony/enhanced/java/trunk/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javae
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javae?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javae
(original)
+++ harmony/enhanced/java/trunk/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javae
Tue Oct 26 07:13:24 2010
@@ -17,11 +17,13 @@
 # Makefile for module samsa
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\jdktools\samsa\native\samsa\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
+SHAREDSUB=..\# trailing slash not continuation
 EXEBASE = samsa
 EXENAME = $(LIBPATH)$(EXEBASE).exe
-BUILDFILES = ..\samsa.obj
+BUILDFILES = $(HY_BIN)samsa.obj
 EXEFLAGS=$(conlflags) -subsystem:console
 EXEDLLFILES=$(conlibsdll)
 

Modified: harmony/enhanced/java/trunk/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javaw
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javaw?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javaw
(original)
+++ harmony/enhanced/java/trunk/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javaw
Tue Oct 26 07:13:24 2010
@@ -17,11 +17,13 @@
 # Makefile for javaw
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\jdktools\samsa\native\samsa\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
+SHAREDSUB=..\# trailing slash not continuation
 EXEBASE = samsaw
 EXENAME = $(LIBPATH)$(EXEBASE).exe
-BUILDFILES = javaw.obj ..\samsa.obj
+BUILDFILES = $(HY_BIN)javaw.obj $(HY_BIN)samsa.obj
 EXEFLAGS=$(conlflags) -subsystem:windows
 EXEDLLFILES=$(guilibsdll)
 



Mime
View raw message