Skip to content

Commit

Permalink
verifyTargt.sh should be able to deduce the version of target platfor…
Browse files Browse the repository at this point in the history
…m utils to use from the root pom, rather than hard-coding it
  • Loading branch information
nickboldt committed Feb 17, 2015
1 parent d60e227 commit eda7b7a
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion util/verifyTarget.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ fi
# defaults
MVN="mvn"
includeSources="-Dmirror-target-to-repo.includeSources=true" # by default, include sources
targetplatformutilsversion=0.21.0
INSTALLSCRIPT=/tmp/installFromTarget.sh
LOG_GREP_INCLUDES="BUILD FAILURE|Only one of the following|Missing requirement|Unresolved requirement|IllegalArgumentException|Could not resolve|could not be found|being installed|Cannot satisfy dependency|FAILED"
LOG_GREP_EXCLUDES="Failed to execute goal org.jboss.tools.tycho-plugins:target-platform-utils|Checksum validation failed, no checksums available from the repository"
Expand All @@ -88,6 +87,7 @@ while [[ "$#" -gt 0 ]]; do
'-p') PROJECTS="$PROJECTS $2"; shift 1;;
'-m') MVN="$2"; shift 1;;
'-x') includeSources=""; shift 0;;
'-V') targetplatformutilsversion="$2"; shift 1;;
*) others="$others,$1"; shift 0;;
esac
shift 1
Expand All @@ -107,6 +107,11 @@ fi
PROJECTS=${PROJECTS//,/ }
NOW=`date +%F_%H-%M`

if [[ ! $targetplatformutilsversion ]]; then
# eg., 0.22.1-SNAPSHOT
targetplatformutilsversion=`cat ${BASEDIR}/pom.xml | grep util -B2 -A2 | grep version | sed -e "s#.\+<version>\(.\+\)</version>.*#\1#"`
fi

for PROJECT in $PROJECTS; do echo "Process $PROJECT ..."

if [[ -d ${BASEDIR}/${PROJECT}target ]]; then
Expand Down

0 comments on commit eda7b7a

Please sign in to comment.