Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove brave_project_name in favor of brave_product_name

Browse Source
This commit is contained in:
Anton Lazarev
2021-07-27 07:31:34 -07:00
parent a7782dda75
commit da9fc3fce8
8 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -28,6 +28,7 @@ patches/**/*.patchinfo
*.sln
debug.log
npm-debug.log
.npmrc
*~
CMakeLists.txt
cmake-build-debug/
BUILD.gn
+3 -3
View File
@@ -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"
app/linux/BUILD.gn
+2 -2
View File
@@ -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 = [
app/mac/BUILD.gn
+1 -1
View File
@@ -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
]
app/win/BUILD.gn
+1 -1
View File
@@ -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
]
build/commands/lib/config.js
+1 -2
View File
@@ -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],
build/config.gni
+1 -2
View File
@@ -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"
script/lib/config.py
-5
View File
@@ -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'])