Skip to content

cleanup series I - part I #2151

New issue

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

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

Already on GitHub? # to your account

Merged
merged 9 commits into from
Mar 3, 2014
Merged

Conversation

haneefmubarak
Copy link
Contributor

some basic cleanups as part of #20, mainly:

  • replace spaces with hard tabs (where appropriate)
  • moving docs around
  • delete trailing newlines (where appropriate)

**all: folded to margins**

README: used local image, expanded license into a small section

CONTRIBUTING: added title

relooper README: removed licensing data (root of repo contains license)
@@ -5,7 +5,7 @@ This is a helper tool which is designed to make it possible
for other apps to read emscripten's configuration variables
in a unified way. Usage:

em-config VAR_NAME
em-config VAR_NAME
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like these changes switched spaces to tabs? were there tabs in other places in those files? our convention is spaces actually.

@haneefmubarak
Copy link
Contributor Author

I thought that tabs might actually be better, seeing as that tabs are clearer, and allow you to jump between indentations. In files where it could cause potential issues (bat files), I have left tabs as they are.

@haneefmubarak
Copy link
Contributor Author

As for the licenses, I felt that for new visitors (ie: more or less everyone who reads the README), it would be helpful to have that relevant portion in the README.

Perhaps I could remove some of that portion from the LICENSE file instead?

This reverts commit b0bc4b4.

altering `emcc` this strongly will break many other pulls
and will cause a nightmare in terms of merging
@haneefmubarak
Copy link
Contributor Author

Even though tabs are better (for reasons outlined above), emcc is often edited, so editing in smaller chunks may be doable in the future.

Revert b0bc4b4

@kripken
Copy link
Member

kripken commented Feb 25, 2014

I see your point about more info being useful in the readme. But we should keep all info in LICENSE. So I guess having it in both places as you did is ok then.

@kripken
Copy link
Member

kripken commented Feb 25, 2014

Looks good overall, except for the tabs which we should keep as spaces, to match our convention everywhere else.

@haneefmubarak
Copy link
Contributor Author

Fixed.

@haneefmubarak
Copy link
Contributor Author

@kripken I reverted the tabs to spaces, so I think this is ready for merging.

@haneefmubarak
Copy link
Contributor Author

@kripken Is there anything else you wanted me to change?

@kripken
Copy link
Member

kripken commented Feb 28, 2014

Looks good, please just rebase so that there are no merge commits.

@haneefmubarak
Copy link
Contributor Author

@kripken rebased and force-pushed

kripken added a commit that referenced this pull request Mar 3, 2014
@kripken kripken merged commit c6e98e9 into emscripten-core:incoming Mar 3, 2014
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants