Skip to content

Commit d97b01d

Browse files
dilijevpleath
authored andcommitted
Fix EOL violations introduced by commits that came into master via a pump.
Exclude .man from the check because there is a manifest file that may require CRLF.
1 parent 30db0c2 commit d97b01d

File tree

20 files changed

+4942
-4942
lines changed

20 files changed

+4942
-4942
lines changed

jenkins/check_eol.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fi
1515
ERRFILE=check_eol.sh.err
1616
rm -f $ERRFILE
1717

18-
git diff --name-only `git merge-base origin/master HEAD` HEAD | grep -v -E "(test/.*\\.js|\\.cmd|\\.baseline|\\.wasm|\\.wast|\\.vcxproj|\\.vcproj|\\.sln)" | xargs -I % ./jenkins/check_file_eol.sh %
18+
git diff --name-only `git merge-base origin/master HEAD` HEAD | grep -v -E "(test/.*\\.js|\\.cmd|\\.baseline|\\.wasm|\\.wast|\\.vcxproj|\\.vcproj|\\.sln|\\.man)" | xargs -I % ./jenkins/check_file_eol.sh %
1919

2020
if [ -e $ERRFILE ]; then # if error file exists then there were errors
2121
>&2 echo "--------------" # leading >&2 means echo to stderr

lib/Runtime/Library/CMakeLists.txt

Lines changed: 138 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -1,138 +1,138 @@
1-
if(BuildJIT)
2-
add_definitions(-D_ENABLE_DYNAMIC_THUNKS=1)
3-
endif()
4-
5-
if(CC_TARGETS_AMD64)
6-
set(Wasm_dep
7-
WasmLibrary.cpp
8-
WebAssembly.cpp
9-
WebAssemblyEnvironment.cpp
10-
WebAssemblyInstance.cpp
11-
WebAssemblyMemory.cpp
12-
WebAssemblyModule.cpp
13-
WebAssemblyTable.cpp
14-
WabtInterface.cpp
15-
)
16-
endif()
17-
18-
if(CAN_BUILD_WABT)
19-
include_directories(
20-
../../wabt/chakra
21-
)
22-
endif()
23-
24-
set(CRLIB_SOURCE_CODES
25-
ArgumentsObject.cpp
26-
ArgumentsObjectEnumerator.cpp
27-
DelayFreeArrayBufferHelper.cpp
28-
ArrayBuffer.cpp
29-
AtomicsOperations.cpp
30-
AtomicsObject.cpp
31-
BoundFunction.cpp
32-
BufferStringBuilder.cpp
33-
CommonExternalApiImpl.cpp
34-
CompoundString.cpp
35-
ConcatString.cpp
36-
CustomExternalWrapperObject.cpp
37-
DataView.cpp
38-
DateImplementation.cpp
39-
ES5Array.cpp
40-
ES5ArrayIndexEnumerator.cpp
41-
EngineInterfaceObject.cpp
42-
ExternalLibraryBase.cpp
43-
ForInObjectEnumerator.cpp
44-
GlobalObject.cpp
45-
IntlEngineInterfaceExtensionObject.cpp
46-
JSON.cpp
47-
JSONParser.cpp
48-
JSONScanner.cpp
49-
JSONStack.cpp
50-
JSONStringBuilder.cpp
51-
JSONStringifier.cpp
52-
JavascriptArray.cpp
53-
JavascriptArrayIndexEnumerator.cpp
54-
JavascriptArrayIndexEnumeratorBase.cpp
55-
JavascriptArrayIndexSnapshotEnumerator.cpp
56-
JavascriptArrayIterator.cpp
57-
JavascriptBoolean.cpp
58-
JavascriptBooleanObject.cpp
59-
JavascriptBuiltInFunctions.cpp
60-
JavascriptDate.cpp
61-
JavascriptError.cpp
62-
# JavascriptErrorDebug.cpp
63-
JavascriptExceptionMetadata.cpp
64-
JavascriptExternalFunction.cpp
65-
JavascriptFunction.cpp
66-
JavascriptGenerator.cpp
67-
JavascriptGeneratorFunction.cpp
68-
JavascriptIterator.cpp
69-
JavascriptLibrary.cpp
70-
JavascriptListIterator.cpp
71-
JavascriptMap.cpp
72-
JavascriptMapIterator.cpp
73-
JavascriptNumber.cpp
74-
JavascriptNumberObject.cpp
75-
JavascriptObject.cpp
76-
JavascriptPromise.cpp
77-
JavascriptProxy.cpp
78-
JavascriptReflect.cpp
79-
JavascriptRegExpConstructor.cpp
80-
JavascriptRegExpEnumerator.cpp
81-
JavascriptRegularExpression.cpp
82-
JavascriptRegularExpressionResult.cpp
83-
JavascriptSet.cpp
84-
JavascriptSetIterator.cpp
85-
JavascriptString.cpp
86-
JavascriptStringEnumerator.cpp
87-
JavascriptStringIterator.cpp
88-
JavascriptStringObject.cpp
89-
JavascriptBigInt.cpp
90-
JavascriptBigIntObject.cpp
91-
JavascriptSymbol.cpp
92-
JavascriptSymbolObject.cpp
93-
JavascriptTypedNumber.cpp
94-
JavascriptVariantDate.cpp
95-
JavascriptWeakMap.cpp
96-
JavascriptWeakSet.cpp
97-
JsBuiltInEngineInterfaceExtensionObject.cpp
98-
LazyJSONString.cpp
99-
LiteralString.cpp
100-
MathLibrary.cpp
101-
ModuleRoot.cpp
102-
ObjectPrototypeObject.cpp
103-
ProfileString.cpp
104-
PropertyRecordUsageCache.cpp
105-
PropertyString.cpp
106-
RegexHelper.cpp
107-
RootObjectBase.cpp
108-
RuntimeFunction.cpp
109-
RuntimeLibraryPch.cpp
110-
ScriptFunction.cpp
111-
SharedArrayBuffer.cpp
112-
SingleCharString.cpp
113-
SparseArraySegment.cpp
114-
StackScriptFunction.cpp
115-
StringCopyInfo.cpp
116-
SubString.cpp
117-
ThrowErrorObject.cpp
118-
TypedArray.cpp
119-
TypedArrayIndexEnumerator.cpp
120-
UriHelper.cpp
121-
VerifyMarkFalseReference.cpp
122-
${Wasm_dep}
123-
)
124-
125-
if(CC_TARGETS_AMD64)
126-
set (CRLIB_SOURCE_CODES ${CRLIB_SOURCE_CODES}
127-
amd64/JavascriptFunctionA.S
128-
)
129-
elseif(CC_TARGETS_ARM)
130-
set (CRLIB_SOURCE_CODES ${CRLIB_SOURCE_CODES}
131-
arm/arm_JavascriptFunctionA.S
132-
)
133-
endif()
134-
135-
add_library (Chakra.Runtime.Library OBJECT ${CRLIB_SOURCE_CODES})
136-
137-
target_include_directories (
138-
Chakra.Runtime.Library PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
1+
if(BuildJIT)
2+
add_definitions(-D_ENABLE_DYNAMIC_THUNKS=1)
3+
endif()
4+
5+
if(CC_TARGETS_AMD64)
6+
set(Wasm_dep
7+
WasmLibrary.cpp
8+
WebAssembly.cpp
9+
WebAssemblyEnvironment.cpp
10+
WebAssemblyInstance.cpp
11+
WebAssemblyMemory.cpp
12+
WebAssemblyModule.cpp
13+
WebAssemblyTable.cpp
14+
WabtInterface.cpp
15+
)
16+
endif()
17+
18+
if(CAN_BUILD_WABT)
19+
include_directories(
20+
../../wabt/chakra
21+
)
22+
endif()
23+
24+
set(CRLIB_SOURCE_CODES
25+
ArgumentsObject.cpp
26+
ArgumentsObjectEnumerator.cpp
27+
DelayFreeArrayBufferHelper.cpp
28+
ArrayBuffer.cpp
29+
AtomicsOperations.cpp
30+
AtomicsObject.cpp
31+
BoundFunction.cpp
32+
BufferStringBuilder.cpp
33+
CommonExternalApiImpl.cpp
34+
CompoundString.cpp
35+
ConcatString.cpp
36+
CustomExternalWrapperObject.cpp
37+
DataView.cpp
38+
DateImplementation.cpp
39+
ES5Array.cpp
40+
ES5ArrayIndexEnumerator.cpp
41+
EngineInterfaceObject.cpp
42+
ExternalLibraryBase.cpp
43+
ForInObjectEnumerator.cpp
44+
GlobalObject.cpp
45+
IntlEngineInterfaceExtensionObject.cpp
46+
JSON.cpp
47+
JSONParser.cpp
48+
JSONScanner.cpp
49+
JSONStack.cpp
50+
JSONStringBuilder.cpp
51+
JSONStringifier.cpp
52+
JavascriptArray.cpp
53+
JavascriptArrayIndexEnumerator.cpp
54+
JavascriptArrayIndexEnumeratorBase.cpp
55+
JavascriptArrayIndexSnapshotEnumerator.cpp
56+
JavascriptArrayIterator.cpp
57+
JavascriptBoolean.cpp
58+
JavascriptBooleanObject.cpp
59+
JavascriptBuiltInFunctions.cpp
60+
JavascriptDate.cpp
61+
JavascriptError.cpp
62+
# JavascriptErrorDebug.cpp
63+
JavascriptExceptionMetadata.cpp
64+
JavascriptExternalFunction.cpp
65+
JavascriptFunction.cpp
66+
JavascriptGenerator.cpp
67+
JavascriptGeneratorFunction.cpp
68+
JavascriptIterator.cpp
69+
JavascriptLibrary.cpp
70+
JavascriptListIterator.cpp
71+
JavascriptMap.cpp
72+
JavascriptMapIterator.cpp
73+
JavascriptNumber.cpp
74+
JavascriptNumberObject.cpp
75+
JavascriptObject.cpp
76+
JavascriptPromise.cpp
77+
JavascriptProxy.cpp
78+
JavascriptReflect.cpp
79+
JavascriptRegExpConstructor.cpp
80+
JavascriptRegExpEnumerator.cpp
81+
JavascriptRegularExpression.cpp
82+
JavascriptRegularExpressionResult.cpp
83+
JavascriptSet.cpp
84+
JavascriptSetIterator.cpp
85+
JavascriptString.cpp
86+
JavascriptStringEnumerator.cpp
87+
JavascriptStringIterator.cpp
88+
JavascriptStringObject.cpp
89+
JavascriptBigInt.cpp
90+
JavascriptBigIntObject.cpp
91+
JavascriptSymbol.cpp
92+
JavascriptSymbolObject.cpp
93+
JavascriptTypedNumber.cpp
94+
JavascriptVariantDate.cpp
95+
JavascriptWeakMap.cpp
96+
JavascriptWeakSet.cpp
97+
JsBuiltInEngineInterfaceExtensionObject.cpp
98+
LazyJSONString.cpp
99+
LiteralString.cpp
100+
MathLibrary.cpp
101+
ModuleRoot.cpp
102+
ObjectPrototypeObject.cpp
103+
ProfileString.cpp
104+
PropertyRecordUsageCache.cpp
105+
PropertyString.cpp
106+
RegexHelper.cpp
107+
RootObjectBase.cpp
108+
RuntimeFunction.cpp
109+
RuntimeLibraryPch.cpp
110+
ScriptFunction.cpp
111+
SharedArrayBuffer.cpp
112+
SingleCharString.cpp
113+
SparseArraySegment.cpp
114+
StackScriptFunction.cpp
115+
StringCopyInfo.cpp
116+
SubString.cpp
117+
ThrowErrorObject.cpp
118+
TypedArray.cpp
119+
TypedArrayIndexEnumerator.cpp
120+
UriHelper.cpp
121+
VerifyMarkFalseReference.cpp
122+
${Wasm_dep}
123+
)
124+
125+
if(CC_TARGETS_AMD64)
126+
set (CRLIB_SOURCE_CODES ${CRLIB_SOURCE_CODES}
127+
amd64/JavascriptFunctionA.S
128+
)
129+
elseif(CC_TARGETS_ARM)
130+
set (CRLIB_SOURCE_CODES ${CRLIB_SOURCE_CODES}
131+
arm/arm_JavascriptFunctionA.S
132+
)
133+
endif()
134+
135+
add_library (Chakra.Runtime.Library OBJECT ${CRLIB_SOURCE_CODES})
136+
137+
target_include_directories (
138+
Chakra.Runtime.Library PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

lib/Runtime/Types/CMakeLists.txt

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
add_library (Chakra.Runtime.Types OBJECT
2-
ActivationObject.cpp
3-
ArrayObject.cpp
4-
DeferredTypeHandler.cpp
5-
DictionaryTypeHandler.cpp
6-
DynamicObject.cpp
7-
DynamicObjectPropertyEnumerator.cpp
8-
DynamicType.cpp
9-
ES5ArrayTypeHandler.cpp
10-
JavascriptEnumerator.cpp
11-
JavascriptStaticEnumerator.cpp
12-
MissingPropertyTypeHandler.cpp
13-
NullTypeHandler.cpp
14-
PathTypeHandler.cpp
15-
PropertyDescriptor.cpp
16-
RecyclableObject.cpp
17-
RuntimeTypePch.cpp
18-
ScriptFunctionType.cpp
19-
SimpleDictionaryTypeHandler.cpp
20-
SimpleDictionaryUnorderedTypeHandler.cpp
21-
SimpleTypeHandler.cpp
22-
SpreadArgument.cpp
23-
StaticType.cpp
24-
Type.cpp
25-
TypeHandler.cpp
26-
TypePath.cpp
27-
TypePropertyCache.cpp
28-
UnscopablesWrapperObject.cpp
29-
)
30-
31-
target_include_directories (
32-
Chakra.Runtime.Types PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
1+
add_library (Chakra.Runtime.Types OBJECT
2+
ActivationObject.cpp
3+
ArrayObject.cpp
4+
DeferredTypeHandler.cpp
5+
DictionaryTypeHandler.cpp
6+
DynamicObject.cpp
7+
DynamicObjectPropertyEnumerator.cpp
8+
DynamicType.cpp
9+
ES5ArrayTypeHandler.cpp
10+
JavascriptEnumerator.cpp
11+
JavascriptStaticEnumerator.cpp
12+
MissingPropertyTypeHandler.cpp
13+
NullTypeHandler.cpp
14+
PathTypeHandler.cpp
15+
PropertyDescriptor.cpp
16+
RecyclableObject.cpp
17+
RuntimeTypePch.cpp
18+
ScriptFunctionType.cpp
19+
SimpleDictionaryTypeHandler.cpp
20+
SimpleDictionaryUnorderedTypeHandler.cpp
21+
SimpleTypeHandler.cpp
22+
SpreadArgument.cpp
23+
StaticType.cpp
24+
Type.cpp
25+
TypeHandler.cpp
26+
TypePath.cpp
27+
TypePropertyCache.cpp
28+
UnscopablesWrapperObject.cpp
29+
)
30+
31+
target_include_directories (
32+
Chakra.Runtime.Types PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

0 commit comments

Comments
 (0)