Skip to content

Commit d095ee8

Browse files
authored
Revert "Declare non-windows executable with .sh extension (#1407)" (#1446)
This reverts commit 71d7135.
1 parent 151dd8d commit d095ee8

File tree

9 files changed

+9
-37
lines changed

9 files changed

+9
-37
lines changed

docs/scala_repl.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ Instead, use `bazel build` to build the script, then run that script as normal t
2121
An example in this repo:
2222
```
2323
bazel build test:HelloLibRepl
24-
bazel-bin/test/HelloLibRepl.sh
24+
bazel-bin/test/HelloLibRepl
2525
```

scala/private/phases/phase_declare_executable.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ def phase_declare_executable(ctx, p):
1515
)
1616
else:
1717
return struct(
18-
executable = ctx.actions.declare_file("%s.sh" % ctx.label.name),
18+
executable = ctx.actions.declare_file(ctx.label.name),
1919
)

test/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,6 @@ scala_specs2_junit_test(
472472
"//test/src/main/scala/scalarules/test/large_classpath:largeClasspath",
473473
"//test:test_scala_proto_server",
474474
"//test:scala_binary_jdk_11",
475-
"//test/artifact_prefix_conflict_example/example:example",
476475
]]
477476

478477
# Make sure scala_binary respects runtime_jdk on bazel run

test/artifact_prefix_conflict_example/example/ArtifactPrefixConflictExample.scala

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

test/artifact_prefix_conflict_example/example/BUILD

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

test/artifact_prefix_conflict_example/example/example/BUILD

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

test/artifact_prefix_conflict_example/example/example/Somefile.scala

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

test/rootpaths_binary.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
set -eou pipefail
44

55
content="$(cat $1)"
6-
expected=$'test/ScalaBinary.jar\ntest/ScalaBinary.sh'
6+
expected=$'test/ScalaBinary\ntest/ScalaBinary.jar'
77
if [ "$content" != "$expected" ]; then
88
echo "Unexpected rootpaths: $content"
9-
echo "Expected rootpaths: $expected"
9+
echo "$expected"
1010
exit 1
1111
fi

test/shell/test_misc.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ test_transitive_deps() {
5151

5252
test_repl() {
5353
bazel build $(bazel query 'kind(scala_repl, //test/...)')
54-
echo "import scalarules.test._; HelloLib.printMessage(\"foo\")" | bazel-bin/test/HelloLibRepl.sh -Xnojline | grep "foo java" &&
55-
echo "import scalarules.test._; TestUtil.foo" | bazel-bin/test/HelloLibTestRepl.sh -Xnojline | grep "bar" &&
56-
echo "import scalarules.test._; ScalaLibBinary.main(Array())" | bazel-bin/test/ScalaLibBinaryRepl.sh -Xnojline | grep "A hui hou" &&
57-
echo "import scalarules.test._; ResourcesStripScalaBinary.main(Array())" | bazel-bin/test/ResourcesStripScalaBinaryRepl.sh -Xnojline | grep "More Hello"
58-
echo "import scalarules.test._; A.main(Array())" | bazel-bin/test/ReplWithSources.sh -Xnojline | grep "4 8 15"
54+
echo "import scalarules.test._; HelloLib.printMessage(\"foo\")" | bazel-bin/test/HelloLibRepl -Xnojline | grep "foo java" &&
55+
echo "import scalarules.test._; TestUtil.foo" | bazel-bin/test/HelloLibTestRepl -Xnojline | grep "bar" &&
56+
echo "import scalarules.test._; ScalaLibBinary.main(Array())" | bazel-bin/test/ScalaLibBinaryRepl -Xnojline | grep "A hui hou" &&
57+
echo "import scalarules.test._; ResourcesStripScalaBinary.main(Array())" | bazel-bin/test/ResourcesStripScalaBinaryRepl -Xnojline | grep "More Hello"
58+
echo "import scalarules.test._; A.main(Array())" | bazel-bin/test/ReplWithSources -Xnojline | grep "4 8 15"
5959
}
6060

6161
test_benchmark_jmh() {

0 commit comments

Comments
 (0)