New folder linux #12850

Coder206 · 2016-08-13T19:55:54Z

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes fix Create new folder when packaging on linux #11983 (github issue number if applicable).
There are tests for these changes (./mach package)

This change is

highfive · 2016-08-13T19:55:59Z

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @SimonSapin (or someone else) soon.

highfive · 2016-08-13T19:55:59Z

Heads up! This PR modifies the following files:

@wafflespeanut: python/servo/package_commands.py

highfive · 2016-08-13T19:56:00Z

Warning

These commits modify gfx code, but no tests are modified. Please consider adding a test!

emilio · 2016-08-14T06:29:16Z

r? @aneeshusa

Coder206 · 2016-08-16T00:49:37Z

@ConnorGBrewster Is this what you were looking expecting?

cbrewster · 2016-08-16T01:25:41Z

Yes, this is what I had in mind. Although I will let @aneeshusa review this still, since I don't know all of our python best practices.

Coder206 · 2016-08-16T01:30:27Z

@ConnorGBrewster Perfect! That makes sense. :) I apologize for the delay in sending the PR.

cbrewster · 2016-08-16T01:34:58Z

No worries! Thanks for doing it! 😄

aneeshusa · 2016-08-20T13:53:54Z

python/servo/package_commands.py

@@ -209,24 +209,21 @@ def package(self, release=False, dev=False, android=None, debug=False, debugger=
            msi_path = path.join(dir_to_msi, "Servo.msi")
            print("Packaged Servo into {}".format(msi_path))
        else:
+            dir_to_temp = '/'.join(binary_path.split('/')[:-2]) + '/targz'
            dir_to_package = '/'.join(binary_path.split('/')[:-1])
            dir_to_root = '/'.join(binary_path.split('/')[:-3])


dir_to_root is no longer used.

aneeshusa · 2016-08-20T14:38:12Z

Sorry about the delay in reviewing! Please also try to run Servo from the package tarball to make sure the packaging works properly.

aneeshusa · 2016-09-07T21:16:21Z

@Coder206 How is this going? Do you have any questions?

Coder206 · 2016-09-07T22:55:21Z

python/servo/package_commands.py

+            print("Copying files")
+            shutil.copytree(dir_to_package + '/resources', resources_dir)
+            shutil.copytree(browserhtml_path, resources_dir + browserhtml_path.split('/')[-1])
+
            print("Writing runservo.sh")


@aneeshusa Is it still necessary to make a runservo.sh here?

@ConnorGBrewster has a PR to remove it: #12154.
It looks like it would be pretty easy to fold that PR into this one.

So should I work to combine the two PRs?

Actually, I just realized that removing runservo.sh will require some additional changes, so let's keep runservo.sh for now and handle the removal in the other PR.

aneeshusa · 2016-09-30T22:06:38Z

@bors-servo r+

bors-servo · 2016-09-30T22:06:39Z

📌 Commit be87452 has been approved by aneeshusa

bors-servo · 2016-09-30T22:23:18Z

⌛ Testing commit be87452 with merge 968d4f0...

New folder linux  ---  - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #11983 (github issue number if applicable). - [x] There are tests for these changes (./mach package)   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12850)

bors-servo · 2016-09-30T22:41:44Z

💔 Test failed - linux-dev

aneeshusa

Always remember to run ./mach test-tidy before pushing :)

aneeshusa · 2016-09-30T22:52:02Z

python/servo/package_commands.py

+                # TODO(aneeshusa): lock dir_to_temp to prevent simultaneous builds
+                print("Cleaning up from previous packaging")
+                delete(dir_to_temp)
+


This line has whitespace, remove it (line should just be empty).

The purpose of the code is to make a new temporary folder with the necessary resources used to package Linux. Before this, the package was built based on a modified target directory. By using a temporary folder, it removes the need to rebuild Servo every time it gets packaged for Linux.

KiChjang · 2016-09-30T23:25:22Z

@bors-servo r=aneeshusa

bors-servo · 2016-09-30T23:25:24Z

📌 Commit d672750 has been approved by aneeshusa

bors-servo · 2016-09-30T23:29:57Z

⌛ Testing commit d672750 with merge 7fbd35e...

New folder linux  ---  - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #11983 (github issue number if applicable). - [x] There are tests for these changes (./mach package)   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12850)

bors-servo · 2016-10-01T00:46:57Z

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-dev

Coder206 · 2016-10-01T00:50:12Z

Thank you very much @aneeshusa!

highfive assigned SimonSapin Aug 13, 2016

highfive added the S-awaiting-review There is new code that needs to be reviewed. label Aug 13, 2016

highfive assigned aneeshusa and unassigned SimonSapin Aug 14, 2016

aneeshusa reviewed Aug 20, 2016
View reviewed changes

aneeshusa added S-needs-code-changes Changes have not yet been made that were requested by a reviewer. and removed S-awaiting-review There is new code that needs to be reviewed. labels Aug 20, 2016

Coder206 reviewed Sep 7, 2016
View reviewed changes

Coder206 closed this Sep 13, 2016

Coder206 deleted the newFolderLinux branch September 13, 2016 00:03

Coder206 restored the newFolderLinux branch September 13, 2016 00:04

Coder206 reopened this Sep 13, 2016

highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-needs-code-changes Changes have not yet been made that were requested by a reviewer. labels Sep 30, 2016

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Sep 30, 2016

highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Sep 30, 2016

aneeshusa suggested changes Sep 30, 2016

View reviewed changes

aneeshusa added the S-needs-code-changes Changes have not yet been made that were requested by a reviewer. label Sep 30, 2016

highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. S-needs-code-changes Changes have not yet been made that were requested by a reviewer. labels Sep 30, 2016

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Sep 30, 2016

bors-servo merged commit d672750 into servo:master Oct 1, 2016

highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Oct 1, 2016

Coder206 deleted the newFolderLinux branch October 1, 2016 00:49

This was referenced Oct 1, 2016

Remove runservo.sh for linux package #12154

Closed

Servo nightly package has the wrong path for browserhtml #13552

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New folder linux #12850

New folder linux #12850

Coder206 commented Aug 13, 2016 •

edited by larsbergstrom

highfive commented Aug 13, 2016

highfive commented Aug 13, 2016

highfive commented Aug 13, 2016

emilio commented Aug 14, 2016

Coder206 commented Aug 16, 2016

cbrewster commented Aug 16, 2016

Coder206 commented Aug 16, 2016 •

edited

cbrewster commented Aug 16, 2016

aneeshusa Aug 20, 2016

aneeshusa commented Aug 20, 2016

aneeshusa commented Sep 7, 2016

Coder206 Sep 7, 2016

aneeshusa Sep 7, 2016

Coder206 Sep 7, 2016

aneeshusa Sep 7, 2016

aneeshusa commented Sep 30, 2016

bors-servo commented Sep 30, 2016

bors-servo commented Sep 30, 2016

bors-servo commented Sep 30, 2016

aneeshusa left a comment

aneeshusa Sep 30, 2016

KiChjang commented Sep 30, 2016

bors-servo commented Sep 30, 2016

bors-servo commented Sep 30, 2016

bors-servo commented Oct 1, 2016

Coder206 commented Oct 1, 2016

New folder linux #12850

New folder linux #12850

Conversation

Coder206 commented Aug 13, 2016 • edited by larsbergstrom

highfive commented Aug 13, 2016

highfive commented Aug 13, 2016

highfive commented Aug 13, 2016

emilio commented Aug 14, 2016

Coder206 commented Aug 16, 2016

cbrewster commented Aug 16, 2016

Coder206 commented Aug 16, 2016 • edited

cbrewster commented Aug 16, 2016

aneeshusa Aug 20, 2016

Choose a reason for hiding this comment

aneeshusa commented Aug 20, 2016

aneeshusa commented Sep 7, 2016

Coder206 Sep 7, 2016

Choose a reason for hiding this comment

aneeshusa Sep 7, 2016

Choose a reason for hiding this comment

Coder206 Sep 7, 2016

Choose a reason for hiding this comment

aneeshusa Sep 7, 2016

Choose a reason for hiding this comment

aneeshusa commented Sep 30, 2016

bors-servo commented Sep 30, 2016

bors-servo commented Sep 30, 2016

bors-servo commented Sep 30, 2016

aneeshusa left a comment

Choose a reason for hiding this comment

aneeshusa Sep 30, 2016

Choose a reason for hiding this comment

KiChjang commented Sep 30, 2016

bors-servo commented Sep 30, 2016

bors-servo commented Sep 30, 2016

bors-servo commented Oct 1, 2016

Coder206 commented Oct 1, 2016

Coder206 commented Aug 13, 2016 •

edited by larsbergstrom

Coder206 commented Aug 16, 2016 •

edited