diff options
author | David Williams | 2014-05-18 18:43:11 +0000 |
---|---|---|
committer | David Williams | 2014-05-18 18:43:11 +0000 |
commit | f8c8e92fbeacfddce290a02cb0d5ce5b7cd1d6bd (patch) | |
tree | ea20b3823609d7c8c621b0392067040ac3c9dd63 /scripts | |
parent | 934047c9e1eb4c853d2610ae60e458aaecff6b67 (diff) | |
download | eclipse.platform.releng.aggregator-f8c8e92fbeacfddce290a02cb0d5ce5b7cd1d6bd.tar.gz eclipse.platform.releng.aggregator-f8c8e92fbeacfddce290a02cb0d5ce5b7cd1d6bd.tar.xz eclipse.platform.releng.aggregator-f8c8e92fbeacfddce290a02cb0d5ce5b7cd1d6bd.zip |
Bug 409076 - establish standard formatting - indentation
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/build.sh | 6 | ||||
-rwxr-xr-x | scripts/xsl/groupId.sh | 50 | ||||
-rw-r--r-- | scripts/xsl/run-xsl.xml | 1 | ||||
-rwxr-xr-x | scripts/xsl/upVersionParents.sh | 10 | ||||
-rwxr-xr-x | scripts/xsl/xgroupId.sh | 14 | ||||
-rwxr-xr-x | scripts/xsl/xparentVersions.sh | 22 | ||||
-rwxr-xr-x | scripts/xsl/xslUpVersion.sh | 10 |
7 files changed, 57 insertions, 56 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index 829208332..56c66522b 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,7 +1,7 @@ #!/bin/bash clean up "dirt" from previous build -# see Bug 420078 +# see Bug 420078 git submodule foreach git clean -f -d -x git submodule foreach git reset --hard HEAD git clean -f -d -x @@ -13,7 +13,7 @@ git pull --recurse-submodules git submodule update # run the build -mvn clean verify +mvn clean verify -# find the results in +# find the results in # eclipse.platform.releng.tychoeclipsebuilder/sdk/target/products/* diff --git a/scripts/xsl/groupId.sh b/scripts/xsl/groupId.sh index 4c1268810..cdd08a6e9 100755 --- a/scripts/xsl/groupId.sh +++ b/scripts/xsl/groupId.sh @@ -3,45 +3,45 @@ ECLIPSE=/opt/local/e4-self/R421/eclipse/eclipse if [ $# -gt 0 ]; then - ECLIPSE="$1" ; shift + ECLIPSE="$1" ; shift fi find * -name pom.xml -print0 | xargs -0 grep eclipse-plugin | cut -f1 -d: | sort -u >/tmp/t1_$$.txt for POM in $( cat /tmp/t1_$$.txt ); do -$ECLIPSE -noSplash \ --application org.eclipse.ant.core.antRunner -v \ --buildfile run-xsl.xml \ --Dfile.sheet="fix-pom.xsl" \ --Dfile.in="$(pwd)/$POM" \ --Dfile.out="$(pwd)/${POM}.out" -xmllint --format "${POM}.out" >"${POM}" -rm "${POM}.out" + $ECLIPSE -noSplash \ + -application org.eclipse.ant.core.antRunner -v \ + -buildfile run-xsl.xml \ + -Dfile.sheet="fix-pom.xsl" \ + -Dfile.in="$(pwd)/$POM" \ + -Dfile.out="$(pwd)/${POM}.out" + xmllint --format "${POM}.out" >"${POM}" + rm "${POM}.out" done find * -name pom.xml -print0 | xargs -0 grep eclipse-feature | cut -f1 -d: | sort -u >/tmp/t1_$$.txt for POM in $( cat /tmp/t1_$$.txt ); do -$ECLIPSE -noSplash \ --application org.eclipse.ant.core.antRunner -v \ --buildfile run-xsl.xml \ --Dfile.sheet="fix-feature-pom.xsl" \ --Dfile.in="$(pwd)/$POM" \ --Dfile.out="$(pwd)/${POM}.out" -xmllint --format "${POM}.out" >"${POM}" -rm "${POM}.out" + $ECLIPSE -noSplash \ + -application org.eclipse.ant.core.antRunner -v \ + -buildfile run-xsl.xml \ + -Dfile.sheet="fix-feature-pom.xsl" \ + -Dfile.in="$(pwd)/$POM" \ + -Dfile.out="$(pwd)/${POM}.out" + xmllint --format "${POM}.out" >"${POM}" + rm "${POM}.out" done find * -name pom.xml -print0 | xargs -0 grep eclipse-test-plugin | cut -f1 -d: | sort -u >/tmp/t1_$$.txt for POM in $( cat /tmp/t1_$$.txt ); do -$ECLIPSE -noSplash \ --application org.eclipse.ant.core.antRunner -v \ --buildfile run-xsl.xml \ --Dfile.sheet="fix-pom.xsl" \ --Dfile.in="$(pwd)/$POM" \ --Dfile.out="$(pwd)/${POM}.out" -xmllint --format "${POM}.out" >"${POM}" -rm "${POM}.out" + $ECLIPSE -noSplash \ + -application org.eclipse.ant.core.antRunner -v \ + -buildfile run-xsl.xml \ + -Dfile.sheet="fix-pom.xsl" \ + -Dfile.in="$(pwd)/$POM" \ + -Dfile.out="$(pwd)/${POM}.out" + xmllint --format "${POM}.out" >"${POM}" + rm "${POM}.out" done diff --git a/scripts/xsl/run-xsl.xml b/scripts/xsl/run-xsl.xml index 926cde126..8a5f15c84 100644 --- a/scripts/xsl/run-xsl.xml +++ b/scripts/xsl/run-xsl.xml @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <project name="Run stylesheet" default="all" basedir="."> <property name="file.in" value="content.xml"/> <property name="file.out" value="out_${file.in}"/> diff --git a/scripts/xsl/upVersionParents.sh b/scripts/xsl/upVersionParents.sh index 7e3411cf0..d2056d46f 100755 --- a/scripts/xsl/upVersionParents.sh +++ b/scripts/xsl/upVersionParents.sh @@ -17,17 +17,17 @@ export PATH=$JAVA_HOME/bin:$MAVEN_PATH:$PATH DIR=$( dirname $0 ) NEW_VER=4.4.0-SNAPSHOT if [ $# -eq 1 ]; then - NEW_VER="$1" + NEW_VER="$1" fi find * -name pom.xml -print0 | xargs -0 grep packaging.pom..packaging | cut -f1 -d: | sort -u >/tmp/t1_$$.txt find * -name pom.xml -print0 | xargs -0 grep packaging.eclipse-repository..packaging | cut -f1 -d: | sort -u >>/tmp/t1_$$.txt for POM in $( cat /tmp/t1_$$.txt ); do - # this doesn't update everything like I hoped - # and fails for a small number of bundles. - # it doesn't deal well with the children of the parent poms - mvn -Pbuild-individual-bundles \ + # this doesn't update everything like I hoped + # and fails for a small number of bundles. + # it doesn't deal well with the children of the parent poms + mvn -Pbuild-individual-bundles \ versions:set \ -DnewVersion=$NEW_VER \ -DgenerateBackupPoms=false \ diff --git a/scripts/xsl/xgroupId.sh b/scripts/xsl/xgroupId.sh index db0bf7f86..9b4ac56a2 100755 --- a/scripts/xsl/xgroupId.sh +++ b/scripts/xsl/xgroupId.sh @@ -3,29 +3,29 @@ ECLIPSE=/opt/local/e4-self/R421/eclipse/eclipse if [ $# -gt 0 ]; then - ECLIPSE="$1" ; shift + ECLIPSE="$1" ; shift fi find * -name pom.xml -print0 | xargs -0 grep eclipse-plugin | cut -f1 -d: | sort -u >/tmp/t1_$$.txt for POM in $( cat /tmp/t1_$$.txt ); do -xsltproc -o "${POM}.out" fix-pom.xsl "${POM}" -mv "${POM}.out" "${POM}" + xsltproc -o "${POM}.out" fix-pom.xsl "${POM}" + mv "${POM}.out" "${POM}" done find * -name pom.xml -print0 | xargs -0 grep eclipse-feature | cut -f1 -d: | sort -u >/tmp/t1_$$.txt for POM in $( cat /tmp/t1_$$.txt ); do -xsltproc -o "${POM}.out" fix-feature-pom.xsl "${POM}" -mv "${POM}.out" "${POM}" + xsltproc -o "${POM}.out" fix-feature-pom.xsl "${POM}" + mv "${POM}.out" "${POM}" done find * -name pom.xml -print0 | xargs -0 grep eclipse-test-plugin | cut -f1 -d: | sort -u >/tmp/t1_$$.txt for POM in $( cat /tmp/t1_$$.txt ); do -xsltproc -o "${POM}.out" fix-pom.xsl "${POM}" -mv "${POM}.out" "${POM}" + xsltproc -o "${POM}.out" fix-pom.xsl "${POM}" + mv "${POM}.out" "${POM}" done diff --git a/scripts/xsl/xparentVersions.sh b/scripts/xsl/xparentVersions.sh index 5a0d3adc8..0bbcf6bc2 100755 --- a/scripts/xsl/xparentVersions.sh +++ b/scripts/xsl/xparentVersions.sh @@ -4,14 +4,14 @@ DIR=$( dirname $0 ) NEW_VER=0.14.0-SNAPSHOT if [ $# -eq 1 ]; then - NEW_VER="$1" + NEW_VER="$1" fi find * -name pom.xml -print0 | xargs -0 grep "^<project>" | cut -f1 -d: | sort -u >/tmp/t1_$$.txt for POM in $( cat /tmp/t1_$$.txt ); do -sed 's!<project>!<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">!g' ${POM} >/tmp/out_$$.txt -mv /tmp/out_$$.txt ${POM} + sed 's!<project>!<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">!g' ${POM} >/tmp/out_$$.txt + mv /tmp/out_$$.txt ${POM} done @@ -19,15 +19,15 @@ find * -name pom.xml -print0 | xargs -0 grep packaging.pom..packaging | cut -f1 find * -name pom.xml -print0 | xargs -0 grep packaging.eclipse-repository..packaging | cut -f1 -d: | sort -u >>/tmp/t1_$$.txt for POM in $( cat /tmp/t1_$$.txt ); do -xsltproc --stringparam new-version "$NEW_VER" -o "${POM}.out" $DIR/fix-pom-version.xsl "${POM}" -mv "${POM}.out" "${POM}" + xsltproc --stringparam new-version "$NEW_VER" -o "${POM}.out" $DIR/fix-pom-version.xsl "${POM}" + mv "${POM}.out" "${POM}" done find * -name pom.xml | sort -u >/tmp/t1_$$.txt for POM in $( cat /tmp/t1_$$.txt ); do -xsltproc --stringparam new-version "$NEW_VER" -o "${POM}.out" $DIR/fix-pom-parent-version.xsl "${POM}" -mv "${POM}.out" "${POM}" + xsltproc --stringparam new-version "$NEW_VER" -o "${POM}.out" $DIR/fix-pom-parent-version.xsl "${POM}" + mv "${POM}.out" "${POM}" done find * -name pom.xml -print0 | xargs -0 grep packaging.eclipse-plugin | cut -f1 -d: | sort -u >/tmp/t1_$$.txt @@ -36,10 +36,10 @@ find * -name pom.xml -print0 | xargs -0 grep packaging.eclipse-test-plugin | cut for POM in $( cat /tmp/t1_$$.txt ); do -POM_DIR=$( dirname $POM ) -cat >${POM_DIR}/forceQualifierUpdate.txt <<EOF -# To force a version qualifier update add the bug here -Bug 403352 - Update all parent versions to match our build stream + POM_DIR=$( dirname $POM ) + cat >${POM_DIR}/forceQualifierUpdate.txt <<EOF + # To force a version qualifier update add the bug here + Bug 403352 - Update all parent versions to match our build stream EOF done diff --git a/scripts/xsl/xslUpVersion.sh b/scripts/xsl/xslUpVersion.sh index 38dee9044..ad1a0552a 100755 --- a/scripts/xsl/xslUpVersion.sh +++ b/scripts/xsl/xslUpVersion.sh @@ -4,7 +4,7 @@ DIR=$( dirname $0 ) NEW_VER=4.4.0-SNAPSHOT if [ $# -eq 1 ]; then - NEW_VER="$1" + NEW_VER="$1" fi find * -name pom.xml -print0 >/tmp/files.txt @@ -13,14 +13,14 @@ cat /tmp/files.txt | xargs -0 grep packaging.pom..packaging | cut -f1 -d: | sort cat /tmp/files.txt | xargs -0 grep packaging.eclipse-repository..packaging | cut -f1 -d: | sort -u >>/tmp/t1_$$.txt for POM in $( cat /tmp/t1_$$.txt ); do -xsltproc --stringparam new-version "$NEW_VER" -o "${POM}.out" $DIR/fix-pom-version.xsl "${POM}" -mv "${POM}.out" "${POM}" + xsltproc --stringparam new-version "$NEW_VER" -o "${POM}.out" $DIR/fix-pom-version.xsl "${POM}" + mv "${POM}.out" "${POM}" done find * -name pom.xml | sort -u >/tmp/t1_$$.txt for POM in $( cat /tmp/t1_$$.txt ); do -xsltproc --stringparam new-version "$NEW_VER" -o "${POM}.out" $DIR/fix-pom-parent-version.xsl "${POM}" -mv "${POM}.out" "${POM}" + xsltproc --stringparam new-version "$NEW_VER" -o "${POM}.out" $DIR/fix-pom-parent-version.xsl "${POM}" + mv "${POM}.out" "${POM}" done |