From 4cc0d6759aa2824043db1abf19b0afd287261ecb Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 8 Nov 2016 18:02:07 -0800 Subject: [PATCH 1/4] Typesafe -> Lightbend --- project/ScalaDist.scala | 2 +- project/Unix.scala | 2 +- scripts/jobs/release/website/archives | 2 +- src/linux/copyright | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/project/ScalaDist.scala b/project/ScalaDist.scala index 4ca54d226..7549a4d0f 100644 --- a/project/ScalaDist.scala +++ b/project/ScalaDist.scala @@ -50,7 +50,7 @@ object ScalaDist { useNativeZip ++ // use native zip to preserve +x permission on scripts Seq( name := "scala", - maintainer := "LAMP/EPFL and Typesafe, Inc. ", + maintainer := "LAMP/EPFL and Lightbend, Inc. ", packageSummary := "Scala Programming Language Distribution", // this will be spliced into the middle of a sentence --> no period (it also determines sort order, so, no "The" in front) packageDescription := "Have the best of both worlds. Construct elegant class hierarchies for maximum code reuse and extensibility, implement their behavior using higher-order functions. Or anything in-between.", crossPaths := false, diff --git a/project/Unix.scala b/project/Unix.scala index 05d6c7777..677c1a516 100644 --- a/project/Unix.scala +++ b/project/Unix.scala @@ -66,7 +66,7 @@ object Unix { // RPM Specific name in Rpm := "scala", - rpmVendor := "typesafe", + rpmVendor := "lightbend", rpmUrl := Some("http://github.com/scala/scala"), rpmLicense := Some("BSD"), rpmGroup := Some("Development/Languages"), diff --git a/scripts/jobs/release/website/archives b/scripts/jobs/release/website/archives index 445d8ba75..7166182e8 100755 --- a/scripts/jobs/release/website/archives +++ b/scripts/jobs/release/website/archives @@ -2,7 +2,7 @@ # need to re-declare it as an array, not sure how to do that directly in jenkins declare -a sshCharaArgs="$sshCharaArgs" -url="http://downloads.typesafe.com/scala/$version" +url="http://downloads.lightbend.com/scala/$version" if [[ "$version" =~ .*-nightly ]] then archivesDir="~linuxsoft/archives/scala/nightly/2.12.x" diff --git a/src/linux/copyright b/src/linux/copyright index 2be8a021b..1d48b9719 100644 --- a/src/linux/copyright +++ b/src/linux/copyright @@ -1,7 +1,7 @@ scala -Copyright: LAMP/EPFL and Typesafe, Inc. +Copyright: LAMP/EPFL and Lightbend, Inc. The home page of scala package is at: http://github.com/scala/scala-dist. From 14a7d67eb7cc86a3571a15d4d62cc70bcb5372b1 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 8 Nov 2016 17:27:36 -0800 Subject: [PATCH 2/4] upgrade to sbt 0.13.13 --- README.md | 16 ++++++++-------- project/Wix.scala | 4 ++-- project/build.properties | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 07f5a5fdc..49b9f5ccc 100644 --- a/README.md +++ b/README.md @@ -5,20 +5,20 @@ into a Scala `$version` distribution (zip, tar.gz, deb, rpm, and msi). To build a distribution, run: - * `universal:package-bin` - Builds the universal zip installer - * `universal-docs:package-bin` - Builds the universal documentation zip - * `debian:package-bin` - Builds the Debian DEB file. *requires dpkg-deb* - * `rpm:package-bin` - Builds the yum RPM file. *requires rpmbuild* - * `windows:package-bin` - Builds the Windows MSI. *requires WiX 3.6* + * `universal:packageBin` - Builds the universal zip installer + * `universal-docs:packageBin` - Builds the universal documentation zip + * `debian:packageBin` - Builds the Debian DEB file. *requires dpkg-deb* + * `rpm:packageBin` - Builds the yum RPM file. *requires rpmbuild* + * `windows:packageBin` - Builds the Windows MSI. *requires WiX 3.6* -Alternatively, the `s3-upload` task's mappings are configured based on the platform +Alternatively, the `s3Upload` task's mappings are configured based on the platform the installer is running on. On Windows, it builds the MSI; on another platform, it'll create and upload the other packages in the above list. (Use `s3Upload::mappings` for a dry-run.) The version of Scala to package is derived from the most recent git tag, or you can specify it using `-Dproject.version`. -This packager only works for Scala 2.11+ releases (starting with M8), +This packager only works for Scala 2.11+ releases, as earlier ones did not publish the `scala-dist` artifact to maven. Due to limited resources, the native packages are quite rudimentary. @@ -44,7 +44,7 @@ The specification also used to be in this repo -- it is now a part of the main r ## Contributing ## Please read the [Scala Pull Request Policy](https://github.com/scala/scala/wiki/Pull-Request-Policy) -and sign the [CLA](http://typesafe.com/contribute/cla/scala). +and sign the [CLA](http://www.lightbend.com/contribute/cla/scala). The branching structure mimics that of [scala/scala](https://github.com/scala/scala): branches for 2.11.x, 2.12.x, etc. diff --git a/project/Wix.scala b/project/Wix.scala index 198cb2922..87f9330be 100644 --- a/project/Wix.scala +++ b/project/Wix.scala @@ -19,9 +19,9 @@ object Wix { // wixProductComments := "Scala Programming language for use in Windows.", wixProductConfig := makeProductConfig((stagingDirectory in Universal).value, (stagingDirectory in UniversalDocs).value), - wixProductConfig <<= (wixProductConfig + wixProductConfig := (wixProductConfig dependsOn (stage in Universal) - dependsOn (stage in UniversalDocs)), + dependsOn (stage in UniversalDocs)).value, packageBin in Windows := { val versioned = target.value / s"${name.value}-${version.value}.msi" diff --git a/project/build.properties b/project/build.properties index 817bc38df..27e88aa11 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.9 +sbt.version=0.13.13 From 581c91c49a3690fb3757732a7b09ccb47d23703b Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 8 Nov 2016 17:28:17 -0800 Subject: [PATCH 3/4] add a Travis build --- .travis.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..0c84cdbbd --- /dev/null +++ b/.travis.yml @@ -0,0 +1,22 @@ +# we need rpmbuild but it's unlikely to be whitelisted, according to +# https://github.com/travis-ci/apt-package-whitelist/pull/1700 +sudo: required +before_install: + - sudo apt-get -qq update + - sudo apt-get install -y rpm + +language: scala +jdk: oraclejdk8 + +# but we can't run windows:packageBin, have to be on Windows for that +script: +- sbt -Dproject.version=2.12.0 universal:packageBin universal-docs:packageBin debian:packageBin rpm:packageBin + +cache: + directories: + - $HOME/.ivy2 + - $HOME/.sbt/boot + - $HOME/.sbt/launchers +before_cache: + - find $HOME/.sbt -name "*.lock" | xargs rm + - find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm From ff563b6ba262dd15ccb223faf54225a993844f5e Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 8 Nov 2016 20:01:30 -0800 Subject: [PATCH 4/4] use the s3Upload task instead maybe this tests a smidgen more --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c84cdbbd..976395da7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,8 @@ before_install: language: scala jdk: oraclejdk8 -# but we can't run windows:packageBin, have to be on Windows for that script: -- sbt -Dproject.version=2.12.0 universal:packageBin universal-docs:packageBin debian:packageBin rpm:packageBin +- sbt -Dproject.version=2.12.0 s3Upload::mappings cache: directories: