From da9fc3fce8a751ee6309e4e3716e2e4c0c0fc4a2 Mon Sep 17 00:00:00 2001 From: Anton Lazarev Date: Mon, 26 Jul 2021 09:49:18 -0700 Subject: [PATCH] remove `brave_project_name` in favor of `brave_product_name` --- .gitignore | 1 + BUILD.gn | 6 +++--- app/linux/BUILD.gn | 4 ++-- app/mac/BUILD.gn | 2 +- app/win/BUILD.gn | 2 +- build/commands/lib/config.js | 3 +-- build/config.gni | 3 +-- script/lib/config.py | 5 ----- 8 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index c93c9bc16c3..e018094d490 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ patches/**/*.patchinfo *.sln debug.log npm-debug.log +.npmrc *~ CMakeLists.txt cmake-build-debug/ diff --git a/BUILD.gn b/BUILD.gn index 2b86ac7f9f5..684a48ad1ad 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -343,12 +343,12 @@ if (target_cpu == "x86") { } action("create_symbols_dist") { - output = "$brave_dist_dir/$brave_project_name-v$brave_version-$brave_platform-$target_arch-symbols.zip" + output = "$brave_dist_dir/$brave_product_name-v$brave_version-$brave_platform-$target_arch-symbols.zip" script = "//brave/script/create-dist.py" inputs = get_target_outputs(":brave_license_dist_resources") - dir_inputs = [ "$brave_project_name.breakpad.syms" ] + dir_inputs = [ "$brave_product_name.breakpad.syms" ] file_inputs = [] foreach(input, inputs) { @@ -374,7 +374,7 @@ action("create_symbols_dist") { } action("create_dist_zips") { - output = "$brave_dist_dir/$brave_project_name-v$brave_version-$brave_platform-$target_arch.zip" + output = "$brave_dist_dir/$brave_product_name-v$brave_version-$brave_platform-$target_arch.zip" script = "//brave/script/create-dist.py" diff --git a/app/linux/BUILD.gn b/app/linux/BUILD.gn index b1a38bbe2b0..5f59d339e4e 100644 --- a/app/linux/BUILD.gn +++ b/app/linux/BUILD.gn @@ -1,12 +1,12 @@ import("//brave/build/config.gni") action("generate_breakpad_symbols") { - symbols_dir = "$brave_dist_dir/$brave_project_name.breakpad.syms" + symbols_dir = "$brave_dist_dir/$brave_product_name.breakpad.syms" outputs = [ symbols_dir ] - start = [ brave_project_name ] + start = [ brave_product_name ] script = "//brave/tools/posix/generate_breakpad_symbols.py" args = [ diff --git a/app/mac/BUILD.gn b/app/mac/BUILD.gn index 86b56eefd03..214118e6543 100644 --- a/app/mac/BUILD.gn +++ b/app/mac/BUILD.gn @@ -29,7 +29,7 @@ group("symbol_dist_resources") { } action("generate_breakpad_symbols") { - symbols_dir = "$brave_dist_dir/$brave_project_name.breakpad.syms" + symbols_dir = "$brave_dist_dir/$brave_product_name.breakpad.syms" outputs = [ symbols_dir ] diff --git a/app/win/BUILD.gn b/app/win/BUILD.gn index 24cfda8ba1a..d19f915a697 100644 --- a/app/win/BUILD.gn +++ b/app/win/BUILD.gn @@ -3,7 +3,7 @@ import("//brave/build/config.gni") import("//media/cdm/library_cdm/cdm_paths.gni") action("generate_breakpad_symbols") { - symbols_dir = "$brave_dist_dir/$brave_project_name.breakpad.syms" + symbols_dir = "$brave_dist_dir/$brave_product_name.breakpad.syms" outputs = [ symbols_dir ] diff --git a/build/commands/lib/config.js b/build/commands/lib/config.js index cec871110b0..36d3de79deb 100755 --- a/build/commands/lib/config.js +++ b/build/commands/lib/config.js @@ -249,8 +249,7 @@ Config.prototype.buildArgs = function () { uphold_client_secret: this.upholdClientSecret, uphold_staging_client_id: this.upholdStagingClientId, uphold_staging_client_secret: this.upholdStagingClientSecret, - brave_product_name: getNPMConfig(['brave_product_name']) || "brave-core", - brave_project_name: getNPMConfig(['brave_project_name']) || "brave-core", + brave_product_name: getNPMConfig(['brave_product_name']) || "brave", brave_version_major: version_parts[0], brave_version_minor: version_parts[1], brave_version_build: version_parts[2], diff --git a/build/config.gni b/build/config.gni index 260cbad42dd..f0d41ed672f 100644 --- a/build/config.gni +++ b/build/config.gni @@ -17,7 +17,6 @@ declare_args() { sparkle_eddsa_public_key = "" brave_product_name = "" - brave_project_name = "" brave_exe = "" brave_version_major = "" brave_version_minor = "" @@ -44,7 +43,7 @@ declare_args() { brave_version = "$brave_version_major.$brave_version_minor.$brave_version_build" if (brave_exe == "") { - brave_exe = brave_project_name + brave_exe = brave_product_name } brave_dist_dir = "$root_out_dir/dist" diff --git a/script/lib/config.py b/script/lib/config.py index 2086dfe0039..20bb42815e4 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -80,11 +80,6 @@ def product_name(): brave_core_package()['name'].split('-')[0]) -def project_name(): - return (os.environ.get('npm_config_brave_project_name') or - brave_core_package()['name'].split('-')[0]) - - def get_chrome_version(): version = (os.environ.get('npm_config_brave_version') or brave_browser_package()['config']['projects']['chrome']['tag'])