Skip to content

Commit 33d9f74

Browse files
author
Mark McCaskey
committed
Fix up packaging of wapm on Windows
1 parent 86574c6 commit 33d9f74

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
- [#1985](https://github.com/wasmerio/wasmer/pull/1985) Bump minimum supported Rust version to 1.48
1515

1616
### Fixed
17+
- [#2007](https://github.com/wasmerio/wasmer/pull/2007) Fix packaging of wapm on Windows
1718
- [#2005](https://github.com/wasmerio/wasmer/pull/2005) Emscripten is now working again.
1819

1920
## 1.0.0 - 2021-01-05

Makefile

+8-4
Original file line numberDiff line numberDiff line change
@@ -286,12 +286,16 @@ test-integration:
286286
#############
287287

288288
package-wapm:
289-
ifneq ($(OS), Windows_NT)
290289
mkdir -p "package/bin"
290+
ifneq ($(OS), Windows_NT)
291+
if [ -d "wapm-cli" ]; then \
292+
cp wapm-cli/target/release/wapm package/bin/ ;\
293+
echo "#!/bin/bash\nwapm execute \"\$$@\"" > package/bin/wax ;\
294+
chmod +x package/bin/wax ;\
295+
fi
296+
else
291297
if [ -d "wapm-cli" ]; then \
292-
cp wapm-cli/target/release/wapm package/bin/; \
293-
echo "#!/bin/bash\nwapm execute \"\$$@\"" > package/bin/wax; \
294-
chmod +x package/bin/wax; \
298+
cp wapm-cli/target/release/wapm package/bin/ ;\
295299
fi
296300
endif
297301

0 commit comments

Comments
 (0)