harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r633826 - /harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml
Date Wed, 05 Mar 2008 11:45:04 GMT
Author: smishura
Date: Wed Mar  5 03:44:51 2008
New Revision: 633826

URL: http://svn.apache.org/viewvc?rev=633826&view=rev
Log:
Remove svn support macros - was substituted by scripts/svn.xml

Modified:
    harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml

Modified: harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml?rev=633826&r1=633825&r2=633826&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml Wed Mar  5 03:44:51 2008
@@ -869,197 +869,6 @@
         </sequential>
     </macrodef>
 
-    <!-- does svn checkout -->
-    <macrodef name="svn-co">
-        <attribute name="url"/>
-        <attribute name="trunk"/>
-        <sequential>
-            <svn-cleanup trunk="@{trunk}"/>
-            <exec executable="svn" dir="@{trunk}" failonerror="true">
-                <arg line="co @{url} @{trunk}"/>
-            </exec>
-        </sequential>
-    </macrodef>
-
-    <!-- does svn update of BT workspace -->
-    <macrodef name="svn-update-bt">
-        <attribute name="path"/>
-        <sequential>
-            <!-- first: extract the relative path -->
-            <get-relative-path root="${root.dir}"
-                               path="@{path}"
-                               property="tmp.relative.path"/>
-            <log message="Do BTI repository update of: '${tmp.relative.path}'"/>
-
-            <if>
-                <and>
-                    <not><istrue value="${framework.parameters.repository.noupdate}"
/></not>
-                    <not><contains string="${framework.parameters.repository.awaited}"
-                                   substring="|${tmp.relative.path}|"/></not>
-                </and>
-            <then>
-                <do-svn-update-bt path="${tmp.relative.path}"/>
-            </then>
-            </if>
-        </sequential>
-    </macrodef>
-
-    <!-- does svn update of BT workspace -->
-    <macrodef name="do-svn-update-bt">
-        <attribute name="path"/>
-        <sequential>
-            <!-- create the SVN path -->
-            <var name="tmp.svn-make-path.failure" unset="true"/>
-            <svn-make-path path="${tmp.relative.path}" 
-                           failureproperty="tmp.svn-make-path.failure"/>
-            <fail if="tmp.svn-make-path.failure">...
-------
-ERROR: While SVN path creation
-------  ${tmp.relative.path}
-for BTI workspace:
-        ${root.dir}
-the following error has occured:
-------
-${tmp.svn-make-path.failure}
-------
-</fail>
-            <var name="tmp.svn-make-path.failure" unset="true"/>
-        </sequential>
-    </macrodef>
-
-    <!-- creates the path in ${root.dir} svn repository 
-         (does consequent non-recursive updates of all non-existing
-         parents and recursive update of requested leaf) -->
-    <macrodef name="svn-make-path">
-        <attribute name="path"/>
-        <attribute name="failureproperty"/>
-        <attribute name="initial" default="@{path}"/>
-        <sequential>
-            <var name="tmp.exec.svn.result" unset="true"/>
-            <!-- try to get info to determine the path existence -->
-            <exec executable="svn" dir="${root.dir}" 
-                  failonerror="false" resultproperty="tmp.exec.svn.result">
-                <arg line="info @{path}"/>
-            </exec>
-            <!-- check for svn info failure
-                 (if it is so then no such 'svn' path) -->
-            <var name="tmp.svn.path.not.exists" unset="true"/>
-            <condition property="tmp.svn.path.not.exists" value="true">
-                <not><equals arg1="${tmp.exec.svn.result}" arg2="0"/></not>
-            </condition>
-            <if>
-                <isset property="tmp.svn.path.not.exists"/>
-            <then>
-                <!-- so svn path does not exists locally, 
-                     so check parent directory and create it -->
-                <log message="svn path '@{path}' does not exist!"/>
-                <var name="tmp.svn.path.dirname" unset="true"/>
-                <dirname property="tmp.svn.path.dirname" file="${root.dir}/@{path}"/>
-                <get-relative-path root="${root.dir}"
-                                   path="${tmp.svn.path.dirname}"
-                                   property="tmp.svn.path.dirname"/>
-                <if>
-                    <!-- less than 4 because Windows root is 'C:\' -->
-                    <length string="${tmp.svn.path.dirname}" 
-                            when="less" length="4"/>
-                <then>
-                    <!-- report error -->
-                    <property name="@{failureproperty}" 
-                              value="Supplied path is not a part of SVN repository."
-                    />
-                </then>
-                </if>
-                <log message="try to create parent svn path: '${tmp.svn.path.dirname}'"/>
-                <if>
-                    <not><isset property="@{failureproperty}"/></not>
-                <then>
-                    <svn-make-path 
-                        path="${tmp.svn.path.dirname}"
-                        initial="@{initial}"
-                        failureproperty="@{failureproperty}"/>
-                </then>
-                </if>
-            </then>
-            </if>
-            <var name="tmp.exec.svn.result" unset="true"/>
-            <if>
-                <not><isset property="@{failureproperty}"/></not>
-            <then>
-                <!-- claenup the parent svn path -->
-                <svn-cleanup trunk="${root.dir}/@{path}/.."/>
-                <!-- do recursive update only for requested path -->
-                <var name="tmp.is.initial" unset="true"/>
-                <condition property="tmp.is.initial" value="" else="-N">
-                    <equals arg1="@{initial}" arg2="@{path}"/>
-                </condition>
-                <log message="Do svn update ${tmp.is.initial} for @{path}"/>
-                <exec executable="svn" dir="${root.dir}"
-                      failonerror="false" resultproperty="tmp.exec.svn.result">
-                    <arg line="update ${tmp.is.initial} @{path}"/>
-                </exec>
-                <!-- report error in case of update failure -->
-                <condition property="@{failureproperty}" 
-                           value="SVN reported error while updating of:${line.separator}
   @{path}">
-                    <not><equals arg1="${tmp.exec.svn.result}" arg2="0"/></not>
-                </condition>
-                <!-- report error in case of path unexistence -->
-                <condition property="@{failureproperty}" 
-value="SVN repository does not contain such a path:${line.separator}
-    @{path}${line.separator}
-Please, check the supplied path.${line.separator}
-If you're developing new BTI subcomponent which is not under SVN yet,${line.separator}
-use whether${line.separator}
-    framework.parameters.repository.noupdate=true${line.separator}
-to turn off repository updates, or${line.separator}
-    framework.parameters.repository.awaited=|@{path}|${line.separator}
-to skip it from being updated.">
-                    <not><available file="${root.dir}/@{path}"/></not>
-                </condition>
-            </then>
-            </if>
-            <var name="tmp.is.initial" unset="true"/>
-            <var name="tmp.svn.path.dirname" unset="true"/>
-            <var name="tmp.svn.path.not.exists" unset="true"/>
-            <var name="tmp.exec.svn.result" unset="true"/>
-        </sequential>
-    </macrodef>
-
-    <!-- retrieves relative constituent of the path 
-         if supplied path is not under root, it will be provided as is -->
-    <macrodef name="get-relative-path">
-        <attribute name="root"/>
-        <attribute name="path"/>
-        <attribute name="property"/>
-        <sequential>
-            <var name="tmp.@{root}.normalized" unset="true"/>
-            <!-- convert back slashes to direct in root -->
-            <pathconvert property="tmp.@{root}.normalized">
-                <path location="@{root}"/>
-                <mapper>
-                    <filtermapper>
-                        <replacestring from="\" to="/"/>
-                    </filtermapper>
-                </mapper>
-            </pathconvert>
-
-            <var name="@{property}" unset="true"/>
-            <pathconvert property="@{property}">
-                <path location="@{path}"/>
-                <mapper>
-                    <chainedmapper>
-                        <filtermapper>
-                            <replacestring from="\" to="/"/>
-                        </filtermapper>
-                        <regexpmapper
-                            from="^(?:${tmp.@{root}.normalized}/)?(.*)$"
-                            to="\1" casesensitive="no"/>
-                    </chainedmapper>
-                </mapper>
-            </pathconvert>
-            <var name="tmp.@{root}.normalized" unset="true"/>
-        </sequential>
-    </macrodef>
-
     <!-- Execute Ant Build in new process -->
     <macrodef name="exec-ant">
         <attribute name="dir" default="."/>



Mime
View raw message