From 09ae1c44275de9275e4a6412b132d34daa99c243 Mon Sep 17 00:00:00 2001 From: Wojciech Pietraszewski Date: Wed, 22 May 2024 13:16:54 +0200 Subject: [PATCH] porting/update_generated_files: Add comments stripping and prepend license header The script modifying 'syscfg.h' files for ports will now remove all block comments and add the license header --- .github/LICENSE_TEMPLATE | 18 ++++++++++++++++++ porting/update_generated_files.sh | 7 ++++--- 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 .github/LICENSE_TEMPLATE diff --git a/.github/LICENSE_TEMPLATE b/.github/LICENSE_TEMPLATE new file mode 100644 index 0000000000..80b586513c --- /dev/null +++ b/.github/LICENSE_TEMPLATE @@ -0,0 +1,18 @@ +/* + * 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. + */ diff --git a/porting/update_generated_files.sh b/porting/update_generated_files.sh index 7365bc3ed6..94f1808a41 100755 --- a/porting/update_generated_files.sh +++ b/porting/update_generated_files.sh @@ -37,9 +37,10 @@ for target in "${!targets[@]}"; do rm -rf "bin/@apache-mynewt-nimble/porting/targets/${target}/generated/include/logcfg" rm -rf "bin/@apache-mynewt-nimble/porting/targets/${target}/generated/include/sysflash" cp "bin/@apache-mynewt-nimble/porting/targets/${target}/generated/include" "${targets[$target]}" -r - # Remove repo version and hash MYNEWT_VALS as it doesn't make much sense to commit them and they - # defeat the purpose of this script. + # Remove all comments and hash MYNEWT_VALS as it doesn't make much sense to commit them and they + # defeat the purpose of this script. Prepend the license header. find "${targets[$target]}/include" -type f -name 'syscfg.h' -exec sed -i '/MYNEWT_VAL_REPO_*/,/#endif/d' {} \; - find "${targets[$target]}/include" -type f -name 'syscfg.h' -exec sed -i '/\/\*\*\* Repository/,/\*\//d' {} \; + find "${targets[$target]}/include" -type f -name 'syscfg.h' -exec sed -i -E ':a;N;$!ba;s:/\*([^*]|(\*+([^*/])))*\*+/::g' {} \; find "${targets[$target]}/include" -type f -name 'syscfg.h' -exec sed -i '$!N;/^\n$/{$q;D;};P;D;' {} \; + find "${targets[$target]}/include" -type f -name 'syscfg.h' -exec sh -c 'cat "$0" "$1" > "$1.tmp" && mv "$1.tmp" "$1"' "../.github/LICENSE_TEMPLATE" {} \; done