Author: hindessm
Date: Mon May 31 22:00:14 2010
New Revision: 949875
URL: http://svn.apache.org/viewvc?rev=949875&view=rev
Log:
Pass make properties using a file in the hdk rather than using the make
macro environment in ant. Now doing:
make HY_HDK=/path/to/the/hdk
does what you'd expect it to do. (For Tim!)
Modified:
harmony/enhanced/java/trunk/classlib/depends/build/defines.mak
harmony/enhanced/java/trunk/classlib/depends/build/defines.mk
harmony/enhanced/java/trunk/classlib/make/properties.xml
harmony/enhanced/java/trunk/classlib/modules/portlib/build.xml
harmony/enhanced/java/trunk/common_resources/make/properties.xml
Modified: harmony/enhanced/java/trunk/classlib/depends/build/defines.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/defines.mak?rev=949875&r1=949874&r2=949875&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/defines.mak (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/defines.mak Mon May 31 22:00:14 2010
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+!include <$(HY_HDK)/build/make/properties.mak>
+
!ifndef APPVER
APPVER=4.0 #Default Windows version
!endif
Modified: harmony/enhanced/java/trunk/classlib/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/defines.mk?rev=949875&r1=949874&r2=949875&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/defines.mk (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/defines.mk Mon May 31 22:00:14 2010
@@ -17,6 +17,8 @@
# Configuration Makefile
#
+include $(HY_HDK)/build/make/properties.mk
+
CXX = $(CC)
CPP = $(CC) -E
AS = as
Modified: harmony/enhanced/java/trunk/classlib/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/make/properties.xml?rev=949875&r1=949874&r2=949875&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/make/properties.xml (original)
+++ harmony/enhanced/java/trunk/classlib/make/properties.xml Mon May 31 22:00:14 2010
@@ -259,6 +259,11 @@
</condition>
<property name="make.arg" value="" />
+ <condition property="make.suffix" value="mak">
+ <isset property="is.windows"/>
+ </condition>
+ <property name="make.suffix" value="mk" />
+
<condition property="png.home" value="/usr/local">
<isset property="is.freebsd"/>
</condition>
@@ -318,6 +323,11 @@
</not>
</condition>
+ <property name="hy.thr.no.deploy" value="false" />
+ <condition property="hy.thr.deploy" value="true">
+ <equals arg1="${hy.thr.no.deploy}" arg2="false" />
+ </condition>
+
<property name="hy.local.zlib" value="false" />
<condition property="hy.skip.zlib" value="true">
<not>
@@ -584,21 +594,23 @@ properties in preference to these:
<element name="make-elements" optional="true" />
<sequential>
<echo>Making "@{target}" in @{dir}</echo>
+ <echo file="${hy.hdk}/build/make/properties.${make.suffix}">
+HY_ZIP_API=${hy.zip.api}
+HY_PORTLIB_STUBS=${hy.portlib.stubs}
+HY_CFG=${hy.cfg}
+HY_ARCH=${hy.arch}
+HY_OS=${hy.os}
+HY_PLATFORM=${hy.platform}
+HY_NO_THR=${hy.no.thr}
+HY_THR_NO_DEPLOY=${hy.thr.no.deploy}
+HY_LOCAL_ZLIB=${hy.local.zlib}
+HY_SHLIB_SUFFIX=${shlib.suffix}
+HY_LINKLIB_SUFFIX=${linklib.suffix}
+ </echo>
<exec failonerror="true"
executable="${make.command}"
dir="@{dir}">
- <env key="HY_ZIP_API" value="${hy.zip.api}" />
- <env key="HY_PORTLIB_STUBS" value="${hy.portlib.stubs}" />
<env key="HY_HDK" value="${hy.hdk}" />
- <env key="HY_CFG" value="${hy.cfg}" />
- <env key="HY_ARCH" value="${hy.arch}" />
- <env key="HY_OS" value="${hy.os}" />
- <env key="HY_PLATFORM" value="${hy.platform}" />
- <env key="HY_NO_THR" value="${hy.no.thr}" />
- <env key="HY_THR_NO_DEPLOY" value="${hy.thr.nodeploy}" />
- <env key="HY_LOCAL_ZLIB" value="${hy.local.zlib}" />
- <env key="HY_SHLIB_SUFFIX" value="${shlib.suffix}" />
- <env key="HY_LINKLIB_SUFFIX" value="${linklib.suffix}" />
<arg line="${make.arg}" />
<arg line="@{target}" />
<make-elements />
Modified: harmony/enhanced/java/trunk/classlib/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/portlib/build.xml?rev=949875&r1=949874&r2=949875&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/portlib/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/portlib/build.xml Mon May 31 22:00:14 2010
@@ -158,8 +158,8 @@
</copy>
</target>
- <target name="-build-copy-thread" unless="hy.thr.nodeploy">
- <!-- TOFIX: should add property for: unless="skip.native.build" -->
+ <target name="-build-copy-thread" if="hy.thr.deploy"
+ unless="skip.native.build">
<copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
<fileset dir="src/main/native/thread">
<include name="*${shlib.suffix}*" />
Modified: harmony/enhanced/java/trunk/common_resources/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/make/properties.xml?rev=949875&r1=949874&r2=949875&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/make/properties.xml (original)
+++ harmony/enhanced/java/trunk/common_resources/make/properties.xml Mon May 31 22:00:14 2010
@@ -276,18 +276,7 @@ properties in preference to these:
<exec failonerror="true"
executable="${make.command}"
dir="@{dir}">
- <env key="HY_ZIP_API" value="${hy.zip.api}" />
- <env key="HY_PORTLIB_STUBS" value="${hy.portlib.stubs}" />
<env key="HY_HDK" value="${hy.hdk}" />
- <env key="HY_CFG" value="${hy.cfg}" />
- <env key="HY_ARCH" value="${hy.arch}" />
- <env key="HY_OS" value="${hy.os}" />
- <env key="HY_PLATFORM" value="${hy.platform}" />
- <env key="HY_NO_THR" value="${hy.no.thr}" />
- <env key="HY_THR_NO_DEPLOY" value="${hy.thr.nodeploy}" />
- <env key="HY_LOCAL_ZLIB" value="${hy.local.zlib}" />
- <env key="HY_SHLIB_SUFFIX" value="${shlib.suffix}" />
- <env key="HY_LINKLIB_SUFFIX" value="${linklib.suffix}" />
<arg line="${make.arg}" />
<arg line="@{target}" />
<make-elements />
|