From c8067f1ffda1cca5eb225ed1a7d18eaa8dc7fc0c Mon Sep 17 00:00:00 2001 From: John Porto Date: Tue, 8 Mar 2022 10:22:28 -0800 Subject: [PATCH] Misc MsgGen fixes Summary: Fix a few issues with msggen: 1. run_msggen: fully-qualified path to clang-format 1. Updated the license for autogenerated files Changelog: [Internal] Reviewed By: neildhar Differential Revision: D34114718 fbshipit-source-id: 831d4b20bfdc39cfa1226e2a32dcb445c8086ff3 --- .../hermes/inspector/chrome/MessageTypes.cpp | 4 +-- .../hermes/inspector/chrome/MessageTypes.h | 4 +-- .../tools/msggen/src/GeneratedHeader.js | 2 +- ReactCommon/hermes/inspector/tools/run_msggen | 26 +++++++++++-------- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/ReactCommon/hermes/inspector/chrome/MessageTypes.cpp b/ReactCommon/hermes/inspector/chrome/MessageTypes.cpp index b7cab9c550e..9e278ae531c 100644 --- a/ReactCommon/hermes/inspector/chrome/MessageTypes.cpp +++ b/ReactCommon/hermes/inspector/chrome/MessageTypes.cpp @@ -1,5 +1,5 @@ -// Copyright 2004-present Facebook. All Rights Reserved. -// @generated <> +// Copyright (c) Meta Platforms, Inc. and affiliates. All Rights Reserved. +// @generated SignedSource<<130ce3da2ad67004eb7bb91f19028a89>> #include "MessageTypes.h" diff --git a/ReactCommon/hermes/inspector/chrome/MessageTypes.h b/ReactCommon/hermes/inspector/chrome/MessageTypes.h index 10ff9e4ca32..5979d2f6889 100644 --- a/ReactCommon/hermes/inspector/chrome/MessageTypes.h +++ b/ReactCommon/hermes/inspector/chrome/MessageTypes.h @@ -1,5 +1,5 @@ -// Copyright 2004-present Facebook. All Rights Reserved. -// @generated <> +// Copyright (c) Meta Platforms, Inc. and affiliates. All Rights Reserved. +// @generated SignedSource<<41786947d74eb3f47d8168b82b5ccf85>> #pragma once diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/GeneratedHeader.js b/ReactCommon/hermes/inspector/tools/msggen/src/GeneratedHeader.js index 7375312ee78..9533b2425e2 100644 --- a/ReactCommon/hermes/inspector/tools/msggen/src/GeneratedHeader.js +++ b/ReactCommon/hermes/inspector/tools/msggen/src/GeneratedHeader.js @@ -12,5 +12,5 @@ // placeholder token that will be replaced by signedsource script export const GeneratedHeader: string = - '// Copyright 2004-present Facebook. All Rights Reserved.\n' + + '// Copyright (c) Meta Platforms, Inc. and affiliates. All Rights Reserved.\n' + '// @generated <>'; diff --git a/ReactCommon/hermes/inspector/tools/run_msggen b/ReactCommon/hermes/inspector/tools/run_msggen index c349b70be6c..afe7901ea62 100755 --- a/ReactCommon/hermes/inspector/tools/run_msggen +++ b/ReactCommon/hermes/inspector/tools/run_msggen @@ -3,24 +3,28 @@ set -e DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd) -cd "${DIR}/msggen" - -yarn install -yarn build MSGTYPES_PATH="${DIR}/message_types.txt" HEADER_PATH="${DIR}/../chrome/MessageTypes.h" CPP_PATH="${DIR}/../chrome/MessageTypes.cpp" +FBSOURCE=$(hg root) +CLANG_FORMAT="${FBSOURCE}/tools/third-party/clang-format/clang-format" +SIGNEDSOURCE="${FBSOURCE}/tools/signedsource" + +cd "${DIR}/msggen" + +yarn install +yarn build + node bin/index.js \ --ignore-experimental \ --include-experimental=Runtime.getHeapUsage \ - --roots "$MSGTYPES_PATH" \ - "$HEADER_PATH" "$CPP_PATH" + --roots "${MSGTYPES_PATH}" \ + "${HEADER_PATH}" "${CPP_PATH}" -clang-format -i --style=file "$HEADER_PATH" -clang-format -i --style=file "$CPP_PATH" +"${CLANG_FORMAT}" -i --style=file "${HEADER_PATH}" +"${CLANG_FORMAT}" -i --style=file "${CPP_PATH}" -FBSOURCE=$(hg root) -"${FBSOURCE}/tools/signedsource" sign "$HEADER_PATH" -"${FBSOURCE}/tools/signedsource" sign "$CPP_PATH" +"${SIGNEDSOURCE}" sign "${HEADER_PATH}" +"${SIGNEDSOURCE}" sign "${CPP_PATH}"