You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by mc...@apache.org on 2008/03/07 08:12:04 UTC
svn commit: r634566 - in /harmony/enhanced/classlib/trunk:
depends/build/defines.mk make/properties.xml modules/portlib/build.xml
Author: mcfirst
Date: Thu Mar 6 23:12:04 2008
New Revision: 634566
URL: http://svn.apache.org/viewvc?rev=634566&view=rev
Log:
Applying patch from HARMONY-2365 [classlib][build] Stop copying hythr library to bin directory\nThe copying made optional at the moment with -Dhy.thr.nodeploy=true
Modified:
harmony/enhanced/classlib/trunk/depends/build/defines.mk
harmony/enhanced/classlib/trunk/make/properties.xml
harmony/enhanced/classlib/trunk/modules/portlib/build.xml
Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mk?rev=634566&r1=634565&r2=634566&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Thu Mar 6 23:12:04 2008
@@ -84,7 +84,11 @@
MDLLIBFILES = $(LIBPATH)libhycommon.a
ifeq ($(HY_NO_THR),false)
+ifeq ($(HY_THR_NO_DEPLOY), true)
+MDLLIBFILES += $(HY_HDK)/../modules/portlib/src/main/native/thread/libhythr$(HY_LINKLIB_SUFFIX)
+else
MDLLIBFILES += $(DLLPATH)libhythr$(HY_LINKLIB_SUFFIX)
+endif
else
DEFINES += -DHY_NO_THR
endif
Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?rev=634566&r1=634565&r2=634566&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Thu Mar 6 23:12:04 2008
@@ -498,6 +498,7 @@
<env key="HY_PLATFORM" value="${hy.platform}" />
<env key="HY_NO_SIG" value="${hy.no.sig}" />
<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}" />
Modified: harmony/enhanced/classlib/trunk/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/build.xml?rev=634566&r1=634565&r2=634566&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/build.xml Thu Mar 6 23:12:04 2008
@@ -121,17 +121,22 @@
<!-- Build thread dll -->
<make dir="${hy.portlib.src.main.native}/thread/${hy.os.family}" />
+ <antcall target="-build-copy-thread" />
+
+ <!-- Copy link exports file on z/OS -->
+ <copy todir="${hy.hdk}/lib" overwrite="yes">
+ <fileset dir="${hy.portlib.src.main.native}/thread/${hy.os.family}">
+ <include name="*${linklib.suffix}" if="is.zos" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="-build-copy-thread" unless="hy.thr.nodeploy">
<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
<fileset dir="${hy.portlib.src.main.native}/thread">
<include name="*${shlib.suffix}*" />
<include name="*${progdb.suffix}*" if="is.windows" />
<exclude name="*${manifest.suffix}"/>
- </fileset>
- </copy>
- <!-- Copy link exports file on z/OS -->
- <copy todir="${hy.hdk}/lib" overwrite="yes">
- <fileset dir="${hy.portlib.src.main.native}/thread/${hy.os.family}">
- <include name="*${linklib.suffix}" if="is.zos" />
</fileset>
</copy>
</target>