diff --git a/.github/workflows/lint_and_test_cpp.yaml b/.github/workflows/lint_and_test_cpp.yaml index ca4ae55203..6922e3048e 100644 --- a/.github/workflows/lint_and_test_cpp.yaml +++ b/.github/workflows/lint_and_test_cpp.yaml @@ -35,8 +35,8 @@ on: - CMakeLists.txt - cmake_modules/** - run.sh - - scripts/pack_server.sh - - scripts/pack_tools.sh + - build-support/pack_server.sh + - build-support/pack_tools.sh - src/** - thirdparty/** @@ -55,7 +55,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: clang-format - run: ./scripts/run-clang-format.py --clang-format-executable clang-format-14 -e ./src/shell/linenoise -e ./src/shell/sds -e ./thirdparty -r . + run: ./build-support/run-clang-format.py --clang-format-executable clang-format-14 -e ./src/shell/linenoise -e ./src/shell/sds -e ./thirdparty -r . cpp_clang_tidy_linter: name: Tidy diff --git a/.github/workflows/regular-build.yml b/.github/workflows/regular-build.yml index 04468e4d39..54853e82c4 100644 --- a/.github/workflows/regular-build.yml +++ b/.github/workflows/regular-build.yml @@ -41,7 +41,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: clang-format - run: ./scripts/run-clang-format.py --clang-format-executable clang-format-14 -e ./src/shell/linenoise -e ./src/shell/sds -e ./thirdparty -r . + run: ./build-support/run-clang-format.py --clang-format-executable clang-format-14 -e ./src/shell/linenoise -e ./src/shell/sds -e ./thirdparty -r . build_cpp: name: Build Cpp diff --git a/.licenserc.yaml b/.licenserc.yaml index b8e45b5ec4..cf8484d193 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -110,7 +110,7 @@ header: - 'cmake_modules/FindRT.cmake' - 'cmake_modules/FindDL.cmake' # Copyright (c) 2017 Guillaume Papin - - 'scripts/run-clang-format.py' + - 'build-support/run-clang-format.py' # The MIT License (MIT), Copyright (c) 2015 Microsoft Corporation - 'cmake_modules/BaseFunctions.cmake' - 'docs/rdsn-README.md' @@ -120,7 +120,7 @@ header: - 'idl/metadata.thrift' - 'idl/meta_admin.thrift' - 'idl/replica_admin.thrift' - - 'scripts/compile_thrift.py' + - 'build-support/compile_thrift.py' - 'scripts/learn_stat.py' - 'src/runtime/api_layer1.h' - 'src/runtime/api_task.h' diff --git a/LICENSE b/LICENSE index a8e975f469..18ff45771e 100644 --- a/LICENSE +++ b/LICENSE @@ -514,7 +514,7 @@ RESULTING FROM THE USE OF THIS SOFTWARE. -------------------------------------------------------------------------------- -scripts/run-clang-format.py - MIT License +build-support/run-clang-format.py - MIT License MIT License diff --git a/scripts/bump_version.sh b/build-support/bump_version.sh similarity index 100% rename from scripts/bump_version.sh rename to build-support/bump_version.sh diff --git a/scripts/check_license.py b/build-support/check_license.py similarity index 100% rename from scripts/check_license.py rename to build-support/check_license.py diff --git a/scripts/collector_table_counter_gen.py b/build-support/collector_table_counter_gen.py similarity index 98% rename from scripts/collector_table_counter_gen.py rename to build-support/collector_table_counter_gen.py index 03a3f9f297..da50e1458f 100755 --- a/scripts/collector_table_counter_gen.py +++ b/build-support/collector_table_counter_gen.py @@ -118,7 +118,7 @@ def generate_code_in_command_helper_header(replica_counter): # python3 ./collector_table_counter_gen.py counter1,counter2 -# please use `./scripts/format_files.sh` to format after generate code +# please use `./build-support/format_files.sh` to format after generate code if __name__ == '__main__': if len(sys.argv) != 2: print("python3 ./collector_table_counter_gen.py {counter1,counter2..}") diff --git a/scripts/compile_thrift.py b/build-support/compile_thrift.py similarity index 100% rename from scripts/compile_thrift.py rename to build-support/compile_thrift.py diff --git a/scripts/format_files.sh b/build-support/format_files.sh similarity index 100% rename from scripts/format_files.sh rename to build-support/format_files.sh diff --git a/scripts/pack_client.sh b/build-support/pack_client.sh similarity index 100% rename from scripts/pack_client.sh rename to build-support/pack_client.sh diff --git a/scripts/pack_common.sh b/build-support/pack_common.sh similarity index 100% rename from scripts/pack_common.sh rename to build-support/pack_common.sh diff --git a/scripts/pack_server.sh b/build-support/pack_server.sh similarity index 100% rename from scripts/pack_server.sh rename to build-support/pack_server.sh diff --git a/scripts/pack_tools.sh b/build-support/pack_tools.sh similarity index 100% rename from scripts/pack_tools.sh rename to build-support/pack_tools.sh diff --git a/scripts/recompile_thrift.sh b/build-support/recompile_thrift.sh similarity index 100% rename from scripts/recompile_thrift.sh rename to build-support/recompile_thrift.sh diff --git a/scripts/redis_proto_check.py b/build-support/redis_proto_check.py similarity index 100% rename from scripts/redis_proto_check.py rename to build-support/redis_proto_check.py diff --git a/scripts/run-clang-format.py b/build-support/run-clang-format.py similarity index 100% rename from scripts/run-clang-format.py rename to build-support/run-clang-format.py diff --git a/java-client/README.md b/java-client/README.md index 9cfdb9a703..fbde959bf0 100644 --- a/java-client/README.md +++ b/java-client/README.md @@ -60,7 +60,7 @@ mvn clean package -Dtest=TestPing ### Install ``` -cd scripts && bash recompile_thrift.sh && cd - +cd build-support && bash recompile_thrift.sh && cd - mvn clean install -DskipTests ``` diff --git a/run.sh b/run.sh index dfe4f7ea98..070198dda5 100755 --- a/run.sh +++ b/run.sh @@ -318,8 +318,8 @@ function run_build() if [ ! -f "${ROOT}/src/common/serialization_helper/dsn.layer2_types.h" ]; then echo "Gen thrift" # TODO(yingchun): should be optimized - python3 $ROOT/scripts/compile_thrift.py - sh ${ROOT}/scripts/recompile_thrift.sh + python3 $ROOT/build-support/compile_thrift.py + sh ${ROOT}/build-support/recompile_thrift.sh fi if [ ! -d "$BUILD_DIR" ]; then @@ -2094,19 +2094,19 @@ case $cmd in ;; pack_server) shift - PEGASUS_ROOT=$ROOT ./scripts/pack_server.sh $* + PEGASUS_ROOT=$ROOT ./build-support/pack_server.sh $* ;; pack_client) shift - PEGASUS_ROOT=$ROOT ./scripts/pack_client.sh $* + PEGASUS_ROOT=$ROOT ./build-support/pack_client.sh $* ;; pack_tools) shift - PEGASUS_ROOT=$ROOT ./scripts/pack_tools.sh $* + PEGASUS_ROOT=$ROOT ./build-support/pack_tools.sh $* ;; bump_version) shift - ./scripts/bump_version.sh $* + ./build-support/bump_version.sh $* ;; *) echo "ERROR: unknown command $cmd" diff --git a/scala-client/README.md b/scala-client/README.md index 7aa454f0d3..1467f169e2 100644 --- a/scala-client/README.md +++ b/scala-client/README.md @@ -68,8 +68,8 @@ NOTE: It requires the Pegasus [onebox](https://pegasus.apache.org/overview/onebo Build Java dependency at first, then build and test Scala client. ``` -cd ${PROJECT_ROOT}/java-client/scripts -./recompile_thrift.sh +cd ${PROJECT_ROOT}/build-support +bash recompile_thrift.sh cd ${PROJECT_ROOT}/java-client mvn clean package -DskipTests -Dcheckstyle.skip=true