Author: hindessm
Date: Mon Dec 4 23:45:45 2006
New Revision: 482540
URL: http://svn.apache.org/viewvc?view=rev&rev=482540
Log:
Split out CFLAGS for platforms rather than using dozens of ant conditions.
Added:
harmony/enhanced/classlib/trunk/depends/build/platform/
harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk
harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk
harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk
Modified:
harmony/enhanced/classlib/trunk/depends/build/defines.mk
harmony/enhanced/classlib/trunk/make/build-native.xml
harmony/enhanced/classlib/trunk/make/properties.xml
Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mk?view=diff&rev=482540&r1=482539&r2=482540
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Mon Dec 4 23:45:45 2006
@@ -24,10 +24,12 @@
DLL_LD = $(CC)
CXX_DLL_LD = $(CXX)
+include $(HY_HDK)/build/make/platform/$(HY_PLATFORM).mk
+
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)
+CFLAGS = -O1 $(HY_CFLAGS) -D_REENTRANT -DIPv6_FUNCTION_SUPPORT $(VMDEBUG) \
+ -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
Added: harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk?view=auto&rev=482540
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk (added)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk Mon Dec 4 23:45:45
2006
@@ -0,0 +1 @@
+HY_CFLAGS = -DLINUX -DLINUX_IA64 -DHYIA64
Added: harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk?view=auto&rev=482540
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk (added)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk Mon Dec 4 23:45:45
2006
@@ -0,0 +1 @@
+HY_CFLAGS = -DLINUX -DLINUX_X86 -DHYX86 -march=pentium3
Added: harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk?view=auto&rev=482540
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk (added)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk Mon Dec 4 23:45:45
2006
@@ -0,0 +1 @@
+HY_CFLAGS = -DLINUX -DLINUX_X86_64 -DHYX86_86 -fpic
Modified: harmony/enhanced/classlib/trunk/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-native.xml?view=diff&rev=482540&r1=482539&r2=482540
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-native.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-native.xml Mon Dec 4 23:45:45 2006
@@ -205,7 +205,7 @@
<mkdir dir="${hy.hdk}/build/make" />
<copy todir="${hy.hdk}/build/make" overwrite="yes">
<fileset dir="${depends.build}">
- <include name="*" />
+ <include name="**" />
</fileset>
</copy>
</target>
Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=482540&r1=482539&r2=482540
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Mon Dec 4 23:45:45 2006
@@ -118,25 +118,6 @@
</condition>
<property name="hy.arch" value="${os.arch}" />
- <condition property="hy.arch.define" value="HYX86">
- <equals arg1="${hy.arch}" arg2="x86"/>
- </condition>
- <condition property="hy.arch.define" value="HYX86_64">
- <equals arg1="${hy.arch}" arg2="x86_64"/>
- </condition>
- <condition property="hy.arch.define" value="HYIA64">
- <equals arg1="${hy.arch}" arg2="ia64"/>
- </condition>
-
- <condition property="hy.cflags" value="-fpic">
- <equals arg1="${hy.arch}" arg2="x86_64"/>
- </condition>
- <condition property="hy.cflags" value="-march=pentium3">
- <not>
- <equals arg1="${hy.arch}" arg2="ia64"/>
- </not>
- </condition>
-
<!-- Normalized platform name -->
<property name="hy.platform" value="${hy.os}.${hy.arch}"/>
<property name="hy.platform.path" value="${hy.os}/${hy.arch}"/>
@@ -211,8 +192,6 @@
make.command = ${make.command}
hy.hdk = ${hy.hdk}
- hy.cflags = ${hy.cflags}
- hy.arch.define = ${hy.arch.define}
The following property is only set if the "svn-prop" target has been
@@ -301,8 +280,6 @@
<env key="HY_ARCH" value="${hy.arch}" />
<env key="HY_OS" value="${hy.os}" />
<env key="HY_PLATFORM" value="${hy.platform}" />
- <env key="HY_CFLAGS" value="${hy.cflags}" />
- <env key="HY_ARCH_DEFINE" value="${hy.arch.define}" />
<arg line="@{target}" />
</exec>
</sequential>
|