mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

build: [gn win] fix path names in js2asar

Browse source
This commit is contained in:
Jeremy Apthorp 2018-07-27 11:40:46 -07:00 committed by Jeremy Apthorp
parent 27e6805889
commit a6bc8030ea
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/asar.gni
View file

@ -16,6 +16,7 @@ template("chdir_action") {
]) ])
assert(defined(cwd), "Need cwd in $target_name") assert(defined(cwd), "Need cwd in $target_name")
script = "//electron/build/run-in-dir.py" script = "//electron/build/run-in-dir.py"
sources += [ invoker.script ]
args = [ args = [
cwd, cwd,
rebase_path(invoker.script), rebase_path(invoker.script),

2
tools/js2asar.py
View file

@ -26,7 +26,7 @@ def copy_files(source_files, output_dir, folder_name):
output_path = os.path.join(output_dir, source_file) output_path = os.path.join(output_dir, source_file)
# Files that aren't in the default_app folder need to be put inside # Files that aren't in the default_app folder need to be put inside
# the temp one we are making so they end up in the ASAR # the temp one we are making so they end up in the ASAR
if not source_file.startswith(folder_name + os.sep): if not os.path.normpath(source_file).startswith(folder_name + os.sep):
output_path = os.path.join(output_dir, folder_name, source_file) output_path = os.path.join(output_dir, folder_name, source_file)
safe_mkdir(os.path.dirname(output_path)) safe_mkdir(os.path.dirname(output_path))
shutil.copy2(source_file, output_path) shutil.copy2(source_file, output_path)