improving versioning test and display

c342cbe6 · david_williams · c84ab8ce · c342cbe6 · c342cbe6 · c342cbe6
Commit c342cbe6 authored 18 years ago by david_williams
--- a/releng.wtpbuilder/components/jsf-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/jsf-sdk/dependency.xml
@@ -28,11 +28,6 @@
                name="groupId"
                value="jem" />
        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp" />
-        </antcall>
        <antcall target="getAndInstall">
            <param
                name="groupId"

--- a/releng.wtpbuilder/components/jsf.tests/dependency.xml
+++ b/releng.wtpbuilder/components/jsf.tests/dependency.xml
@@ -28,11 +28,6 @@
                name="groupId"
                value="jem" />
        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp" />
-        </antcall>
        <antcall target="getAndInstall">
            <param
                name="groupId"

--- a/releng.wtpbuilder/components/jst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jst.tests/customTargets.xml
-<project name="Build specific targets and properties"
-         default="noDefault">
+<project
+    name="Build specific targets and properties"
+    default="noDefault">

    <!-- ===================================================================== -->
    <!-- Run a given ${target} on all elements being built -->
@@ -10,10 +11,15 @@
        <echo message="basedir: ${basedir}" />
        <echo message="buildDirectory: ${buildDirectory}" />
        <echo message="baseLocation: ${baseLocation}" />
-        <ant antfile="${genericTargets}" target="${target}">
-            <property name="type" value="feature" />
-            <property name="id"
-                      value="org.eclipse.jst.tests" />
+        <ant
+            antfile="${genericTargets}"
+            target="${target}">
+            <property
+                name="type"
+                value="feature" />
+            <property
+                name="id"
+                value="org.eclipse.jst.tests" />
        </ant>
    </target>

@@ -25,10 +31,12 @@
    <!-- ===================================================================== -->

    <target name="assemble.org.eclipse.jst.tests">
-        <property name="archiveName"
-                  value="wtp-jst-Automated-Tests-${buildLabel}.zip" />
-        <ant antfile="${assembleScriptName}"
-             dir="${buildDirectory}" />
+        <property
+            name="archiveName"
+            value="wtp-jst-Automated-Tests-${buildLabel}.zip" />
+        <ant
+            antfile="${assembleScriptName}"
+            dir="${buildDirectory}" />

    </target>

@@ -37,17 +45,22 @@

    <target name="postPackage">

-        <property name="archiveName"
-                  value="wtp-jst-Automated-Tests-${buildLabel}.zip" />
-
-        <ant antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-             target="unpackUpdateJarsAndCreateZippedPackages">
-            <property name="buildDirectory"
-                      value="${buildDirectory}" />
-            <property name="buildLabel"
-                      value="${buildLabel}" />
-            <property name="archiveName"
-                      value="${archiveName}" />
+        <property
+            name="archiveName"
+            value="wtp-jst-Automated-Tests-${buildLabel}.zip" />
+
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
+            target="unpackUpdateJarsAndCreateZippedPackages">
+            <property
+                name="buildDirectory"
+                value="${buildDirectory}" />
+            <property
+                name="buildLabel"
+                value="${buildLabel}" />
+            <property
+                name="archiveName"
+                value="${archiveName}" />
        </ant>

    </target>
@@ -57,55 +70,67 @@
    <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
    <!-- ===================================================================== -->
    <target name="checkLocal">
-        <available property="mapsLocal"
-                   file="${buildDirectory}/maps/releng" />
+        <available
+            property="mapsLocal"
+            file="${buildDirectory}/maps/releng" />
    </target>
-    <target name="getMapFiles"
-            depends="checkLocal"
-            unless="mapsLocal">
+    <target
+        name="getMapFiles"
+        depends="checkLocal"
+        unless="mapsLocal">

        <!-- ***  change the repo info -->
-        <property name="mapCvsRoot"
-                  value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
-        <property name="mapVersionTag" value="HEAD" />
-        <echo message="${mapCvsRoot} ${mapVersionTag} ">
-        </echo>
-        <cvs cvsRoot="${mapCvsRoot}"
-             package="releng"
-             dest="${buildDirectory}/maps"
-             tag="${mapVersionTag}" />
+        <property
+            name="mapCvsRoot"
+            value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
+        <property
+            name="mapVersionTag"
+            value="HEAD" />
+        <echo message="${mapCvsRoot} ${mapVersionTag} "></echo>
+        <cvs
+            cvsRoot="${mapCvsRoot}"
+            package="releng"
+            dest="${buildDirectory}/maps"
+            tag="${mapVersionTag}" />
        <!--tag the map files project-->
        <antcall target="tagMapFiles">
-            <param name="mapCvsRoot"
-                   value="${mapCvsRoot}" />
+            <param
+                name="mapCvsRoot"
+                value="${mapCvsRoot}" />
        </antcall>
    </target>

-    <target name="tagMapFiles" if="tagMaps">
-        <cvs cvsRoot="${mapCvsRoot}"
-             dest="${buildDirectory}/maps"
-             command="tag v${buildType}${timestamp}" />
+    <target
+        name="tagMapFiles"
+        if="tagMaps">
+        <cvs
+            cvsRoot="${mapCvsRoot}"
+            dest="${buildDirectory}/maps"
+            command="tag v${buildType}${timestamp}" />
    </target>


    <!-- ===================================================================== -->
    <!-- Steps to do before setup -->
    <!-- ===================================================================== -->
-    <target name="preSetup">
-    </target>
+    <target name="preSetup"></target>

    <!-- ===================================================================== -->
    <!-- Steps to do after setup but before starting the build proper -->
    <!-- ===================================================================== -->
    <target name="postSetup">
-        <dirname file="${ant.file}"
-                 property="component.dir" />
-        <ant antfile="${component.dir}/dependency.xml"
-             target="get">
-            <property name="dependency.properties"
-                      value="${buildDirectory}/maps/releng/maps/dependencies.properties" />
-            <property name="base.install.dir"
-                      value="${buildRoot}" />
+        <dirname
+            file="${ant.file}"
+            property="component.dir" />
+        <ant
+            antfile="${component.dir}/dependency.xml"
+            target="get">
+            <property
+                name="dependency.properties"
+                value="${buildDirectory}/maps/releng/maps/dependencies.properties" />
+            <property
+                name="base.install.dir"
+                value="${buildRoot}" />
        </ant>

    </target>
@@ -113,33 +138,28 @@
    <!-- ===================================================================== -->
    <!-- Steps to do before fetching the build elements -->
    <!-- ===================================================================== -->
-    <target name="preFetch">
-    </target>
+    <target name="preFetch"></target>

    <!-- ===================================================================== -->
    <!-- Steps to do after fetching the build elements -->
    <!-- ===================================================================== -->
-    <target name="postFetch">
-    </target>
+    <target name="postFetch"></target>

    <!-- ===================================================================== -->
    <!-- Steps to do before generating the build scripts. -->
    <!-- ===================================================================== -->
-    <target name="preGenerate">
-    </target>
+    <target name="preGenerate"></target>

    <!-- ===================================================================== -->
    <!-- Steps to do after generating the build scripts. -->
    <!-- ===================================================================== -->
-    <target name="postGenerate">
-    </target>
+    <target name="postGenerate"></target>


    <!-- ===================================================================== -->
    <!-- Steps to do before running the build.xmls for the elements being built. -->
    <!-- ===================================================================== -->
-    <target name="preProcess">
-    </target>
+    <target name="preProcess"></target>

    <!-- ===================================================================== -->
    <!-- Steps to do after running the build.xmls for the elements being built. -->
@@ -157,14 +177,12 @@
    <!-- ===================================================================== -->
    <!-- Steps to do before running assemble. -->
    <!-- ===================================================================== -->
-    <target name="preAssemble">
-    </target>
+    <target name="preAssemble"></target>

    <!-- ===================================================================== -->
    <!-- Steps to do after  running assemble. -->
    <!-- ===================================================================== -->
-    <target name="postAssemble">
-    </target>
+    <target name="postAssemble"></target>

    <!-- ===================================================================== -->
    <!-- Steps to do after the build is done. -->
@@ -177,27 +195,30 @@
    <!-- ===================================================================== -->
    <!-- Steps to do to test the build results -->
    <!-- ===================================================================== -->
-    <target name="test">
-    </target>
+    <target name="test"></target>


    <!-- ===================================================================== -->
    <!-- Steps to do to publish the build results -->
    <!-- ===================================================================== -->
-    <target name="publish">
-    </target>
+    <target name="publish"></target>

    <!-- ===================================================================== -->
    <!-- Helper targets -->
    <!-- ===================================================================== -->
-    <target name="gatherLogs" if="logsAvailable">
+    <target
+        name="gatherLogs"
+        if="logsAvailable">
        <mkdir dir="${buildDirectory}/${buildLabel}/testcompilelogs" />
        <antcall target="allElements">
-            <param name="target" value="gatherLogs" />
+            <param
+                name="target"
+                value="gatherLogs" />
        </antcall>

-        <unzip dest="${buildDirectory}/${buildLabel}/testcompilelogs"
-               overwrite="true">
+        <unzip
+            dest="${buildDirectory}/${buildLabel}/testcompilelogs"
+            overwrite="true">
            <fileset dir="${buildDirectory}/features/org.eclipse.jst.tests">
                <include name="**/*.log.zip" />
            </fileset>
@@ -206,9 +227,13 @@

    </target>

-    <target name="clean" unless="noclean">
+    <target
+        name="clean"
+        unless="noclean">
        <antcall target="allElements">
-            <param name="target" value="cleanElement" />
+            <param
+                name="target"
+                value="cleanElement" />
        </antcall>
    </target>


--- a/releng.wtpbuilder/components/wst-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/wst-sdk/dependency.xml
@@ -34,11 +34,6 @@
                name="groupId"
                value="jem" />
        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp" />
-        </antcall>
        <antcall target="getAndInstall">
            <param
                name="groupId"

--- a/releng.wtpbuilder/components/wst.tests/dependency.xml
+++ b/releng.wtpbuilder/components/wst.tests/dependency.xml
@@ -28,11 +28,6 @@
                name="groupId"
                value="jem" />
        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp" />
-        </antcall>
        <antcall target="getAndInstall">
            <param
                name="groupId"

--- a/releng.wtpbuilder/components/wst/dependency.xml
+++ b/releng.wtpbuilder/components/wst/dependency.xml
@@ -33,11 +33,6 @@
                name="groupId"
                value="jem" />
        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp" />
-        </antcall>
        <antcall target="getAndInstall">
            <param
                name="groupId"