diff options
author | Paul Phillips <paulp@improving.org> | 2012-09-14 12:10:57 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-09-15 08:01:19 -0700 |
commit | 3262f7072b4060b1058acb6d772eaa61d4dec1d4 (patch) | |
tree | 8a4e0f285145d1f429096ad8dc08b90e846b5c38 /tools/binary-repo-lib.sh | |
parent | 930c85d6c96507d798d1847ea078eebf93dc0acb (diff) | |
parent | 83c1b1062957e50e5336c1b3409e54e0a5cce275 (diff) | |
download | scala-3262f7072b4060b1058acb6d772eaa61d4dec1d4.tar.gz scala-3262f7072b4060b1058acb6d772eaa61d4dec1d4.tar.bz2 scala-3262f7072b4060b1058acb6d772eaa61d4dec1d4.zip |
Merge remote-tracking branch 'origin/2.10.x' into merge-210
* origin/2.10.x: (68 commits)
Eliminate breaking relative names in source.
"Hot fix" for broken build.
Fix SI-4813 - Clone doesn't work on LinkedList.
Made 'def clone()' consistent with parens everywhere.
accommodates pull request feedback
SI-6310 redeploys the starr
SI-6310 AbsTypeTag => WeakTypeTag
SI-6323 outlaws free types from TypeTag
SI-6323 prohibits reflection against free types
improvements for reification of free symbols
removes build.newFreeExistential
SI-6359 Deep prohibition of templates in value class
Fixes SI-6259. Unable to use typeOf in super call of top-level object.
Fixes binary repo push for new typesafe repo layouts.
Better error message for pattern arity errors.
Rescued TreeBuilder from the parser.
Pending test for SI-3943
Test case for a bug fixed in M7.
Fix for SI-6367, exponential time in inference.
SI-6306 Remove incorrect eta-expansion optimization in Uncurry
...
Conflicts:
src/compiler/scala/tools/nsc/transform/AddInterfaces.scala
src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
Diffstat (limited to 'tools/binary-repo-lib.sh')
-rwxr-xr-x | tools/binary-repo-lib.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tools/binary-repo-lib.sh b/tools/binary-repo-lib.sh index e9c758d181..7bc280b745 100755 --- a/tools/binary-repo-lib.sh +++ b/tools/binary-repo-lib.sh @@ -3,7 +3,8 @@ # Library to push and pull binary artifacts from a remote repository using CURL. -remote_urlbase="http://typesafe.artifactoryonline.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" +remote_urlget="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" +remote_urlpush="http://typesafe.artifactoryonline.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" libraryJar="$(pwd)/lib/scala-library.jar" desired_ext=".desired.sha1" push_jar="$(pwd)/tools/push.jar" @@ -35,8 +36,8 @@ curlUpload() { local data=$2 local user=$3 local password=$4 - local url="${remote_urlbase}/${remote_location}" - java -jar $push_jar "$data" "$remote_location" "$user" "$password" + local url="${remote_urlpush}/${remote_location}" + java -jar $push_jar "$data" "$url" "$user" "$password" if (( $? != 0 )); then echo "Error uploading $data to $url" echo "$url" @@ -77,7 +78,7 @@ pushJarFile() { pushd $jar_dir >/dev/null local version=$(makeJarSha $jar_name) local remote_uri=${version}${jar#$basedir} - echo " Pushing to ${remote_urlbase}/${remote_uri} ..." + echo " Pushing to ${remote_urlpush}/${remote_uri} ..." echo " $curl" curlUpload $remote_uri $jar_name $user $pw echo " Making new sha1 file ...." @@ -136,7 +137,7 @@ pushJarFiles() { local user=$2 local password=$3 # TODO - ignore target/ and build/ - local jarFiles="$(find ${basedir}/lib -name "*.jar") $(find ${basedir}/test/files -name "*.jar")" + local jarFiles="$(find ${basedir}/lib -name "*.jar") $(find ${basedir}/test/files -name "*.jar") $(find ${basedir}/tools -name "*.jar")" local changed="no" for jar in $jarFiles; do local valid=$(isJarFileValid $jar) @@ -188,7 +189,9 @@ pullJarFileToCache() { rm -f "$cache_loc" fi if [[ ! -f "$cache_loc" ]]; then - curlDownload $cache_loc ${remote_urlbase}/${uri} + # Note: After we follow up with JFrog, we should check the more stable raw file server first + # before hitting the more flaky artifactory. + curlDownload $cache_loc ${remote_urlpush}/${uri} if test "$(checkJarSha "$cache_loc" "$sha")" != "OK"; then echo "Trouble downloading $uri. Please try pull-binary-libs again when your internet connection is stable." exit 2 |