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/05/19 08:38:23 UTC
svn commit: r539696 - in /harmony/enhanced/drlvm/trunk/build/make:
build_component.xml selector.xsl
Author: hindessm
Date: Fri May 18 23:38:23 2007
New Revision: 539696
URL: http://svn.apache.org/viewvc?view=rev&rev=539696
Log:
Adding osfamily parameter to <select/>.
Modified:
harmony/enhanced/drlvm/trunk/build/make/build_component.xml
harmony/enhanced/drlvm/trunk/build/make/selector.xsl
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?view=diff&rev=539696&r1=539695&r2=539696
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build_component.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build_component.xml Fri May 18 23:38:23 2007
@@ -42,14 +42,15 @@
Some build properties must be predefined before the component
builder is called:
- ${build.semi.dir} - property that points to directory, the builder
- stores results of executed targets
- ${build.cfg} - configuration, supported values: debug/release
- ${build.os.short} - operation system, supported values: lnx/win
- ${build.arch} - supported values: ia32/em64t/ipf
- ${build.cxx} - c/cpp source code compiler, supported values:
- msvc/icl for Windows, gcc/icc for Linux
- ${build.is.debug} - true/false - used in build target
+ ${build.semi.dir} - property that points to directory, the builder
+ stores results of executed targets
+ ${build.cfg} - configuration, supported values: debug/release
+ ${build.os.short} - operation system, supported values: lnx/win
+ ${build.os.family} - OS, supported values: unix/win
+ ${build.arch} - supported values: ia32/em64t/ipf
+ ${build.cxx} - c/cpp source code compiler, supported values:
+ msvc/icl for Windows, gcc/icc for Linux
+ ${build.is.debug} - true/false - used in build target
${build.CLASSLIB.home} - directory with classlib src
${build.VM.home} - directory with vm src
@@ -135,6 +136,7 @@
<xslt in="@{target}" out="${build.semi.dir}/build/targets/${targetname}" style="./selector.xsl">
<param name="cfg" expression="${build.cfg}" />
<param name="os" expression="${build.os.short}" />
+ <param name="osfamily" expression="${build.os.family}" />
<param name="arch" expression="${build.arch}" />
<param name="cxx" expression="${build.cxx}" />
</xslt>
@@ -259,6 +261,7 @@
<xslt in="${file}" out="${init.component.file}" style="./build_component.xsl">
<param name="cfg" expression="${cfg}" />
<param name="os" expression="${build.os.short}" />
+ <param name="osfamily" expression="${build.os.family}" />
<param name="arch" expression="${build.arch}" />
<param name="cxx" expression="${build.cxx}" />
</xslt>
Modified: harmony/enhanced/drlvm/trunk/build/make/selector.xsl
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/selector.xsl?view=diff&rev=539696&r1=539695&r2=539696
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/selector.xsl (original)
+++ harmony/enhanced/drlvm/trunk/build/make/selector.xsl Fri May 18 23:38:23 2007
@@ -26,6 +26,7 @@
<xsl:output method="xml" omit-xml-declaration="yes" indent="yes" />
<xsl:param name="os" />
+ <xsl:param name="osfamily" />
<xsl:param name="cfg" />
<xsl:param name="arch" />
<xsl:param name="cxx" />
@@ -37,7 +38,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(@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(@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>