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.

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

Build with docker #13

Merged
merged 3 commits into from
Jan 2, 2020
Merged

Conversation

ThorstenBux
Copy link

@ThorstenBux ThorstenBux commented Jan 2, 2020

This PR add the Docker support for the build system. Based on the discussion in the PR #1 and issues #11 #10 #12
Docker is the recommended tool for building the libs.

  • added informations for building with Docker in the README.md file
  • added -s USE_LIBJPEG flag to the makem.js: by emscripten v1.38.31 you can include libjpeg in the project without adding any libs or headers files.
  • removed the libjpeg.bc file and other part of libjpeg references in the makem.js node script.
  • updating istructions in disencuraged-build-local-with-manual-emscripten-setup section of the README.md
  • removed build.sh script
  • re-added the flag ' -s BINARYEN_TRAP_MODE=clamp' for nft + wasm compilation
  • other fixex in conf.json and package.json

A bit of cleanup on the package.json and conf.json
@kalwalt kalwalt self-assigned this Jan 2, 2020
@kalwalt kalwalt added Docker all about Docker setup and issues emscripten All about emscripten and jsartoolkit5 labels Jan 2, 2020
@kalwalt
Copy link
Owner

kalwalt commented Jan 2, 2020

@ThorstenBux In the README.md should be updated also the section disencuraged-build-local-with-manual-emscripten-setup
the 9 point should be:

+npm run build-local
-npm run build

and we can delete also the points 3 and 4 about libjpeg.

@kalwalt
Copy link
Owner

kalwalt commented Jan 2, 2020

i tested also your latest changes fa89ed2 , as
i suggested in #12, with Docker and works perfectly!

@ThorstenBux
Copy link
Author

Updated and pushed. You may have a look at it again and merge if you think it is good.

@kalwalt
Copy link
Owner

kalwalt commented Jan 2, 2020

I think it is ok. We can go over, for other improves in the code. Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Docker all about Docker setup and issues emscripten All about emscripten and jsartoolkit5
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants