You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2007/10/21 23:04:37 UTC
svn commit: r586954 - in /harmony/enhanced: drlvm/trunk/build/make/
drlvm/trunk/build/make/targets/ drlvm/trunk/vm/vmcore/src/init/ trunk/
trunk/debian/
Author: hindessm
Date: Sun Oct 21 14:04:36 2007
New Revision: 586954
URL: http://svn.apache.org/viewvc?rev=586954&view=rev
Log:
Making hy.local.zlib change again - the classlib issue is now fixed.
Modified:
harmony/enhanced/drlvm/trunk/build/make/build.xml
harmony/enhanced/drlvm/trunk/build/make/build_component.xml
harmony/enhanced/drlvm/trunk/build/make/selector.xsl
harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml
harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp
harmony/enhanced/trunk/build.xml
harmony/enhanced/trunk/debian/rules
Modified: harmony/enhanced/drlvm/trunk/build/make/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/build.xml?rev=586954&r1=586953&r2=586954&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build.xml Sun Oct 21 14:04:36 2007
@@ -319,6 +319,7 @@
<param name="arch" expression="${build.arch}" />
<param name="cxx" expression="${build.cxx}" />
<param name="hynosig" expression="${hy.no.sig}" />
+ <param name="hylocalzlib" expression="${hy.local.zlib}" />
</xslt>
<xmlproperty file="${build.semi.dir}/deploy.xml" keeproot="true" collapseAttributes="true" />
@@ -370,6 +371,7 @@
<echo message=" svn revision = ${svn.revision}" />
<echo message=" components = ${COMPONENTS}" />
<echo message=" hy.no.sig = ${hy.no.sig}" />
+ <echo message=" hy.local.zlib = ${hy.local.zlib}" />
</target>
<target name="setup" depends="svn-prop,extern_dep,detect.os.arch.cxx.cfg, set.semis.dirs" unless="skip.setup">
Modified: harmony/enhanced/drlvm/trunk/build/make/build_component.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/build_component.xml?rev=586954&r1=586953&r2=586954&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build_component.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build_component.xml Sun Oct 21 14:04:36 2007
@@ -140,6 +140,7 @@
<param name="arch" expression="${build.arch}" />
<param name="cxx" expression="${build.cxx}" />
<param name="hynosig" expression="${hy.no.sig}" />
+ <param name="hylocalzlib" expression="${hy.local.zlib}" />
</xslt>
<echo file="${build.targets.file}" append="true">
<![CDATA[
@@ -266,6 +267,7 @@
<param name="arch" expression="${build.arch}" />
<param name="cxx" expression="${build.cxx}" />
<param name="hynosig" expression="${hy.no.sig}" />
+ <param name="hylocalzlib" expression="${hy.local.zlib}" />
</xslt>
<!-- Load the semis/build/init_${component.name}.xml content. -->
Modified: harmony/enhanced/drlvm/trunk/build/make/selector.xsl
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/selector.xsl?rev=586954&r1=586953&r2=586954&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/selector.xsl (original)
+++ harmony/enhanced/drlvm/trunk/build/make/selector.xsl Sun Oct 21 14:04:36 2007
@@ -31,6 +31,7 @@
<xsl:param name="arch" />
<xsl:param name="cxx" />
<xsl:param name="hynosig" />
+ <xsl:param name="hylocalzlib" />
<xsl:template match="/">
<xsl:apply-templates />
@@ -39,7 +40,7 @@
<!-- the template prints the child of the select tag only if the
select matches build configuration -->
<xsl:template match="select">
- <xsl:if test="(contains(@hynosig,$hynosig) or not(@hynosig)) and (contains(@osfamily,$osfamily) or not(@osfamily))and (contains(@os,$os) or not(@os))and (contains(@cfg,$cfg) or not(@cfg)) and (contains(@arch,$arch) or not(@arch)) and (contains(concat(' ',@cxx), concat(' ',$cxx)) or not(@cxx))">
+ <xsl:if test="(contains(@hylocalzlib,$hylocalzlib) or not(@hylocalzlib)) and (contains(@hynosig,$hynosig) or not(@hynosig)) and (contains(@osfamily,$osfamily) or not(@osfamily))and (contains(@os,$os) or not(@os))and (contains(@cfg,$cfg) or not(@cfg)) and (contains(@arch,$arch) or not(@arch)) and (contains(concat(' ',@cxx), concat(' ',$cxx)) or not(@cxx))">
<xsl:apply-templates select="*" />
</xsl:if>
</xsl:template>
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml?rev=586954&r1=586953&r2=586954&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml Sun Oct 21 14:04:36 2007
@@ -159,6 +159,10 @@
<defineset define="HY_NO_SIG" />
</select>
+ <select hylocalzlib="true">
+ <defineset define="HY_LOCAL_ZLIB" />
+ </select>
+
</compiler>
<compiler id="common.cpp.compiler" name="${build.cxx}" extends="common.compiler">
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp?rev=586954&r1=586953&r2=586954&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp Sun Oct 21 14:04:36 2007
@@ -51,7 +51,11 @@
"hysig",
#endif
"hyprt",
+#if defined(HY_LOCAL_ZLIB)
+ "z",
+#else
"hyzlib",
+#endif
"hytext",
"hynio",
"vmi",
Modified: harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?rev=586954&r1=586953&r2=586954&view=diff
==============================================================================
--- harmony/enhanced/trunk/build.xml (original)
+++ harmony/enhanced/trunk/build.xml Sun Oct 21 14:04:36 2007
@@ -33,6 +33,7 @@
<property name="hy.cfg" value="release" />
<property name="hy.no.sig" value="false" />
+ <property name="hy.local.zlib" value="false" />
<description>
Apache Harmony subproject federation script
@@ -322,6 +323,7 @@
<ant antfile="working_classlib/build.xml" target="rebuild" inheritAll="false" >
<property name="hy.cfg" value="${hy.cfg}"/>
<property name="hy.no.sig" value="${hy.no.sig}"/>
+ <property name="hy.local.zlib" value="${hy.local.zlib}"/>
<property name="svn.info" value="${harmony.long.version}"/>
<property name="svn.version" value="${harmony.version}"/>
<property name="keep.working" value="true" />
@@ -332,6 +334,7 @@
<ant target="fetch_classlib_libs">
<property name="hy.cfg" value="${hy.cfg}"/>
<property name="hy.no.sig" value="${hy.no.sig}"/>
+ <property name="hy.local.zlib" value="${hy.local.zlib}"/>
<property name="svn.info" value="${harmony.long.version}"/>
<property name="svn.version" value="${harmony.version}"/>
</ant>
@@ -341,6 +344,7 @@
<ant antfile="working_classlib/build.xml" target="fetch-depends" inheritall="false" >
<property name="hy.cfg" value="${hy.cfg}"/>
<property name="hy.no.sig" value="${hy.no.sig}"/>
+ <property name="hy.local.zlib" value="${hy.local.zlib}"/>
<property name="svn.info" value="${harmony.long.version}"/>
<property name="svn.version" value="${harmony.version}"/>
</ant>
@@ -350,6 +354,7 @@
<ant antfile="working_classlib/build.xml" target="clean" inheritAll="false" >
<property name="hy.cfg" value="${hy.cfg}"/>
<property name="hy.no.sig" value="${hy.no.sig}"/>
+ <property name="hy.local.zlib" value="${hy.local.zlib}"/>
<property name="svn.info" value="${harmony.long.version}"/>
<property name="svn.version" value="${harmony.version}"/>
<property name="keep.working" value="true" />
@@ -404,6 +409,7 @@
<arg line="-Ddeploy.canonical.flag=true"/>
<arg line="-Dsvn.revision=${harmony.version}" />
<arg line="-Dhy.no.sig=${hy.no.sig}"/>
+ <arg line="-Dhy.local.zlib=${hy.local.zlib}"/>
<arg line="${custom.props}"/>
<env key="BUILD_CFG" value="${hy.cfg}"/>
</exec>
@@ -440,6 +446,7 @@
<arg line="/c build.bat -Dexternal.dep.CLASSLIB.loc=${drlvm.classlib.offset}"/>
<arg line="-Ddeploy.canonical.flag=true"/>
<arg line="-Dhy.no.sig=${hy.no.sig}"/>
+ <arg line="-Dhy.local.zlib=${hy.local.zlib}"/>
<arg line="${custom.props}"/>
<env key="BUILD_CFG" value="${hy.cfg}"/>
<env key="CXX" value="msvc"/>
Modified: harmony/enhanced/trunk/debian/rules
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/rules?rev=586954&r1=586953&r2=586954&view=diff
==============================================================================
--- harmony/enhanced/trunk/debian/rules (original)
+++ harmony/enhanced/trunk/debian/rules Sun Oct 21 14:04:36 2007
@@ -44,7 +44,7 @@
build-arch-stamp: configure-stamp
# Add here commands to compile the arch part of the package.
- ant -Dauto.fetch=true
+ ant -Dhy.no.sig=true -Duse.libstdc++6=true -Dhy.local.zlib=true
touch $@
build-indep: build-indep-stamp
@@ -60,7 +60,7 @@
rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
# Add here commands to clean up after the build process.
- ant clean
+ ant -Dhy.no.sig=true -Duse.libstdc++6=true -Dhy.local.zlib=true clean
dh_clean --exclude ./working_classlib/modules/luni/src/main/native/fdlibm_dist/Makefile.orig --exclude ./working_classlib/modules/luni/src/main/native/fdlibm_dist/fdlibm.h.orig --exclude ./working_classlib/modules/luni/src/main/native/fdlibm_dist/s_lib_version.c.orig --exclude ./working_classlib/modules/archive/src/main/native/zlib_dist/Makefile.orig