servo: Merge #13558 - Fix path to browserhtml in Linux runservo.sh (from aneeshusa:fix-path-to-browserhtml-in-linux-runservo.sh); r=shinglyu
authorAneesh Agrawal <aneeshusa@gmail.com>
Fri, 28 Oct 2016 12:31:55 -0500
changeset 340006 8e5b02086e8439c897243fd18ddca796aa9bd9f6
parent 340005 42e4816cbb2f9cf71aab630266e9fe5aa1d2501a
child 340007 8dc27904cbe0ee7630a78242c81898d6ae2a6b66
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersshinglyu
servo: Merge #13558 - Fix path to browserhtml in Linux runservo.sh (from aneeshusa:fix-path-to-browserhtml-in-linux-runservo.sh); r=shinglyu <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #13552 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [x] These changes do not require tests because needs to be verified manually <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: af48de91fbc31a0bbb5c1fc5900fdb3e1519db5c
servo/python/servo/package_commands.py
--- a/servo/python/servo/package_commands.py
+++ b/servo/python/servo/package_commands.py
@@ -295,26 +295,26 @@ class PackageCommands(CommandBase):
             if path.exists(dir_to_temp):
                 # TODO(aneeshusa): lock dir_to_temp to prevent simultaneous builds
                 print("Cleaning up from previous packaging")
                 delete(dir_to_temp)
 
             print("Copying files")
             dir_to_resources = path.join(dir_to_temp, 'resources')
             shutil.copytree(path.join(self.get_top_dir(), 'resources'), dir_to_resources)
-            shutil.copytree(browserhtml_path, path.join(dir_to_temp, 'build'))
+            shutil.copytree(browserhtml_path, path.join(dir_to_temp, 'browserhtml'))
             shutil.copy(binary_path, dir_to_temp)
 
             print("Writing runservo.sh")
             # TODO: deduplicate this arg list from post_build_commands
             servo_args = ['-b',
                           '--pref', 'dom.mozbrowser.enabled',
                           '--pref', 'dom.forcetouch.enabled',
                           '--pref', 'shell.builtin-key-shortcuts.enabled=false',
-                          path.join('./build/' + browserhtml_path.split('/')[-1], 'out', 'index.html')]
+                          path.join('./browserhtml', 'out', 'index.html')]
 
             runservo = os.open(dir_to_temp + '/runservo.sh', os.O_WRONLY | os.O_CREAT, int("0755", 8))
             os.write(runservo, "#!/usr/bin/env sh\n./servo " + ' '.join(servo_args))
             os.close(runservo)
 
             print("Creating tarball")
             time = datetime.utcnow().replace(microsecond=0).isoformat()
             time = time.replace(':', "-")