Skip to content

Commit

Permalink
Try strawberry.
Browse files Browse the repository at this point in the history
  • Loading branch information
FGasper committed Apr 18, 2022
1 parent 15674f8 commit c6fb22a
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 28 deletions.
48 changes: 24 additions & 24 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,30 +115,30 @@ jobs:
curl -L https://cpanmin.us | perl - --notest Devel::Cover::Report::Coveralls
`perl -MConfig -E'print $Config::Config{"sitebin"}'`/cover -test -report Coveralls -ignore_re easyxs -ignore_re inline
# windows:
# runs-on: windows-latest
#
# steps:
# - uses: actions/checkout@v3
# with:
# submodules: recursive
# - name: Set up Perl
# run: |
# choco install strawberryperl cmake
# #echo "##[add-path]C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin"
# echo 'C:\strawberry\c\bin' >> $GITHUB_PATH
# echo 'C:\strawberry\perl\site\bin' >> $GITHUB_PATH
# echo 'C:\strawberry\perl\bin' >> $GITHUB_PATH
# - name: perl -V
# run: perl -V
# - name: Install Dependencies
# run: curl -L https://cpanmin.us | perl - --notest --installdeps --with-develop --with-configure .
# - name: perl Makefile.PL
# run: perl Makefile.PL
# - name: make
# run: make
# - name: Run Tests
# run: prove -wlvmb t
windows:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Set up Perl
run: |
choco install strawberryperl
#echo "##[add-path]C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin"
echo 'C:\strawberry\c\bin' >> $GITHUB_PATH
echo 'C:\strawberry\perl\site\bin' >> $GITHUB_PATH
echo 'C:\strawberry\perl\bin' >> $GITHUB_PATH
- name: perl -V
run: perl -V
- name: Install Dependencies
run: curl -L https://cpanmin.us | perl - --notest --installdeps --with-develop --with-configure .
- name: perl Makefile.PL
run: perl Makefile.PL
- name: make
run: make
- name: Run Tests
run: prove -wlvmb t

qemu-alpine:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
Revision history for Perl extension Wasm::Wasm3:

0.02
- Add Strawberry Perl compatibility.
- Update to latest wasm3.

0.01 Mon, 11 Apr 2022
- Initial release
16 changes: 13 additions & 3 deletions Makefile.PL
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,23 @@ sub postamble {
Alien::cmake3->exe(),
);

# _GNU_SOURCE is for Cygwin. It still fails to build, but at least
# it’s a bit closer to success this way.
my @cmake_opts = (
-D => 'BUILD_WASI=none',

# _GNU_SOURCE is for Cygwin. It still fails to build,
# but at least it’s a bit closer to success this way.
-D => q/CMAKE_C_FLAGS='-fPIC -D_GNU_SOURCE'/,
);

if ($^O eq 'MSWin32') {
push @cmake_opts, -G => q<'MinGW Makefiles'>,
}

return <<"MAKE_FRAG"
.PHONY:
build-wasm3:
\t$cmake_path -D CMAKE_C_FLAGS='-fPIC -D_GNU_SOURCE' -S wasm3 -B wasm3
\t$cmake_path @cmake_opts -S wasm3 -B wasm3
\t\$(MAKE) -C wasm3
MAKE_FRAG
}
Expand Down
2 changes: 1 addition & 1 deletion wasm3

0 comments on commit c6fb22a

Please sign in to comment.