Skip to content

Commit e44dd59

Browse files
committed
Introduce libexec folder in the distribution
1 parent d490d13 commit e44dd59

18 files changed

+38
-39
lines changed

dist/bin-native-overrides/cli-common-platform

Lines changed: 0 additions & 3 deletions
This file was deleted.

dist/bin-native-overrides/cli-common-platform.bat

Lines changed: 0 additions & 3 deletions
This file was deleted.

dist/bin/scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ if [ -z "${PROG_HOME-}" ] ; then
2626
cd "$saveddir"
2727
fi
2828

29-
source "$PROG_HOME/bin/common-shared"
30-
source "$PROG_HOME/bin/cli-common-platform"
29+
source "$PROG_HOME/libexec/common-shared"
30+
source "$PROG_HOME/libexec/cli-common-platform"
3131

3232
SCALA_VERSION=""
3333
# iterate through lines in VERSION_SRC

dist/bin/scala.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ for %%f in ("%~dp0.") do (
1111
@rem get rid of the trailing slash
1212
set "_PROG_HOME=!_PROG_HOME:~0,-1!"
1313
)
14-
call "%_PROG_HOME%\bin\common.bat"
14+
call "%_PROG_HOME%\libexec\common.bat"
1515
if not %_EXITCODE%==0 goto end
1616

1717
@rem #########################################################################
1818
@rem ## Main
1919

2020
call :setScalaOpts
2121

22-
call "%_PROG_HOME%\bin\cli-common-platform.bat"
22+
call "%_PROG_HOME%\libexec\cli-common-platform.bat"
2323

2424
@rem SCALA_CLI_CMD_WIN is an array, set in cli-common-platform.bat.
2525
@rem WE NEED TO PASS '--skip-cli-updates' for JVM launchers but we actually don't need it for native launchers

dist/bin/scala_legacy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if [ -z "${PROG_HOME-}" ] ; then
2626
cd "$saveddir"
2727
fi
2828

29-
source "$PROG_HOME/bin/common"
29+
source "$PROG_HOME/libexec/common"
3030

3131
while [[ $# -gt 0 ]]; do
3232
case "$1" in

dist/bin/scalac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if [ -z "${PROG_HOME-}" ] ; then
2626
cd "$saveddir"
2727
fi
2828

29-
source "$PROG_HOME/bin/common"
29+
source "$PROG_HOME/libexec/common"
3030

3131
[ -z "$PROG_NAME" ] && PROG_NAME=$CompilerMain
3232

dist/bin/scalac.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ for %%f in ("%~dp0.") do (
1111
@rem get rid of the trailing slash
1212
set "_PROG_HOME=!_PROG_HOME:~0,-1!"
1313
)
14-
call "%_PROG_HOME%\bin\common.bat"
14+
call "%_PROG_HOME%\libexec\common.bat"
1515
if not %_EXITCODE%==0 goto end
1616

1717
call :args %*

dist/bin/scaladoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if [ -z "${PROG_HOME-}" ] ; then
2828
cd "$saveddir"
2929
fi
3030

31-
source "$PROG_HOME/bin/common"
31+
source "$PROG_HOME/libexec/common"
3232
default_java_opts="-Xmx768m -Xms768m"
3333
withCompiler=true
3434

dist/bin/scaladoc.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ for %%f in ("%~dp0.") do (
1111
@rem get rid of the trailing slash
1212
set "_PROG_HOME=!_PROG_HOME:~0,-1!"
1313
)
14-
call "%_PROG_HOME%\bin\common.bat"
14+
call "%_PROG_HOME%\libexec\common.bat"
1515
if not %_EXITCODE%==0 goto end
1616

1717
set _DEFAULT_JAVA_OPTS=-Xmx768m -Xms768m
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env bash
2+
3+
SCALA_CLI_CMD_BASH=("\"$PROG_HOME/libexec/scala-cli\"")

0 commit comments

Comments
 (0)