Skip to content
Snippets Groups Projects
Commit aa5d8d4e authored by david_williams's avatar david_williams
Browse files

cleanup and format

parent 9e7f5840
No related branches found
No related tags found
No related merge requests found
Showing
with 179 additions and 309 deletions
......@@ -99,8 +99,13 @@
pattern="MMMM d, yyyy"/>
</tstamp>
<!-- Insert Build Type descriptor -->
<antcall target="${buildType}"/>
<!-- Insert Build Type descriptor, I, S, etc. (php files have to expand to 'Integration', etc., as desired -->
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@buildtype@"
value="${buildType}"/>
<antcall target="writeData"/>
<!--
Update timestamp on file to permit overwrite through Ant
......@@ -193,8 +198,13 @@
pattern="MMMM d, yyyy"/>
</tstamp>
<!-- Insert Build Type descriptor -->
<antcall target="${buildType}"/>
<!-- Insert Build Type descriptor, I, S, etc. (php files have to expand to 'Integration', etc., as desired -->
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@buildtype@"
value="${buildType}"/>
<antcall target="writeData"/>
<!--
Update timestamp on file to permit overwrite through Ant
......@@ -280,49 +290,6 @@
outputFile="${resultDir}/files.count"/>
</target>
<!--Build type descriptors-->
<target name="I">
<replace
file="${resultingIndex}"
token="@type@"
value="Integration"/>
</target>
<target name="S">
<replace
file="${resultingIndex}"
token="@type@"
value="Stable"/>
</target>
<target name="N">
<replace
file="${resultingIndex}"
token="@type@"
value="Nightly"/>
</target>
<target name="M">
<replace
file="${resultingIndex}"
token="@type@"
value="Maintenance"/>
</target>
<target name="R">
<replace
file="${resultingIndex}"
token="@type@"
value="Release"/>
</target>
<target name="T">
<replace
file="${resultingIndex}"
token="@type@"
value="Test"/>
</target>
<target name="P">
<replace
file="${resultingIndex}"
token="@type@"
value="Patches"/>
</target>
<target name="checkIfTested">
<echo
level="debug"
......
......@@ -14,7 +14,7 @@
$buildBranch="@buildBranch@";
$build="@build@";
$type="@type@";
$buildtype="@buildtype@";
$builddate="@date@";
$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
......
......@@ -104,8 +104,14 @@
pattern="MMMM d, yyyy"/>
</tstamp>
<!-- Insert Build Type descriptor -->
<antcall target="${buildType}"/>
<!-- Insert Build Type descriptor, I, S, etc. (php files have to expand to 'Integration', etc., as desired -->
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@buildtype@"
value="${buildType}"/>
<antcall target="writeData"/>
<!-- Update timestamp on file to permit overwrite through Ant copy task -->
......@@ -173,8 +179,14 @@
pattern="MMMM d, yyyy"/>
</tstamp>
<!-- Insert Build Type descriptor -->
<antcall target="${buildType}"/>
<!-- Insert Build Type descriptor, I, S, etc. (php files have to expand to 'Integration', etc., as desired -->
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@buildtype@"
value="${buildType}"/>
<antcall target="writeData"/>
<!-- Update timestamp on file to permit overwrite through Ant copy task -->
......@@ -254,49 +266,7 @@
outputFile="${resultDir}/files.count"/>
</target>
<!--Build type descriptors-->
<target name="I">
<replace
file="${resultingIndex}"
token="@type@"
value="Integration"/>
</target>
<target name="S">
<replace
file="${resultingIndex}"
token="@type@"
value="Stable"/>
</target>
<target name="N">
<replace
file="${resultingIndex}"
token="@type@"
value="Nightly"/>
</target>
<target name="M">
<replace
file="${resultingIndex}"
token="@type@"
value="Maintenance"/>
</target>
<target name="R">
<replace
file="${resultingIndex}"
token="@type@"
value="Release"/>
</target>
<target name="T">
<replace
file="${resultingIndex}"
token="@type@"
value="Test"/>
</target>
<target name="P">
<replace
file="${resultingIndex}"
token="@type@"
value="Patches"/>
</target>
<target name="checkIfTested">
<echo
level="debug"
......
......@@ -13,7 +13,7 @@
$buildBranch="@buildBranch@";
$build="@build@";
$type="@type@";
$buildtype="@buildtype@";
$builddate="@date@";
$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
......
......@@ -127,8 +127,14 @@
pattern="MMMM d, yyyy"/>
</tstamp>
<!-- Insert Build Type descriptor -->
<antcall target="${buildType}"/>
<!-- Insert Build Type descriptor, I, S, etc. (php files have to expand to 'Integration', etc., as desired -->
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@buildtype@"
value="${buildType}"/>
<antcall target="writeData"/>
<!--
Update timestamp on file to permit overwrite through Ant
......@@ -231,8 +237,14 @@
pattern="MMMM d, yyyy"/>
</tstamp>
<!-- Insert Build Type descriptor -->
<antcall target="${buildType}"/>
<!-- Insert Build Type descriptor, I, S, etc. (php files have to expand to 'Integration', etc., as desired -->
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@buildtype@"
value="${buildType}"/>
<antcall target="writeData"/>
<!--
Update timestamp on file to permit overwrite through Ant
......@@ -286,56 +298,7 @@
outputFile="${resultDir}/files.count"/>
</target>
<!--Build type descriptors-->
<target name="I">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Integration"/>
</target>
<target name="S">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Stable"/>
</target>
<target name="N">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Nightly"/>
</target>
<target name="M">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Maintenance"/>
</target>
<target name="R">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Release"/>
</target>
<target name="T">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Test"/>
</target>
<target name="P">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Patches"/>
</target>
<target name="checkIfTested">
<echo
level="debug"
......
......@@ -15,7 +15,7 @@ $displayBuildNotes=false;
$buildBranch="@buildBranch@";
$build="@build@";
$type="@type@";
$buildtype="@buildtype@";
$builddate="@date@";
$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
......@@ -219,4 +219,29 @@ if ($debugScript) {
echo "inferred platform: " . getPlatform();
}
switch ($buildtype) {
case "I":
$type="Integration";
break;
case "M":
$type="Maintenance";
break;
case "R":
$type="Release";
break;
case "S":
$type="Stable";
break;
case "P":
$type="Patches";
break;
case "N":
$type="HEAD";
break;
default:
$type=$buildtype;
}
?>
......@@ -127,8 +127,13 @@
pattern="MMMM d, yyyy"/>
</tstamp>
<!-- Insert Build Type descriptor -->
<antcall target="${buildType}"/>
<!-- Insert Build Type descriptor, I, S, etc. (php files have to expand to 'Integration', etc., as desired -->
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@buildtype@"
value="${buildType}"/>
<antcall target="writeData"/>
<!--
Update timestamp on file to permit overwrite through Ant
......@@ -231,8 +236,14 @@
pattern="MMMM d, yyyy"/>
</tstamp>
<!-- Insert Build Type descriptor -->
<antcall target="${buildType}"/>
<!-- Insert Build Type descriptor, I, S, etc. (php files have to expand to 'Integration', etc., as desired -->
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@buildtype@"
value="${buildType}"/>
<antcall target="writeData"/>
<!--
Update timestamp on file to permit overwrite through Ant
......@@ -286,56 +297,7 @@
outputFile="${resultDir}/files.count"/>
</target>
<!--Build type descriptors-->
<target name="I">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Integration"/>
</target>
<target name="S">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Stable"/>
</target>
<target name="N">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Nightly"/>
</target>
<target name="M">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Maintenance"/>
</target>
<target name="R">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Release"/>
</target>
<target name="T">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Test"/>
</target>
<target name="P">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Patches"/>
</target>
<target name="checkIfTested">
<echo
level="debug"
......
......@@ -15,7 +15,7 @@ $displayBuildNotes=false;
$buildBranch="@buildBranch@";
$build="@build@";
$type="@type@";
$buildtype="@buildtype@";
$builddate="@date@";
$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
......@@ -243,4 +243,30 @@ if ($debugScript) {
echo "inferred platform: " . getPlatform();
}
switch ($buildtype) {
case "I":
$type="Integration";
break;
case "M":
$type="Maintenance";
break;
case "R":
$type="Release";
break;
case "S":
$type="Stable";
break;
case "P":
$type="Patches";
break;
case "N":
$type="HEAD";
break;
default:
$type=$buildtype;
}
?>
......@@ -127,8 +127,14 @@
pattern="MMMM d, yyyy"/>
</tstamp>
<!-- Insert Build Type descriptor -->
<antcall target="${buildType}"/>
<!-- Insert Build Type descriptor, I, S, etc. (php files have to expand to 'Integration', etc., as desired -->
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@buildtype@"
value="${buildType}"/>
<antcall target="writeData"/>
<!--
Update timestamp on file to permit overwrite through Ant
......@@ -231,8 +237,14 @@
pattern="MMMM d, yyyy"/>
</tstamp>
<!-- Insert Build Type descriptor -->
<antcall target="${buildType}"/>
<!-- Insert Build Type descriptor, I, S, etc. (php files have to expand to 'Integration', etc., as desired -->
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@buildtype@"
value="${buildType}"/>
<antcall target="writeData"/>
<!--
Update timestamp on file to permit overwrite through Ant
......@@ -286,56 +298,7 @@
outputFile="${resultDir}/files.count"/>
</target>
<!--Build type descriptors-->
<target name="I">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Integration"/>
</target>
<target name="S">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Stable"/>
</target>
<target name="N">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Nightly"/>
</target>
<target name="M">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Maintenance"/>
</target>
<target name="R">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Release"/>
</target>
<target name="T">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Test"/>
</target>
<target name="P">
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@type@"
value="Patches"/>
</target>
<target name="checkIfTested">
<echo
level="debug"
......
......@@ -15,7 +15,7 @@ $displayBuildNotes=false;
$buildBranch="@buildBranch@";
$build="@build@";
$type="@type@";
$buildtype="@buildtype@";
$builddate="@date@";
$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
......@@ -217,4 +217,28 @@ if ($debugScript) {
echo "inferred platform: " . getPlatform();
}
switch ($buildtype) {
case "I":
$type="Integration";
break;
case "M":
$type="Maintenance";
break;
case "R":
$type="Release";
break;
case "S":
$type="Stable";
break;
case "P":
$type="Patches";
break;
case "N":
$type="HEAD";
break;
default:
$type=$buildtype;
}
?>
......@@ -99,8 +99,14 @@
pattern="MMMM d, yyyy"/>
</tstamp>
<!-- Insert Build Type descriptor -->
<antcall target="${buildType}"/>
<!-- Insert Build Type descriptor, I, S, etc. (php files have to expand to 'Integration', etc., as desired -->
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@buildtype@"
value="${buildType}"/>
<antcall target="writeData"/>
<!--
Update timestamp on file to permit overwrite through Ant
......@@ -193,8 +199,14 @@
pattern="MMMM d, yyyy"/>
</tstamp>
<!-- Insert Build Type descriptor -->
<antcall target="${buildType}"/>
<!-- Insert Build Type descriptor, I, S, etc. (php files have to expand to 'Integration', etc., as desired -->
<replace
dir="${resultDir}"
includes="**/*.php,*.xml"
token="@buildtype@"
value="${buildType}"/>
<antcall target="writeData"/>
<!--
Update timestamp on file to permit overwrite through Ant
......@@ -280,49 +292,7 @@
outputFile="${resultDir}/files.count"/>
</target>
<!--Build type descriptors-->
<target name="I">
<replace
file="${resultingIndex}"
token="@type@"
value="Integration"/>
</target>
<target name="S">
<replace
file="${resultingIndex}"
token="@type@"
value="Stable"/>
</target>
<target name="N">
<replace
file="${resultingIndex}"
token="@type@"
value="Nightly"/>
</target>
<target name="M">
<replace
file="${resultingIndex}"
token="@type@"
value="Maintenance"/>
</target>
<target name="R">
<replace
file="${resultingIndex}"
token="@type@"
value="Release"/>
</target>
<target name="T">
<replace
file="${resultingIndex}"
token="@type@"
value="Test"/>
</target>
<target name="P">
<replace
file="${resultingIndex}"
token="@type@"
value="Patches"/>
</target>
<target name="checkIfTested">
<echo
level="debug"
......
......@@ -14,7 +14,7 @@
$buildBranch="@buildBranch@";
$build="@build@";
$type="@type@";
$buildtype="@buildtype@";
$builddate="@date@";
$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment