luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into buildTarget/cleanCache

This commit is contained in:
Igal Tabachnik 2021-09-06 11:40:06 +03:00 committed by GitHub
parent 20fcab4651 384d80b208
commit 8fe769c41d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/java/sbt/internal/XMainConfiguration.java
View File

@ -22,7 +22,8 @@ import xsbti.*;
* we can avoid loading any classes from the old scala provider.
*/
public class XMainConfiguration {
public xsbti.MainResult run(String moduleName, xsbti.AppConfiguration configuration) {
public xsbti.MainResult run(String moduleName, xsbti.AppConfiguration configuration)
throws Throwable {
try {
ClassLoader topLoader = configuration.provider().scalaProvider().launcher().topLoader();
xsbti.AppConfiguration updatedConfiguration = null;
@ -56,7 +57,7 @@ public class XMainConfiguration {
return (xsbti.MainResult) runMethod.invoke(instance, updatedConfiguration);
} catch (InvocationTargetException e) {
// This propogates xsbti.FullReload to the launcher
throw (xsbti.FullReload) e.getCause();
throw e.getCause();
}
} catch (ReflectiveOperationException e) {
throw new RuntimeException(e);

11
sbt
View File

@ -46,11 +46,18 @@ realpathish () {
COUNT=$(($COUNT + 1))
done
TARGET_DIR="$(pwd -P)"
if [ "$TARGET_DIR" == "/" ]; then
TARGET_FILE="/$TARGET_FILE"
else
TARGET_FILE="$TARGET_DIR/$TARGET_FILE"
fi
# make sure we grab the actual windows path, instead of cygwin's path.
if [[ "x$FIX_CYGPATH" != "x" ]]; then
echo "$(cygwinpath "$(pwd -P)/$TARGET_FILE")"
echo "$(cygwinpath "$TARGET_FILE")"
else
echo "$(pwd -P)/$TARGET_FILE"
echo "$TARGET_FILE"
fi
)
}