harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Geir Magnusson Jr." <g...@pobox.com>
Subject Re: svn commit: r505307 - in /harmony/enhanced/buildtest/trunk: README.txt build.xml config/config-full.xml
Date Tue, 13 Feb 2007 23:25:21 GMT

On Feb 11, 2007, at 10:45 PM, Vladimir Ivanov wrote:

> On 2/11/07, Geir Magnusson Jr. <geir@pobox.com> wrote:
>> but this ties CC rather rigidly to the makefile structure of drlvm -
>> can't we simply ditch the .bat and .sh files in drlvm build?
>
> In the case when .bat or .sh files called directly the execution log
> is missed in the notifications. From my point of view we should
> replace .bat and .sh files by one build.xml file. It will be more
> convinient.

Yes, that was my point.  Lets get rid of them :)

geir

> Thanks, Vladimir
>
>>
>> geir
>>
>> On Feb 9, 2007, at 9:34 AM, smishura@apache.org wrote:
>>
>> > Author: smishura
>> > Date: Fri Feb  9 06:34:04 2007
>> > New Revision: 505307
>> >
>> > URL: http://svn.apache.org/viewvc?view=rev&rev=505307
>> > Log:
>> > Apply patches for HARMONY-3138
>> > [testing][cc update] build of DRLVM should be callled as 'ant'
>> > instead of 'exec' to improve logging
>> >
>> > Tested on Windows and Linux ia32
>> >
>> > Modified:
>> >     harmony/enhanced/buildtest/trunk/README.txt
>> >     harmony/enhanced/buildtest/trunk/build.xml
>> >     harmony/enhanced/buildtest/trunk/config/config-full.xml
>> >
>> > Modified: harmony/enhanced/buildtest/trunk/README.txt
>> > URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/
>> > README.txt?view=diff&rev=505307&r1=505306&r2=505307
>> >  
>> ===================================================================== 
>> =
>> > ========
>> > --- harmony/enhanced/buildtest/trunk/README.txt (original)
>> > +++ harmony/enhanced/buildtest/trunk/README.txt Fri Feb  9 06:34:04
>> > 2007
>> > @@ -50,6 +50,9 @@
>> >     in your environment. Also ANT_OPTS variable should be set up to
>> > something like
>> >     set/export ANT_OPTS=-Xmx400M to compile Harmony classes.
>> >
>> > +   Note also, the MSVC environment also should be correctly set up
>> > on Windows box
>> > +   or command should be run from MSVC command prompt.
>> > +
>> >
>> >  To kickoff CruiseControl, just type :
>> >
>> >
>> > Modified: harmony/enhanced/buildtest/trunk/build.xml
>> > URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/
>> > build.xml?view=diff&rev=505307&r1=505306&r2=505307
>> >  
>> ===================================================================== 
>> =
>> > ========
>> > --- harmony/enhanced/buildtest/trunk/build.xml (original)
>> > +++ harmony/enhanced/buildtest/trunk/build.xml Fri Feb  9 06:34:04
>> > 2007
>> > @@ -283,7 +283,16 @@
>> >                       <replacevalue><![CDATA[%LIBDIR%\ant.jar
>> >  set CRUISE_PATH=%CRUISE_PATH%;%ANT_HOME%\lib\ant-apache-regexp.jar
>> >  set CRUISE_PATH=%CRUISE_PATH%;%ANT_HOME%\lib\ecj_3.2.jar
>> > +set CRUISE_PATH=%CRUISE_PATH%;%ANT_HOME%\lib\ant-nodeps.jar
>> > +set CRUISE_PATH=%CRUISE_PATH%;%ANT_HOME%\lib\ant-xslp.jar
>> > +set CRUISE_PATH=%CRUISE_PATH%;%ANT_HOME%\lib\ant-trax.jar
>> > +set CRUISE_PATH=%CRUISE_PATH%;@vmdir@\make\tmp\ant-contrib.jar
>> > +set CRUISE_PATH=%CRUISE_PATH%;@vmdir@\make\tmp\cpptasks
>> > \patched.classes
>> > +set CRUISE_PATH=%CRUISE_PATH%;@vmdir@\make\tmp\cpptasks.jar
>> >  ]]></replacevalue></replace>
>> > +        <replace file="${target.dir}/cruisecontrol.bat"
>> > +            token='@vmdir@'
>> > +            value='${target.dir}/projects/drlvm/trunk/build'/>
>> >               <exec executable="cmd" dir="${target.dir}/projects/ 
>> drlvm/trunk/
>> > build" >
>> >                       <env key="BUILD_CFG" value="$ 
>> {build_configuration}"/>
>> >                       <arg line="/c build.bat ${vm.proxy.h} $ 
>> {vm.proxy.p} -
>> > Dexternal.dep.CLASSLIB.loc=${target.dir}/projects/classlib/trunk
>> > update clean build"/>
>> > @@ -314,7 +323,10 @@
>> >                       value='CC_OPTS="-Xmx500m"'/>
>> >               <replace file="${target.dir}/cruisecontrol.sh"
>> >                       token="$LIBDIR/ant.jar"
>> > -                     value="$LIBDIR/ant.jar:$ANT_HOME/lib/ant- 
>> apache-regexp.jar:
>> > $ANT_HOME/lib/ecj_3.2.jar"/>
>> > +                value="$LIBDIR/ant.jar:$ANT_HOME/lib/ant-apache-
>> > regexp.jar:$ANT_HOME/lib/ecj_3.2.jar:$ANT_HOME/lib/ant-nodeps.jar:
>> > $ANT_HOME/lib/ant-xslp.jar:$ANT_HOME/lib/ant-trax.jar:@vmdir@/make/
>> > tmp/ant-contrib.jar:@vmdir@/make/tmp/cpptasks/
>> > patched.classes:@vmdir@/make/tmp/cpptasks.jar"/>
>> > +            <replace file="${target.dir}/cruisecontrol.sh"
>> > +            token='@vmdir@'
>> > +            value='${target.dir}/projects/drlvm/trunk/build'/>
>> >               <exec executable="sh" dir="${target.dir}/projects/ 
>> drlvm/trunk/
>> > build">
>> >                       <arg line="build.sh ${vm.proxy.h} $ 
>> {vm.proxy.p} -
>> > Dexternal.dep.CLASSLIB.loc=${target.dir}/projects/classlib/trunk
>> > update clean build"/>
>> >               </exec>
>> >
>> > Modified: harmony/enhanced/buildtest/trunk/config/config-full.xml
>> > URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/
>> > config/config-full.xml?view=diff&rev=505307&r1=505306&r2=505307
>> >  
>> ===================================================================== 
>> =
>> > ========
>> > --- harmony/enhanced/buildtest/trunk/config/config-full.xml  
>> (original)
>> > +++ harmony/enhanced/buildtest/trunk/config/config-full.xml Fri
>> > Feb  9 06:34:04 2007
>> > @@ -44,24 +44,11 @@
>> >                  <ant target="fetch-depends rebuild"
>> > antWorkingDir="projects/${project.name}/trunk" timeout="$
>> > {ttimeout}" usedebug="false">
>> >                      <jvmarg arg="-D${proxy.host.property}=$
>> > {proxy.value}"/>
>> >                      <jvmarg arg="-D${proxy.port.property}=$
>> > {port.value}"/>
>> > -                    <jvmarg arg="-Xms200M" />
>> >                      <jvmarg arg="-Xmx700M" />
>> >                  </ant>
>> >          </schedule>
>> >
>> > -        <!--log dir="logs/${project.name}">
>> > -            <merge dir="projects/${project.name}/trunk/build/
>> > test_report" pattern="TEST-*.xml" />
>> > -        </log-->
>> > -
>> >          <publishers>
>> > -            <!--antpublisher
>> > -                 antworkingdir="."
>> > -                 buildfile="copyres.xml"
>> > -                 uselogger="true"
>> > -                 usedebug="false"
>> > -                 target="copy.res">
>> > -                <property name="VM" value="ibm"/>
>> > -            </antpublisher-->
>> >              <onfailure>
>> >                  <xsltlogpublisher directory="."
>> > outfilename="classlib.txt"  xsltfile="br.xsl" />
>> >                  <antpublisher
>> > @@ -105,13 +92,18 @@
>> >          </listeners>
>> >
>> >          <modificationset quietperiod="30">
>> > +            <buildstatus logdir="logs/classlib"/>
>> >              <svn localWorkingCopy="projects/drlvm/trunk"/>
>> >              <svn localWorkingCopy="projects/classlib/trunk"/>
>> > -            <buildstatus logdir="logs/classlib"/>
>> >          </modificationset>
>> >
>> >          <schedule interval="${timeout}">
>> > -                <exec command="${sh}" args="${cmd.prefix} $ 
>> {cmd} -D
>> > ${proxy.host.vm}=${proxy.value} -D${proxy.port.vm}=${port.value} -
>> > Dexternal.dep.CLASSLIB.loc=${wdir}/projects/classlib/trunk update
>> > clean build" workingdir="projects/${project.name}/trunk/build"
>> > timeout="${ttimeout}" errorstr="FAILED"/>
>> > +            <ant target="update clean build"
>> > antWorkingDir="projects/${project.name}/trunk/build/make"  
>> timeout="$
>> > {ttimeout}" usedebug="false">
>> > +                <jvmarg arg="-D${proxy.host.vm}=${proxy.value}"/>
>> > +                <jvmarg arg="-D${proxy.port.vm}=${port.value}"/>
>> > +                <jvmarg arg="-Dexternal.dep.CLASSLIB.loc=${wdir}/
>> > projects/classlib/trunk" />
>> > +                <jvmarg arg="-Dbuild.arch=${build_arch}" />
>> > +            </ant>
>> >          </schedule>
>> >
>> >          <publishers>
>> > @@ -158,12 +150,18 @@
>> >          </listeners>
>> >
>> >          <modificationset>
>> > -            <svn localWorkingCopy="projects/drlvm/trunk"/>
>> >              <buildstatus logdir="logs/drlvm"/>
>> > +            <svn localWorkingCopy="projects/drlvm/trunk"/>
>> >          </modificationset>
>> >
>> >          <schedule interval="${timeout}">
>> > -                <exec command="${sh}" args="${cmd.prefix} ${cmd} -
>> > Drun.all.tests=true -Dexternal.dep.CLASSLIB.loc=${wdir}/projects/
>> > classlib/trunk test" workingdir="projects/drlvm/trunk/build"
>> > timeout="${ttimeout}" errorstr="FAILED" />
>> > +            <ant target="test" antWorkingDir="projects/drlvm/ 
>> trunk/
>> > build/make" timeout="${ttimeout}" usedebug="false">
>> > +                <jvmarg arg="-D${proxy.host.vm}=${proxy.value}"/>
>> > +                <jvmarg arg="-D${proxy.port.vm}=${port.value}"/>
>> > +                <jvmarg arg="-Dexternal.dep.CLASSLIB.loc=${wdir}/
>> > projects/classlib/trunk" />
>> > +                <jvmarg arg="-Dbuild.arch=${build_arch}" />
>> > +                <jvmarg arg="-Drun.all.tests=true" />
>> > +            </ant>
>> >          </schedule>
>> >
>> >          <log dir="logs/${project.name}">
>> > @@ -231,10 +229,10 @@
>> >          </listeners>
>> >
>> >          <modificationset quietperiod="60">
>> > -            <svn localWorkingCopy="projects/classlib/trunk"/>
>> > -            <svn localWorkingCopy="projects/drlvm/trunk"/>
>> >              <buildstatus logdir="logs/classlib"/>
>> >              <buildstatus logdir="logs/drlvm"/>
>> > +            <svn localWorkingCopy="projects/classlib/trunk"/>
>> > +            <svn localWorkingCopy="projects/drlvm/trunk"/>
>> >          </modificationset>
>> >
>> >          <schedule interval="${timeout}">
>> > @@ -242,7 +240,6 @@
>> >                      <jvmarg arg="-Dtest.jre.home=${wdir}/projects/
>> > drlvm/trunk/build/${os}_${build_arch}_${cc}_${build_cfg}/deploy/ 
>> jdk/
>> > jre" />
>> >                      <!--jvmarg arg="- 
>> Dhy.test.forkmode=perTest" /-->
>> >                      <jvmarg arg="-Dhy.test.vm.name=drl" />
>> > -                    <jvmarg arg="-Xms200M" />
>> >                      <jvmarg arg="-Xmx700M" />
>> >                  </ant>
>> >          </schedule>
>> >
>> >
>>
>>


Mime
View raw message