From b0fba9059cdf199562a70e4d6e4e92eb8df673b9 Mon Sep 17 00:00:00 2001 From: Mirco Dotta Date: Tue, 10 Sep 2013 16:43:35 +0200 Subject: [PATCH 1/2] Updated script for 4.0.0-b03 release * Added new SBT_IDE_VERSION variable to be able to inject the version of the Zinc artifacts needed to build the IDE. * Both SBT_VERSION and SBT_IDE_VERSION should be non empty when building a release. This is done to avoid we inadvertently use the default value defined in the POMs (which are good for nightlies, but not for releases). --- .gitignore | 2 ++ build-full-ide.sh | 45 +++++++++++++++++++++++++++++------------- nightly_juno.sh.sample | 14 ++++++------- release_juno.sh.sample | 31 ++++++++++++++--------------- 4 files changed, 54 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index c4698fe..2016ce9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ sbt/ build-tools/ typesafe-ide/ worksheet-plugin/ +scala-search/ +next/ diff --git a/build-full-ide.sh b/build-full-ide.sh index 5132380..8aa1809 100755 --- a/build-full-ide.sh +++ b/build-full-ide.sh @@ -31,6 +31,7 @@ : ${SCALA_REFACTORING_GIT_REPO:=} # Git repository to use to build scala-refactoring : ${SCALA_REFACTORING_BRANCH:=} # Scala-refactoring branch/tag to build : ${SBT_VERSION:=} # The version of sbt generated by the branch +: ${SBT_IDE_VERSION:=} # The version of the sbt artifacts published by dbuild : ${REFACTORING_MAVEN_ARGS:=""} # Pass some maven argument to the scala-refactoring build, e.g. -Dmaven.test.skip=true : ${ECLIPSE_PLATFORM:=} # Pass the Eclipse platform (e.g., "indigo", or "juno") @@ -171,6 +172,33 @@ case $SCALA_VERSION in abort "Unknown scala version ${SCALA_VERSION}" esac +############################################################### +# SBT VERSION # +############################################################### + +if [[ -z "$PUBLISH" ]] +then + if [ -n "$SBT_VERSION" ] + then + SBT_MAVEN_OPTIONS="-Dsbt.version=${SBT_VERSION}" + fi + if [ -n "$SBT_IDE_VERSION" ] + then + SBT_MAVEN_OPTIONS="${SBT_MAVEN_OPTIONS} -Dsbt.ide.version=${SBT_IDE_VERSION}" + fi +else + if [[ -z "$SBT_VERSION" ]] + then + abort "SBT_VERSION cannot be empty" + fi + + if [[ -z "$SBT_IDE_VERSION" ]] + then + abort "SBT_IDE_VERSION cannot be empty" + fi + SBT_MAVEN_OPTIONS="-Dsbt.version=${SBT_VERSION} -Dsbt.ide.version=${SBT_IDE_VERSION}" +fi + ############################################################### # ECLIPSE PLATFORM # ############################################################### @@ -290,12 +318,7 @@ function build_toolchain() # build toolchain print_step "Building Toolchain" - if [ -n "$SBT_VERSION" ] - then - EXTRA_OPTIONS="-Dsbt.version=${SBT_VERSION}" - fi - - MAVEN_ARGS="-P ${eclipse_profile} -P ${scala_profile_ide} -P sbt-new -Dmaven.repo.local=${LOCAL_REPO} ${MAVEN_EXTRA_ARGS} ${EXTRA_OPTIONS} clean install" + MAVEN_ARGS="-P ${eclipse_profile} -P ${scala_profile_ide} -P sbt-new -Dmaven.repo.local=${LOCAL_REPO} ${MAVEN_EXTRA_ARGS} ${SBT_MAVEN_OPTIONS} clean install" rm -rf ${SOURCE}/* cd ${SCALAIDE_DIR} @@ -372,12 +395,7 @@ function build_ide() export SET_VERSIONS="true" fi - if [ -n "$SBT_VERSION" ] - then - EXTRA_OPTIONS="-Dsbt.version=${SBT_VERSION}" - fi - - ./build-all.sh -P ${eclipse_profile} -P ${scala_profile_ide} -Psbt-new -Dscala.version=${SCALA_VERSION} -Drepo.scala-ide.root=file://${SOURCE} -Dmaven.repo.local=${LOCAL_REPO} -Dversion.tag=${VERSION_TAG} -Drepo.scala-refactoring=file://${SOURCE}/scala-refactoring-${REPO_SUFFIX} -Drepo.scalariform=file://${SOURCE}/scalariform-${REPO_SUFFIX} ${EXTRA_OPTIONS} clean install + ./build-all.sh -P ${eclipse_profile} -P ${scala_profile_ide} -Psbt-new -Dscala.version=${SCALA_VERSION} -Drepo.scala-ide.root=file://${SOURCE} -Dmaven.repo.local=${LOCAL_REPO} -Dversion.tag=${VERSION_TAG} -Drepo.scala-refactoring=file://${SOURCE}/scala-refactoring-${REPO_SUFFIX} -Drepo.scalariform=file://${SOURCE}/scalariform-${REPO_SUFFIX} ${SBT_MAVEN_OPTIONS} clean install cd ${BASE_DIR} } @@ -690,7 +708,6 @@ fi assert_version_tag_not_empty # These are currently non-overridable defaults -SBINARY_GIT_REPO=git://github.com/scala-ide/sbinary.git TYPESAFE_IDE_GIT_REPO=git://github.com/typesafehub/scala-ide-product.git if [[ ( -z "$SCALARIFORM_GIT_REPO" ) && ( -z "$SCALA_REFACTORING_GIT_REPO" ) ]] @@ -876,4 +893,4 @@ else publish_plugin "releases" $ecosystem_platform ${scalasearch_scala_profile} ${SCALASEARCH_BINARIES} scala-search fi fi -fi +fi \ No newline at end of file diff --git a/nightly_juno.sh.sample b/nightly_juno.sh.sample index 93099f5..6f31bd8 100755 --- a/nightly_juno.sh.sample +++ b/nightly_juno.sh.sample @@ -1,19 +1,17 @@ #!/bin/bash -e -# To produce a nightly (unsigned) build of the Scala IDE with Scala 2.11.0-SNAPSHOT alone, for Eclipse +# To produce a nightly (unsigned) build of the Scala IDE with Scala 2.10.3-SNAPSHOT alone, for Eclipse # 3.8 (Juno), run the following ./build-full-ide.sh ECLIPSE_PLATFORM=juno \ VERSION_TAG=nightly \ SCALA_VERSION=2.10.3-SNAPSHOT \ - SBT_VERSION=0.13.0 \ - SCALARIFORM_GIT_REPO=git@github.com:mdr/scalariform.git \ + SCALARIFORM_GIT_REPO=git://github.com/mdr/scalariform.git \ SCALARIFORM_BRANCH=master \ SCALA_REFACTORING_GIT_REPO=git://github.com/scala-ide/scala-refactoring \ SCALA_REFACTORING_BRANCH=master \ - SCALA_IDE_GIT_REPO=https://github.com/dotta/scala-ide \ - SCALA_IDE_BRANCH=issue/move-to-externally-built-sbt-artifacts \ + SCALA_IDE_BRANCH=master \ + BUILD_PLUGINS=true \ WORKSHEET_BRANCH=master \ - WORKSHEET_VERSION_TAG=nightly \ - TYPESAFE_IDE_VERSION_TAG=4.0.0-juno-nightly \ - BUILD_PLUGINS=true + SCALASEARCH_BRANCH=master \ + TYPESAFE_IDE_VERSION_TAG=4.0.x-nightly diff --git a/release_juno.sh.sample b/release_juno.sh.sample index fee43c9..a521d21 100755 --- a/release_juno.sh.sample +++ b/release_juno.sh.sample @@ -1,31 +1,30 @@ #!/bin/bash -e -# The following command builds a signed Scala IDE 3.0.1-RC1 with Scala 2.10.2 for Eclipse 3.8 (Juno), -# a signed worksheet based on the freshly built Scala IDE, and a Typesafe IDE (v3.0.1-rc01) product based on -# the built Scala IDE and Worksheet. +# The following command builds a signed Scala IDE 4.0.0-b03 with Scala 2.11.0-M5 for Eclipse 3.8 (Juno), +# a signed worksheet based on the freshly built Scala IDE, and a Typesafe IDE (v4.0.0-b03) product based on +# the built Scala IDE and Worksheet and Scala Search. if [[ $# -ne 2 ]]; then echo Usage: ./release_juno.sh.sample \ \ exit 1 fi ./build-full-ide.sh ECLIPSE_PLATFORM=juno \ - VERSION_TAG=v \ - SCALA_VERSION=2.10.2 \ - SBINARY_BRANCH=0.4.1_SI-3.0.0-RC1 \ - SBT_GIT_REPO=git://github.com/sbt/sbt.git \ - SBT_BRANCH=v0.13.0-M2 \ - SBT_VERSION=0.13.0-M2 \ + VERSION_TAG=b03 \ + SCALA_VERSION=2.11.0-M5 \ + SBT_VERSION=0.13.0 \ + SBT_IDE_VERSION=0.13.0-on-2.11.0-M5-for-IDE \ SCALARIFORM_GIT_REPO=git://github.com/scala-ide/scalariform.git \ SCALARIFORM_BRANCH=scala-ide-3.0.1\ SCALA_REFACTORING_GIT_REPO=git://github.com/scala-ide/scala-refactoring \ - SCALA_REFACTORING_BRANCH=0.6.0_SI-3.0.1-RC2_2.10.2 \ - SCALA_IDE_BRANCH=3.0.1-vfinal-juno \ - WORKSHEET_BRANCH=0.2.0 \ - PLAY_BRANCH=0.3.0 \ - SCALASEARCH_BRANCH=0.1.0 \ - TYPESAFE_IDE_VERSION_TAG=3.0.1-vfinal \ + SCALA_REFACTORING_BRANCH=0.6.2-S_4.0.0-b02 \ + SCALA_IDE_BRANCH=4.0.0-b03 \ + WORKSHEET_BRANCH=0.2.1-S_4.0.0-b02 \ + WORKSHEET_VERSION_TAG=b01 \ + SCALASEARCH_BRANCH=0.2.0 \ + SCALASEARCH_VERSION_TAG=v \ + TYPESAFE_IDE_VERSION_TAG=4.0.0-b03 \ SIGN_BUILD=true \ BUILD_PLUGINS=true \ KEYSTORE_GIT_REPO=$1 \ KEYSTORE_PASS=$2 \ - PUBLISH=stable + PUBLISH=dev From 500470ebc4f3c9178920fc0def7ce04c72e4f0a4 Mon Sep 17 00:00:00 2001 From: Mirco Dotta Date: Thu, 12 Sep 2013 11:51:24 +0200 Subject: [PATCH 2/2] removed useless release_indigo.sh.sample --- release_indigo.sh.sample | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100755 release_indigo.sh.sample diff --git a/release_indigo.sh.sample b/release_indigo.sh.sample deleted file mode 100755 index 54e5f30..0000000 --- a/release_indigo.sh.sample +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -e - -# The following command builds a signed Scala IDE 3.0.1-RC1 with Scala 2.10.2 for Eclipse 3.7 (Indigo), -# a signed worksheet based on the freshly built Scala IDE, and a Typesafe IDE (v3.0.1-rc01) product based on -# the built Scala IDE and Worksheet. - -if [[ $# -ne 2 ]]; then - echo Usage: ./release_indigo.sh \ \ - exit 1 -fi - -./build-full-ide.sh ECLIPSE_PLATFORM=indigo \ - VERSION_TAG=v \ - SCALA_VERSION=2.10.2 \ - SBINARY_BRANCH=0.4.1_SI-3.0.0-RC1 \ - SBT_GIT_REPO=git://github.com/sbt/sbt.git \ - SBT_BRANCH=v0.13.0-M2 \ - SBT_VERSION=0.13.0-M2 \ - SCALARIFORM_GIT_REPO=git://github.com/scala-ide/scalariform.git \ - SCALARIFORM_BRANCH=scala-ide-3.0.1 \ - SCALA_REFACTORING_GIT_REPO=git://github.com/scala-ide/scala-refactoring \ - SCALA_REFACTORING_BRANCH=0.6.0_SI-3.0.1-RC2_2.10.2 \ - SCALA_IDE_BRANCH=3.0.1-vfinal \ - WORKSHEET_BRANCH=0.2.0 \ - PLAY_BRANCH=0.3.0 \ - SCALASEARCH_BRANCH=0.1.0 \ - TYPESAFE_IDE_VERSION_TAG=3.0.1-vfinal \ - SIGN_BUILD=true \ - BUILD_PLUGINS=true \ - KEYSTORE_GIT_REPO=$1 \ - KEYSTORE_PASS=$2 \ - PUBLISH=stable