admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove use of incoming branches (#423)

Browse Source 
See https://github.com/emscripten-core/emscripten/issues/10067
This commit is contained in:
Sam Clegg
2020-01-14 13:59:15 -08:00
committed by GitHub
parent d30ba160ed
commit 3631f0aac3
3 changed files with 32 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
README.md
View File

@@ -131,7 +131,7 @@ categories.
To obtain and build latest upstream wasm SDK from source, run
```
emsdk install sdk-upstream-incoming-64bit
emsdk install sdk-upstream-master-64bit
```
You can use this target for example to bootstrap developing patches to LLVM,
@@ -147,8 +147,8 @@ https://emscripten.org/docs/contributing/developers_guide.html?highlight=develop
### When working on git branches compiled from source, how do I update to a newer compiler version?
Unlike tags and precompiled versions, a few of the SDK packages are based on
"moving" git branches and compiled from source (e.g. sdk-upstream-incoming,
sdk-incoming, emscripten-incoming, binaryen-master). Because of that, the
"moving" git branches and compiled from source (e.g. sdk-upstream-master,
sdk-master, emscripten-master, binaryen-master). Because of that, the
compiled versions will eventually go out of date as new commits are introduced
to the development branches. To update an old compiled installation of one of
this branches, simply reissue the "emsdk install" command on that tool/SDK. This
@@ -190,14 +190,11 @@ where you directly interact with the github repositories. This allows you to
obtain new features and latest fixes immediately as they are pushed to the
github repository, without having to wait for release to be tagged. You do not
need a github account or a fork of Emscripten to do this. To switch to using the
latest upstream git development branch `incoming`, run the following:
latest upstream git development branch `master`, run the following:
emsdk install git-1.9.4 # Install git. Skip if the system already has it.
emsdk install sdk-incoming-64bit # Clone+pull the latest kripken/emscripten/incoming.
emsdk activate sdk-incoming-64bit # Set the incoming SDK as the currently active one.
If you want to use the upstream stable branch `master`, then replace
`-incoming-` with `-master-` above.
emsdk install sdk-upstream-master-64bit # Clone+pull the latest emscripten-core/emscripten/master.
emsdk activate sdk-upstream-master-64bit # Set the master SDK as the currently active one.
### How do I use my own Emscripten github fork with the SDK?
@@ -207,16 +204,16 @@ acquainted with working on multiple remotes in a git clone, these steps should
be familiar to you. This is useful in the case when you want to make your own
modifications to the Emscripten toolchain, but still keep using the SDK
environment and tools. To set up your own fork as the currently active
Emscripten toolchain, first install the `sdk-incoming` SDK like shown in the
Emscripten toolchain, first install the `sdk-master` SDK like shown in the
previous section, and then run the following commands in the emsdk directory:
cd emscripten/incoming
cd emscripten/master
# Add a git remote link to your own repository.
git remote add myremote https://github.com/mygituseraccount/emscripten.git
# Obtain the changes in your link.
git fetch myremote
# Switch the emscripten-incoming tool to use your fork.
git checkout -b myincoming --track myremote/incoming
# Switch the emscripten-master tool to use your fork.
git checkout -b mymaster --track myremote/master
In this way you can utilize the Emscripten SDK tools while using your own git
fork. You can switch back and forth between remotes via the `git checkout`