diff --git a/.rat-excludes b/.rat-excludes index a4cc6417..3f180d6d 100644 --- a/.rat-excludes +++ b/.rat-excludes @@ -17,6 +17,6 @@ .git/ coverage/ -test/fixtures/ -**/*.pbxproj node_modules/ +test/parser/projects/**/*.pbxproj +lcov.info diff --git a/index.js b/index.js index 78e2cee4..dee3fc47 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/lib/parseJob.js b/lib/parseJob.js index 3b2040b6..5d8f5271 100644 --- a/lib/parseJob.js +++ b/lib/parseJob.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/lib/parser/pbxproj.pegjs b/lib/parser/pbxproj.pegjs index f93faed9..6c8bec6c 100644 --- a/lib/parser/pbxproj.pegjs +++ b/lib/parser/pbxproj.pegjs @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/lib/pbxFile.js b/lib/pbxFile.js index e6072c72..6d92575a 100644 --- a/lib/pbxFile.js +++ b/lib/pbxFile.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/lib/pbxProject.js b/lib/pbxProject.js index a0e6fb4b..332a3241 100644 --- a/lib/pbxProject.js +++ b/lib/pbxProject.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/lib/pbxWriter.js b/lib/pbxWriter.js index b1cd9f53..b5d52731 100644 --- a/lib/pbxWriter.js +++ b/lib/pbxWriter.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/BuildSettings.js b/test/BuildSettings.js index 17e26177..702ef5e9 100644 --- a/test/BuildSettings.js +++ b/test/BuildSettings.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/FrameworkSearchPaths.js b/test/FrameworkSearchPaths.js index 402531ec..3c698921 100644 --- a/test/FrameworkSearchPaths.js +++ b/test/FrameworkSearchPaths.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/HeaderSearchPaths.js b/test/HeaderSearchPaths.js index 0ebaceae..415699bb 100644 --- a/test/HeaderSearchPaths.js +++ b/test/HeaderSearchPaths.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/LibrarySearchPaths.js b/test/LibrarySearchPaths.js index 1668191d..31583c8b 100644 --- a/test/LibrarySearchPaths.js +++ b/test/LibrarySearchPaths.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/OtherLinkerFlags.js b/test/OtherLinkerFlags.js index f9693c27..1adced36 100644 --- a/test/OtherLinkerFlags.js +++ b/test/OtherLinkerFlags.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/addBuildPhase.js b/test/addBuildPhase.js index 2a99f69c..f653f09f 100644 --- a/test/addBuildPhase.js +++ b/test/addBuildPhase.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/addFramework.js b/test/addFramework.js index c5495cd7..c43a7176 100644 --- a/test/addFramework.js +++ b/test/addFramework.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/addHeaderFile.js b/test/addHeaderFile.js index 190287dd..cc8e621e 100644 --- a/test/addHeaderFile.js +++ b/test/addHeaderFile.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/addRemovePbxGroup.js b/test/addRemovePbxGroup.js index e91abbfc..828e9775 100644 --- a/test/addRemovePbxGroup.js +++ b/test/addRemovePbxGroup.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/addResourceFile.js b/test/addResourceFile.js index bd2d13fd..fe5718a8 100644 --- a/test/addResourceFile.js +++ b/test/addResourceFile.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/addSourceFile.js b/test/addSourceFile.js index 362ef304..409bad09 100644 --- a/test/addSourceFile.js +++ b/test/addSourceFile.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/addStaticLibrary.js b/test/addStaticLibrary.js index 825d634c..9877d590 100644 --- a/test/addStaticLibrary.js +++ b/test/addStaticLibrary.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/addTarget.js b/test/addTarget.js index 87fe642b..3fbba2f8 100644 --- a/test/addTarget.js +++ b/test/addTarget.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/addTargetDependency.js b/test/addTargetDependency.js index d872e732..d1f2ef58 100644 --- a/test/addTargetDependency.js +++ b/test/addTargetDependency.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/addToPbxFileReferenceSection.js b/test/addToPbxFileReferenceSection.js index cfb1a8d2..683e675b 100644 --- a/test/addToPbxFileReferenceSection.js +++ b/test/addToPbxFileReferenceSection.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/addWatch2App.js b/test/addWatch2App.js index 2d10a4a1..de15ce63 100644 --- a/test/addWatch2App.js +++ b/test/addWatch2App.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/addWatch2Extension.js b/test/addWatch2Extension.js index c157fbdf..f8370738 100644 --- a/test/addWatch2Extension.js +++ b/test/addWatch2Extension.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/addWatchApp.js b/test/addWatchApp.js index 21389d3d..85b31bd5 100644 --- a/test/addWatchApp.js +++ b/test/addWatchApp.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/addWatchExtension.js b/test/addWatchExtension.js index 09a296c6..10c68c26 100644 --- a/test/addWatchExtension.js +++ b/test/addWatchExtension.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/addXCConfigurationList.js b/test/addXCConfigurationList.js index f19f429e..45cc1cce 100644 --- a/test/addXCConfigurationList.js +++ b/test/addXCConfigurationList.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/dataModelDocument.js b/test/dataModelDocument.js index b627c3c8..fc2b648e 100644 --- a/test/dataModelDocument.js +++ b/test/dataModelDocument.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/fixtures/multiple-data-model.xcdatamodeld/.xccurrentversion b/test/fixtures/multiple-data-model.xcdatamodeld/.xccurrentversion index cb72aba0..0d7c1611 100644 --- a/test/fixtures/multiple-data-model.xcdatamodeld/.xccurrentversion +++ b/test/fixtures/multiple-data-model.xcdatamodeld/.xccurrentversion @@ -1,4 +1,22 @@ + diff --git a/test/fixtures/multiple-data-model.xcdatamodeld/1.xcdatamodel/contents b/test/fixtures/multiple-data-model.xcdatamodeld/1.xcdatamodel/contents index 6bd3dcd4..d34aec35 100644 --- a/test/fixtures/multiple-data-model.xcdatamodeld/1.xcdatamodel/contents +++ b/test/fixtures/multiple-data-model.xcdatamodeld/1.xcdatamodel/contents @@ -1,4 +1,22 @@ + - \ No newline at end of file + diff --git a/test/fixtures/multiple-data-model.xcdatamodeld/2.xcdatamodel/contents b/test/fixtures/multiple-data-model.xcdatamodeld/2.xcdatamodel/contents index 6bd3dcd4..d34aec35 100644 --- a/test/fixtures/multiple-data-model.xcdatamodeld/2.xcdatamodel/contents +++ b/test/fixtures/multiple-data-model.xcdatamodeld/2.xcdatamodel/contents @@ -1,4 +1,22 @@ + - \ No newline at end of file + diff --git a/test/fixtures/single-data-model.xcdatamodeld/SingleDataModel.xcdatamodel/contents b/test/fixtures/single-data-model.xcdatamodeld/SingleDataModel.xcdatamodel/contents index 6bd3dcd4..d34aec35 100644 --- a/test/fixtures/single-data-model.xcdatamodeld/SingleDataModel.xcdatamodel/contents +++ b/test/fixtures/single-data-model.xcdatamodeld/SingleDataModel.xcdatamodel/contents @@ -1,4 +1,22 @@ + - \ No newline at end of file + diff --git a/test/group.js b/test/group.js index ae4a85cf..c640ad54 100644 --- a/test/group.js +++ b/test/group.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/knownRegions.js b/test/knownRegions.js index 105f04ec..f005c7a8 100644 --- a/test/knownRegions.js +++ b/test/knownRegions.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/multipleTargets.js b/test/multipleTargets.js index d1eab55c..34fcdaf8 100644 --- a/test/multipleTargets.js +++ b/test/multipleTargets.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/parser/build-config.js b/test/parser/build-config.js index 609b7068..078ec2cd 100644 --- a/test/parser/build-config.js +++ b/test/parser/build-config.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/parser/comments.js b/test/parser/comments.js index 6322e766..22c8ffd9 100644 --- a/test/parser/comments.js +++ b/test/parser/comments.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/parser/dotsInNames.js b/test/parser/dotsInNames.js index df8a0cea..ede77ef6 100644 --- a/test/parser/dotsInNames.js +++ b/test/parser/dotsInNames.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/parser/file-references.js b/test/parser/file-references.js index 66ecb9ad..a83884ea 100644 --- a/test/parser/file-references.js +++ b/test/parser/file-references.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/parser/hash.js b/test/parser/hash.js index bbb3d0be..31a57bb2 100644 --- a/test/parser/hash.js +++ b/test/parser/hash.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/parser/header-search.js b/test/parser/header-search.js index d0a87c0e..6776e17c 100644 --- a/test/parser/header-search.js +++ b/test/parser/header-search.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/parser/projects/comments.pbxproj b/test/parser/projects/comments.pbxproj index 977bb5e5..4c71aab8 100644 --- a/test/parser/projects/comments.pbxproj +++ b/test/parser/projects/comments.pbxproj @@ -1,23 +1,21 @@ // !$*UTF8*$! /* -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. */ { archiveVersion = 1; diff --git a/test/parser/section-entries.js b/test/parser/section-entries.js index 8c8c4f49..1d1afd34 100644 --- a/test/parser/section-entries.js +++ b/test/parser/section-entries.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/parser/section-split.js b/test/parser/section-split.js index 84fd4654..84d7d220 100644 --- a/test/parser/section-split.js +++ b/test/parser/section-split.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/parser/section.js b/test/parser/section.js index ee0a6bb5..7ec69c58 100644 --- a/test/parser/section.js +++ b/test/parser/section.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/parser/two-sections.js b/test/parser/two-sections.js index c99288c2..77f6fec1 100644 --- a/test/parser/two-sections.js +++ b/test/parser/two-sections.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/parser/with_array.js b/test/parser/with_array.js index 4861e719..c87479d3 100644 --- a/test/parser/with_array.js +++ b/test/parser/with_array.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/pbxFile.js b/test/pbxFile.js index 8c053d6f..863dcac0 100644 --- a/test/pbxFile.js +++ b/test/pbxFile.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/pbxItemByComment.js b/test/pbxItemByComment.js index 5438d1c9..f1b95a4c 100644 --- a/test/pbxItemByComment.js +++ b/test/pbxItemByComment.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/pbxProject.js b/test/pbxProject.js index 99cbc604..2b62a247 100644 --- a/test/pbxProject.js +++ b/test/pbxProject.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/pbxTargetByName.js b/test/pbxTargetByName.js index 8672098f..d3278153 100644 --- a/test/pbxTargetByName.js +++ b/test/pbxTargetByName.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/pbxWriter.js b/test/pbxWriter.js index eb285709..611db981 100644 --- a/test/pbxWriter.js +++ b/test/pbxWriter.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/removeFramework.js b/test/removeFramework.js index 0fd7f011..90979cfe 100644 --- a/test/removeFramework.js +++ b/test/removeFramework.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/removeHeaderFile.js b/test/removeHeaderFile.js index 278b2c5e..989e5af3 100644 --- a/test/removeHeaderFile.js +++ b/test/removeHeaderFile.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/removeResourceFile.js b/test/removeResourceFile.js index ecdc9dbc..e5e4cb9c 100644 --- a/test/removeResourceFile.js +++ b/test/removeResourceFile.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/removeSourceFile.js b/test/removeSourceFile.js index 08b0bf33..c4d78d41 100644 --- a/test/removeSourceFile.js +++ b/test/removeSourceFile.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/variantGroup.js b/test/variantGroup.js index a2b22282..6718acac 100644 --- a/test/variantGroup.js +++ b/test/variantGroup.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/test/xcode5searchPaths.js b/test/xcode5searchPaths.js index 20b417a5..8fb971cf 100644 --- a/test/xcode5searchPaths.js +++ b/test/xcode5searchPaths.js @@ -1,4 +1,4 @@ -/** +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information