harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r586888 - in /harmony/enhanced: drlvm/trunk/build/make/ drlvm/trunk/build/make/targets/ drlvm/trunk/vm/vmcore/src/init/ trunk/
Date Sun, 21 Oct 2007 11:59:23 GMT
Author: hindessm
Date: Sun Oct 21 04:59:22 2007
New Revision: 586888

URL: http://svn.apache.org/viewvc?rev=586888&view=rev
Log:
Add support for hy.no.sig option (already used in classlib) to federation
build.

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

Modified: harmony/enhanced/drlvm/trunk/build/make/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/build.xml?rev=586888&r1=586887&r2=586888&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build.xml Sun Oct 21 04:59:22 2007
@@ -318,6 +318,7 @@
             <param name="osfamily" expression="${build.os.family}" />
             <param name="arch" expression="${build.arch}" />
             <param name="cxx" expression="${build.cxx}" />
+            <param name="hynosig" expression="${hy.no.sig}" />
         </xslt>
 
         <xmlproperty file="${build.semi.dir}/deploy.xml" keeproot="true" collapseAttributes="true"
/>
@@ -368,6 +369,7 @@
         <echo message="              cfg = ${build.cfg}" />
         <echo message="     svn revision = ${svn.revision}" />
         <echo message="       components = ${COMPONENTS}" />
+        <echo message="        hy.no.sig = ${hy.no.sig}" />
     </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=586888&r1=586887&r2=586888&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build_component.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build_component.xml Sun Oct 21 04:59:22 2007
@@ -139,6 +139,7 @@
                     <param name="osfamily" expression="${build.os.family}" />
                     <param name="arch" expression="${build.arch}" />
                     <param name="cxx" expression="${build.cxx}" />
+                    <param name="hynosig" expression="${hy.no.sig}" />
                 </xslt>
                 <echo file="${build.targets.file}" append="true">
                     <![CDATA[
@@ -264,6 +265,7 @@
             <param name="osfamily" expression="${build.os.family}" />
             <param name="arch" expression="${build.arch}" />
             <param name="cxx" expression="${build.cxx}" />
+            <param name="hynosig" expression="${hy.no.sig}" />
         </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=586888&r1=586887&r2=586888&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/selector.xsl (original)
+++ harmony/enhanced/drlvm/trunk/build/make/selector.xsl Sun Oct 21 04:59:22 2007
@@ -30,6 +30,7 @@
     <xsl:param name="cfg" />
     <xsl:param name="arch" />
     <xsl:param name="cxx" />
+    <xsl:param name="hynosig" />
 
     <xsl:template match="/">
         <xsl:apply-templates />
@@ -38,7 +39,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(@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(@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=586888&r1=586887&r2=586888&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 04:59:22 2007
@@ -154,6 +154,11 @@
                     <compilerarg value="/Qip" />
                 </select>
             </select>
+
+            <select hynosig="true">
+                <defineset define="HY_NO_SIG" />
+            </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=586888&r1=586887&r2=586888&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 04:59:22
2007
@@ -47,7 +47,9 @@
 {
     "harmonyvm",
     "hythr",
+#if !defined(HY_NO_SIG)
     "hysig",
+#endif
     "hyprt",
     "hyzlib",
     "hytext",

Modified: harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?rev=586888&r1=586887&r2=586888&view=diff
==============================================================================
--- harmony/enhanced/trunk/build.xml (original)
+++ harmony/enhanced/trunk/build.xml Sun Oct 21 04:59:22 2007
@@ -32,6 +32,8 @@
     <!-- debug or release version -->
     <property name="hy.cfg" value="release" />
 
+    <property name="hy.no.sig" value="false" />
+
     <description>
         Apache Harmony subproject federation script
     </description>
@@ -319,6 +321,7 @@
     <target name="build_classlib" depends="auto_fetch_classlib_libs">
         <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="svn.info" value="${harmony.long.version}"/>
             <property name="svn.version" value="${harmony.version}"/>
             <property name="keep.working" value="true" />
@@ -328,6 +331,7 @@
     <target name="auto_fetch_classlib_libs" if="auto.fetch">
         <ant target="fetch_classlib_libs">
             <property name="hy.cfg" value="${hy.cfg}"/>
+            <property name="hy.no.sig" value="${hy.no.sig}"/>
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.version" value="${harmony.version}"/>
         </ant>
@@ -336,6 +340,7 @@
     <target name="fetch_classlib_libs">
         <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="svn.info" value="${harmony.long.version}"/>
             <property name="svn.version" value="${harmony.version}"/>
         </ant>
@@ -344,6 +349,7 @@
     <target name="clean_classlib">
         <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="svn.info" value="${harmony.long.version}"/>
             <property name="svn.version" value="${harmony.version}"/>
             <property name="keep.working" value="true" />
@@ -397,6 +403,7 @@
             <arg line="build.sh -Dexternal.dep.CLASSLIB.loc=${drlvm.classlib.offset}"/>
             <arg line="-Ddeploy.canonical.flag=true"/>
             <arg line="-Dsvn.revision=${harmony.version}" />
+            <arg line="-Dhy.no.sig=${hy.no.sig}"/>
             <arg line="${custom.props}"/>
             <env key="BUILD_CFG" value="${hy.cfg}"/>
         </exec>
@@ -432,6 +439,7 @@
         <exec executable="cmd" dir="working_vm/build" failonerror="true">
             <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="${custom.props}"/>
             <env key="BUILD_CFG" value="${hy.cfg}"/>
             <env key="CXX" value="msvc"/>



Mime
View raw message