Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix wasm2c on windows (via MSVC) #909

Closed
wants to merge 5 commits into from
Closed

Fix wasm2c on windows (via MSVC) #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d09896
Fix wasm2c on Windows
binji Sep 9, 2018
84e5cdf
Fix some more issues
binji Sep 10, 2018
689bf49
Some more cleanup
binji Sep 10, 2018
dcfa814
Set up build environment in appveyor
binji Sep 10, 2018
6632167
Some additional fixes for wasm2c
binji Oct 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,31 @@ environment:
matrix:
- GENERATOR: MSYS Makefiles
CONFIG: Release
TARGET: x86
JOBS_FLAG: -j
MSVC_FLAG:
EXE_DIR: .
DEPLOY: false
- GENERATOR: Visual Studio 14 2015
CONFIG: Release
TARGET: x86
JOBS_FLAG: "/m:"
MSVC_FLAG: --msvc
EXE_DIR: '%CONFIG%'
DEPLOY: true
DEPLOY_NAME: wabt-%APPVEYOR_REPO_TAG_NAME%-win32.zip
- GENERATOR: Visual Studio 14 2015 Win64
CONFIG: Debug
TARGET: x86_amd64
JOBS_FLAG: "/m:"
MSVC_FLAG: --msvc
EXE_DIR: '%CONFIG%'
DEPLOY: false
- GENERATOR: Visual Studio 14 2015 Win64
CONFIG: Release
TARGET: x86_amd64
JOBS_FLAG: "/m:"
MSVC_FLAG: --msvc
EXE_DIR: '%CONFIG%'
DEPLOY: true
DEPLOY_NAME: wabt-%APPVEYOR_REPO_TAG_NAME%-win64.zip
Expand All @@ -41,7 +49,7 @@ build_script:
- cmake --build . --config %CONFIG% --target install -- %JOBS_FLAG%%JOBS%

test_script:
- python test\run-tests.py -v --bindir %APPVEYOR_BUILD_FOLDER%\bin
- call scripts\appveyor-test-script.bat

# Must happen before artifacts step.
after_test:
Expand Down
29 changes: 29 additions & 0 deletions scripts/appveyor-test-script.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
REM Copyright 2018 WebAssembly Community Group participants
REM
REM Licensed under the Apache License, Version 2.0 (the "License");
REM you may not use this file except in compliance with the License.
REM You may obtain a copy of the License at
REM
REM http://www.apache.org/licenses/LICENSE-2.0
REM
REM Unless required by applicable law or agreed to in writing, software
REM distributed under the License is distributed on an "AS IS" BASIS,
REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
REM See the License for the specific language governing permissions and
REM limitations under the License.

REM Run unittests
%APPVEYOR_BUILD_FOLDER%\bin\wabt-unittests

REM Set up environment so cl.exe is in the path.
REM See docs here: https://www.appveyor.com/docs/lang/cpp/#visual-studio-2015

IF "%TARGET%" == "x86" (
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
) ELSE (
call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
)

REM Run tests
python test\run-tests.py -v --bindir %APPVEYOR_BUILD_FOLDER%\bin %MSVC_FLAG%
Loading