Skip to content

Commit a7a7d04

Browse files
Weining2019wenyongh
authored andcommittedNov 21, 2019
Restore some files and fix minor issues of SGX platform (#144)
1 parent 80045dd commit a7a7d04

File tree

5 files changed

+26
-54
lines changed

5 files changed

+26
-54
lines changed
 

‎CODE_OF_CONDUCT.md

+15-47
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
1-
+++
2-
version = "1.4"
3-
aliases = ["/version/1/4"]
4-
+++
5-
61
# Contributor Covenant Code of Conduct
72

3+
*Note*: this Code of Conduct pertains to individuals' behavior. Please also see the [Organizational Code of Conduct][OCoC].
4+
85
## Our Pledge
96

10-
In the interest of fostering an open and welcoming environment, we as
11-
contributors and maintainers pledge to make participation in our project and
12-
our community a harassment-free experience for everyone, regardless of age, body
13-
size, disability, ethnicity, sex characteristics, gender identity and expression,
14-
level of experience, education, socio-economic status, nationality, personal
15-
appearance, race, religion, or sexual identity and orientation.
7+
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
168

179
## Our Standards
1810

19-
Examples of behavior that contributes to creating a positive environment
20-
include:
11+
Examples of behavior that contributes to creating a positive environment include:
2112

2213
* Using welcoming and inclusive language
2314
* Being respectful of differing viewpoints and experiences
@@ -27,55 +18,32 @@ include:
2718

2819
Examples of unacceptable behavior by participants include:
2920

30-
* The use of sexualized language or imagery and unwelcome sexual attention or
31-
advances
21+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
3222
* Trolling, insulting/derogatory comments, and personal or political attacks
3323
* Public or private harassment
34-
* Publishing others' private information, such as a physical or electronic
35-
address, without explicit permission
36-
* Other conduct which could reasonably be considered inappropriate in a
37-
professional setting
24+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
25+
* Other conduct which could reasonably be considered inappropriate in a professional setting
3826

3927
## Our Responsibilities
4028

41-
Project maintainers are responsible for clarifying the standards of acceptable
42-
behavior and are expected to take appropriate and fair corrective action in
43-
response to any instances of unacceptable behavior.
29+
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
4430

45-
Project maintainers have the right and responsibility to remove, edit, or
46-
reject comments, commits, code, wiki edits, issues, and other contributions
47-
that are not aligned to this Code of Conduct, or to ban temporarily or
48-
permanently any contributor for other behaviors that they deem inappropriate,
49-
threatening, offensive, or harmful.
31+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
5032

5133
## Scope
5234

53-
This Code of Conduct applies within all project spaces, and it also applies when
54-
an individual is representing the project or its community in public spaces.
55-
Examples of representing a project or community include using an official
56-
project e-mail address, posting via an official social media account, or acting
57-
as an appointed representative at an online or offline event. Representation of
58-
a project may be further defined and clarified by project maintainers.
35+
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
5936

6037
## Enforcement
6138

62-
Instances of abusive, harassing, or otherwise unacceptable behavior may be
63-
reported by contacting the project team at otc.community.care@intel.com. All
64-
complaints will be reviewed and investigated and will result in a response that
65-
is deemed necessary and appropriate to the circumstances. The project team is
66-
obligated to maintain confidentiality with regard to the reporter of an incident.
67-
Further details of specific enforcement policies may be posted separately.
39+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Bytecode Alliance CoC team at [report@bytecodealliance.org](mailto:report@bytecodealliance.org). The CoC team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The CoC team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
6840

69-
Project maintainers who do not follow or enforce the Code of Conduct in good
70-
faith may face temporary or permanent repercussions as determined by other
71-
members of the project's leadership.
41+
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the Bytecode Alliance's leadership.
7242

7343
## Attribution
7444

75-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
76-
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
45+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
7746

47+
[OCoC]: ORG_CODE_OF_CONDUCT.md
7848
[homepage]: https://www.contributor-covenant.org
79-
80-
For answers to common questions about this code of conduct, see
81-
https://www.contributor-covenant.org/faq
49+
[version]: https://www.contributor-covenant.org/version/1/4/

‎CONTRIBUTING.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,4 @@ We use GitHub issues to track public bugs. Report a bug by [open a new issue](ht
3636
Code of Conduct
3737
===============
3838

39-
This project is governed by the [Contributor Covenant](CODE_OF_CONDUCT.md).
40-
All contributors and participants agree to abide by its terms.
39+
WAMR is a [Bytecode Alliance](https://bytecodealliance.org/) project, and follows the Bytecode Alliance's [Code of Conduct](CODE_OF_CONDUCT.md) and [Organizational Code of Conduct](ORG_CODE_OF_CONDUCT.md).

‎README.md

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
WebAssembly Micro Runtime
22
=========================
3+
4+
**A [Bytecode Alliance][BA] project**
5+
6+
[BA]: https://bytecodealliance.org/
7+
38
WebAssembly Micro Runtime (WAMR) is a standalone WebAssembly (WASM) runtime with small footprint. It includes a few parts as below:
49
- A WebAssembly VM core (namely iwasm)
510
- The supporting API's for the WASM applications
@@ -57,7 +62,7 @@ Embed WAMR
5762

5863
WAMR can be built into a standalone executable which takes the WASM application file name as input, and then executes it. In some other situations, the WAMR source code is embedded the product code and built into the final product.
5964

60-
WAMR provides a set of C API for loading the WASM module, instantiating the module and invoking a WASM function from a native call.
65+
WAMR provides a set of C API for loading the WASM module, instantiating the module and invoking a WASM function from a native call.
6166

6267
See the [doc/embed_wamr.md](./doc/embed_wamr.md) for the details.
6368

@@ -66,7 +71,7 @@ WAMR application programming library
6671

6772
WAMR defined event driven programming model:
6873
- Single thread per WASM app instance
69-
- App must implement system callbacks: on_init, on_destrory
74+
- App must implement system callbacks: on_init, on_destroy
7075

7176

7277
In general there are a few API classes for the WASM application programming:
@@ -112,7 +117,7 @@ See the [major features releasing history and contributor names](./doc/release_a
112117
Roadmap
113118
=======
114119

115-
See the [roadmap](./doc/roadmap.md) to understand what major features are planed or under development.
120+
See the [roadmap](./doc/roadmap.md) to understand what major features are planned or under development.
116121

117122
Please submit issues for any new feature request, or your plan for contributing new features.
118123

‎core/iwasm/products/linux-sgx/enclave-sample/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Enclave/%.o: Enclave/%.cpp
170170
@$(CXX) $(Enclave_Cpp_Flags) -c $< -o $@
171171
@echo "CXX <= $<"
172172

173-
$(Enclave_Name): Enclave/Enclave_t.o $(Enclave_Cpp_Objects)
173+
$(Enclave_Name): Enclave/Enclave_t.o $(Enclave_Cpp_Objects) libvmlib.a libextlib.a
174174
@$(CXX) $^ -o $@ $(Enclave_Link_Flags)
175175
@echo "LINK => $@"
176176

‎core/shared-lib/platform/linux-sgx/bh_platform.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <assert.h>
1515
#include <time.h>
1616
#include <string.h>
17-
#include <strings.h>
1817
#include <stdio.h>
1918
#include <stdlib.h>
2019
#include <math.h>
@@ -66,6 +65,7 @@ typedef void* (*thread_start_routine_t)(void*);
6665
#define wa_strdup bh_strdup
6766

6867
int snprintf(char *buffer, size_t count, const char *format, ...);
68+
int strncasecmp(const char *s1, const char *s2, size_t n);
6969
double fmod(double x, double y);
7070
float fmodf(float x, float y);
7171
double sqrt(double x);

0 commit comments

Comments
 (0)
Please sign in to comment.