Generate proper line endings on Windows #1749

Merged
merged 6 commits into from Feb 25, 2014

Conversation

Projects
None yet
2 participants
@twpayne
Contributor

twpayne commented Feb 23, 2014

This is an attempt to fix the problem reported by @bentrm in #1747.

@bentrm

This comment has been minimized.

Show comment
Hide comment
@bentrm

bentrm Feb 23, 2014

Contributor

This looks very promissing with the following output running build target lint:

2014-02-23 15:08:21,934 build/check-whitespace-timestamp: build/src/external/externs/types.js: trailing whitespace at en
d of file
2014-02-23 15:08:21,940 build/check-whitespace-timestamp: build/src/external/src/exports.js: trailing whitespace at end
of file
2014-02-23 15:08:21,946 build/check-whitespace-timestamp: build/src/internal/src/types.js: trailing whitespace at end of
 file
2014-02-23 15:08:22,186 pake: build/check-whitespace-timestamp: 3 whitespace errors

So only whitespace errors on file endings are leftover.
I'm using core.autocrlf=input to make sure no newline caracters are converted on checkout but LF is honored when adding changes to the repo.

Contributor

bentrm commented Feb 23, 2014

This looks very promissing with the following output running build target lint:

2014-02-23 15:08:21,934 build/check-whitespace-timestamp: build/src/external/externs/types.js: trailing whitespace at en
d of file
2014-02-23 15:08:21,940 build/check-whitespace-timestamp: build/src/external/src/exports.js: trailing whitespace at end
of file
2014-02-23 15:08:21,946 build/check-whitespace-timestamp: build/src/internal/src/types.js: trailing whitespace at end of
 file
2014-02-23 15:08:22,186 pake: build/check-whitespace-timestamp: 3 whitespace errors

So only whitespace errors on file endings are leftover.
I'm using core.autocrlf=input to make sure no newline caracters are converted on checkout but LF is honored when adding changes to the repo.

@bentrm

This comment has been minimized.

Show comment
Hide comment
@bentrm

bentrm Feb 25, 2014

Contributor

This pull request in combination with https://github.com/twpayne/pake/pull/2 allows linting of the codebase with no errors in a Windows environment.

Contributor

bentrm commented Feb 25, 2014

This pull request in combination with https://github.com/twpayne/pake/pull/2 allows linting of the codebase with no errors in a Windows environment.

@twpayne

This comment has been minimized.

Show comment
Hide comment
@twpayne

twpayne Feb 25, 2014

Contributor

Awesome, thanks very much for the investigative work @bentrm. I've just added a commit that updates pake in ol3 and I'll merge as soon as Travis passes.

Contributor

twpayne commented Feb 25, 2014

Awesome, thanks very much for the investigative work @bentrm. I've just added a commit that updates pake in ol3 and I'll merge as soon as Travis passes.

twpayne added a commit that referenced this pull request Feb 25, 2014

Merge pull request #1749 from twpayne/windows-newlines
Generate proper line endings on Windows

@twpayne twpayne merged commit 69addbc into openlayers:master Feb 25, 2014

1 check passed

default The Travis CI build passed
Details

@twpayne twpayne deleted the twpayne:windows-newlines branch Feb 25, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment