Skip to content

Commit c6e98e9

Browse files
committed
Merge pull request #2151 from haneefmubarak/cleanup
cleanup series I - part I
2 parents 226dd0d + 6e18468 commit c6e98e9

File tree

11 files changed

+41
-36
lines changed

11 files changed

+41
-36
lines changed

CONTRIBUTING.markdown renamed to CONTRIBUTING.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
Contributing
2+
============
13

24
See our wiki for information about contributing to Emscripten:
35

46
[Contribution section on wiki](https://github.com/kripken/emscripten/wiki#contributing)
5-

README.markdown

Lines changed: 0 additions & 14 deletions
This file was deleted.

README.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
![emscripten logo](media/switch_logo.jpeg)
2+
3+
Emscripten is an LLVM-to-JavaScript compiler. It takes LLVM bitcode - which can be generated
4+
from C/C++, using `llvm-gcc` (DragonEgg) or `clang`, or any other language that can be
5+
converted into LLVM - and compiles that into JavaScript, which can be run on the web (or
6+
anywhere else JavaScript can run).
7+
8+
Links to **demos**, **tutorial**, **FAQ**, etc: <https://github.com/kripken/emscripten/wiki>
9+
10+
Main project page: <http://emscripten.org>
11+
12+
License
13+
-------
14+
15+
Emscripten is available under 2 licenses, the MIT license and the
16+
University of Illinois/NCSA Open Source License.
17+
18+
Both are permissive open source licenses, with little if any
19+
practical difference between them.
20+
21+
The reason for offering both is that (1) the MIT license is
22+
well-known, while (2) the University of Illinois/NCSA Open Source
23+
License allows Emscripten's code to be integrated upstream into
24+
LLVM, which uses that license, should the opportunity arise.
25+
26+
See `LICENSE` for the full content of the licenses.
File renamed without changes.
File renamed without changes.
File renamed without changes.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "emscripten",
3-
"version": "1.0.0",
3+
"version": "1.12.0",
44
"dependencies": {
55
"ws": "~0.4.28"
66
}

patches/README

Lines changed: 0 additions & 4 deletions
This file was deleted.

patches/series

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/relooper/README.markdown

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/relooper/README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Relooper
2+
========
3+
4+
This is an optimized C++ implemention of the Relooper algorithm originally developed as part
5+
of Emscripten. This implementation includes optimizations added since the original academic
6+
paper [1] - see paper.pdf - was published about it, and is written in an LLVM-friendly way
7+
with the goal of inclusion in upstream LLVM.
8+
9+
[1] Alon Zakai. 2011. Emscripten: an LLVM-to-JavaScript compiler. In Proceedings of the ACM
10+
international conference companion on Object oriented programming systems languages and
11+
applications companion (SPLASH '11). ACM, New York, NY, USA, 301-312.
12+
DOI=10.1145/2048147.2048224 http://doi.acm.org/10.1145/2048147.2048224

0 commit comments

Comments
 (0)