diff options
| -rwxr-xr-x | build.xml | 2 | ||||
| -rwxr-xr-x | tools/binary-repo-lib.sh | 5 |
2 files changed, 5 insertions, 2 deletions
@@ -1386,6 +1386,7 @@ TODO: <echo message="Test pass 1 of 2 using Apache Felix ${osgi.felix.version}"/> <junit fork="yes" haltonfailure="yes"> <classpath refid="test.osgi.compiler.build.path.felix"/> + <jvmarg value="-Duser.home=${user.home}"/> <batchtest fork="yes" todir="${build-osgi.dir}"> <fileset dir="${test.osgi.classes}"> <include name="**/*Test.class"/> @@ -1397,6 +1398,7 @@ TODO: <echo message="Test pass 2 of 2 using Eclipse Equinox ${osgi.equinox.version}"/> <junit fork="yes" haltonfailure="yes"> <classpath refid="test.osgi.compiler.build.path.equinox"/> + <jvmarg value="-Duser.home=${user.home}"/> <batchtest fork="yes" todir="${build-osgi.dir}"> <fileset dir="${test.osgi.classes}"> <include name="**/*Test.class"/> diff --git a/tools/binary-repo-lib.sh b/tools/binary-repo-lib.sh index 654ba21547..437c0a0c08 100755 --- a/tools/binary-repo-lib.sh +++ b/tools/binary-repo-lib.sh @@ -2,15 +2,16 @@ # # Library to push and pull binary artifacts from a remote repository using CURL. - remote_urlget="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" remote_urlpush="http://private-repo.typesafe.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" + if [[ "$OSTYPE" == *Cygwin* || "$OSTYPE" == *cygwin* ]]; then push_jar="$(cygpath -m "$push_jar")"; fi # Cache dir has .sbt in it to line up with SBT build. -cache_dir="${HOME}/.sbt/cache/scala" +SCALA_BUILD_REPOS_HOME=${SCALA_BUILD_REPOS_HOME:=$HOME} +cache_dir="${SCALA_BUILD_REPOS_HOME}/.sbt/cache/scala" # Checks whether or not curl is installed and issues a warning on failure. checkCurl() { |