From 97722ca59436b058c2f6be035f87ccd5977fc0b7 Mon Sep 17 00:00:00 2001 From: Grzegorz Kossakowski Date: Wed, 6 Aug 2014 19:46:51 +0200 Subject: [PATCH] Use Scala 2.10 specific config file for building IDE We need separate config file because IDE master dropped support for Scala 2.10. See scala-ide/uber-build#57. --- job/pr-scala-integrate-ide | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/job/pr-scala-integrate-ide b/job/pr-scala-integrate-ide index 39220ba..6e10c65 100755 --- a/job/pr-scala-integrate-ide +++ b/job/pr-scala-integrate-ide @@ -30,11 +30,16 @@ else git clone $UBERBUILD_URL fi +if [ "$version_minor" = "10" ] + then echo "Using Scala 2.10-specific config file."; CONFIG_FILE_NAME="validator-2.10.conf" + else echo "Using default config file."; CONFIG_FILE_NAME="validator.conf" +fi + # pass prRepoUrl in, which uber-build passes along to dbuild (in sbt-builds-for-ide) # the "-P pr-scala" maven arg accomplishes the same thing for maven (directly used in uber-build) prRepoUrl="$prRepoUrl"\ MAVEN_ARGS="-P pr-scala"\ - $UBERBUILD_DIR/uber-build.sh $UBERBUILD_DIR/config/validator.conf $sha $maven_version_number + $UBERBUILD_DIR/uber-build.sh $UBERBUILD_DIR/config/$CONFIG_FILE_NAME $sha $maven_version_number # uber-build puts its local repo under target/m2repo # wipe the org/scala-lang part, which otherwise just keeps