Integration build supports modularized scala. #23

adriaanm · 2013-08-28T01:39:12Z

After this is merged, scala/scala#2855 should validate for IDE integration.
I also cleaned up the build script a bit.
The main change is:

+      "set (libraryDependencies in cacheSub         ) ~= { ld => ld map { case dep if (dep.organization == \"org.scala-lang.modules\") => dep cross CrossVersion.fullMapped(_ => \"$SCALA_BINARY_VERSION\") case dep => dep } }"\
+      "set (libraryDependencies in compilePersistSub) ~= { ld => ld map { case dep if (dep.organization == \"org.scala-tools.sbinary\") && (dep.name == \"sbinary\") => dep.copy(revision = (dep.revision + \"-SNAPSHOT\")) case dep if (dep.organization == \"org.scala-lang.modules\") => dep cross CrossVersion.fullMapped(_ => \"$SCALA_BINARY_VERSION\") case dep => dep } }"\
+      "set (libraryDependencies in mainSub          ) ~= { ld => ld map { case dep if (dep.organization == \"org.scala-lang.modules\") => dep cross CrossVersion.fullMapped(_ => \"$SCALA_BINARY_VERSION\") case dep => dep } }"\
+      "set (libraryDependencies in processSub       ) ~= { ld => ld map { case dep if (dep.organization == \"org.scala-lang.modules\") => dep cross CrossVersion.fullMapped(_ => \"$SCALA_BINARY_VERSION\") case dep => dep } }"\

I tested these changes manually against scala/scala#2855 (master) and scala/scala#2876 (2.10.x).
Log files here: https://gist.github.com/adriaanm/6361216
(the result against #2855 was using a slightly older commit, but very little has changed since in the PR)

review by @dragos

Show scala-instance after all relevant settings are set

Overall, the integration script should do less detecting and more setting. Let's refactor all the builds involved so that this script becomes much, much, much simpler. How about introducing variables in the builds wherever necessary, instead of these elaborate sequences of sbt commands, and maverick search/replace missions.

dragos · 2013-08-28T11:56:59Z

pr-scala-common

@@ -14,7 +14,7 @@ BASEDIR="$(pwd)"
 # keep them local to the workspace also lets us diagnose problems more easily
 # Make sure this is an absolute path with preceding '/'
 LOCAL_M2_REPO="$BASEDIR/m2repo"
-GENMVNOPTS="-e -B -X -Dmaven.repo.local=${LOCAL_M2_REPO}"
+GENMVNOPTS="-e -B -Dmaven.repo.local=${LOCAL_M2_REPO}"


I agree it's a lot of noise, but I wonder if we'll be able to track down issues like the one in scalariform otherwise..

The reality is that, when it fails on jenkins, you'll have to reproduce it locally to diagnose anyway. The scripts are designed so that you can run them locally without problems. It'd be trivial to write a script to download a build's workspace and re-run the script to see what happened. I agree we might need the switch to diagnose problems with the jenkins setup, but we can always turn it on when necessary.
In the mean time, i'd say shorter logs are better because you can better spot problems that the script misses erroneously.

In theory yes, but in practice, at least in the past two weeks, most failures were not reproducible. For instance, concurrent builds, and more recently scalastyle (due to network errors). I don't feel strongly about it though, and my first reaction was to remove -X as well, but I was happy to find that info in my last "debugging" sessions.

This comes up when running the build locally. Better not to depend on jenkins variables, anyway.

This file captures the scala binary version being used to (e.g.) resolve dependencies. We read it to do selective rewiring.

adriaanm · 2013-08-29T16:28:16Z

@dragos, I dropped the "quiet the maven commit". Could I get an LGTM now?

dragos · 2013-08-29T19:29:43Z

LGTM. As I said, I don't feel strongly about -X, you can remove it if you prefer.

adriaanm · 2013-08-30T17:10:50Z

Once #24 is merged (Monday?), I'll rebase this (on Tuesday), in time for M5 closure on Thursday.

adriaanm · 2013-09-04T19:15:14Z

I'll need to port these changes to https://github.com/typesafehub/sbt-builds-for-ide/blob/master/sbt-on-2.11.x

adriaanm added 2 commits August 27, 2013 17:38

crossScalaVersions has no effect -- not setting

ab4894f

Show scala-instance after all relevant settings are set

dragos reviewed Aug 28, 2013
View reviewed changes

adriaanm mentioned this pull request Aug 28, 2013

Modularize: xml & parser-combinators scala/scala#2855

Merged

adriaanm added 4 commits August 29, 2013 09:27

Make sure the ide build has enough memory

5e61fb7

This comes up when running the build locally. Better not to depend on jenkins variables, anyway.

Repo HEADs to integrate depend on Scala version

575ba99

Copy versions.properties to scala/ when it exists

0e08673

This file captures the scala binary version being used to (e.g.) resolve dependencies. We read it to do selective rewiring.

Rewire module dependencies using SCALA_BINARY_VERSION (if set)

2286ede

adriaanm mentioned this pull request Aug 29, 2013

Use Scala modules for 2.11 typesafehub/sbt-builds-for-ide#3

Closed

adriaanm closed this Sep 4, 2013

adriaanm referenced this pull request in adriaanm/sbt-builds-for-ide Sep 5, 2013

Overriding cross versioning for modules

294ef28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Integration build supports modularized scala. #23

Integration build supports modularized scala. #23

adriaanm commented Aug 28, 2013

dragos Aug 28, 2013

adriaanm Aug 28, 2013

dragos Aug 29, 2013

adriaanm commented Aug 29, 2013

dragos commented Aug 29, 2013

adriaanm commented Aug 30, 2013

adriaanm commented Sep 4, 2013

Integration build supports modularized scala. #23

Integration build supports modularized scala. #23

Conversation

adriaanm commented Aug 28, 2013

dragos Aug 28, 2013

Choose a reason for hiding this comment

adriaanm Aug 28, 2013

Choose a reason for hiding this comment

dragos Aug 29, 2013

Choose a reason for hiding this comment

adriaanm commented Aug 29, 2013

dragos commented Aug 29, 2013

adriaanm commented Aug 30, 2013

adriaanm commented Sep 4, 2013