Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 19816: Create mar files #11

Merged
merged 5 commits into from Nov 5, 2016
Merged

Bug 19816: Create mar files #11

merged 5 commits into from Nov 5, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@boklm @arlolra @azadi
@boklm
Copy link
Member

@boklm boklm commented Nov 5, 2016

No description provided.

boklm added 5 commits Nov 5, 2016
@boklm
Update rbm
2054760 
The main change is that it is now possible to have the filename in
input_files pointing to a directory. This will allow us to have projects
that output multiple files.
@boklm
Make projects/tor-messenger output to a directory
0bee903 
This will now output to a directory, only containing one file. This is
the first step before adding the mar file and mar-tools.zip to that
directory.
@boklm
Make projects/instantbird output to a directory
b677cb7
@boklm
Create mar-tools zip files
b3ebc0f
@boklm
Create full mar files
a0b2e73
@boklm boklm changed the title Create mar files Bug 19816: Create mar files Nov 5, 2016
@arlolra
Copy link
Member

@arlolra arlolra commented Nov 5, 2016

This looks great. I'm currently building f9bb482, so won't be able to test for a little while, but feel free to merge it if you think it's ready.

@boklm boklm merged commit a0b2e73 into TheTorProject:master Nov 5, 2016
@boklm
Copy link
Member Author

@boklm boklm commented Nov 5, 2016

Yes, I think it's ready, so I merged it. Thanks.

@arlolra
Copy link
Member

@arlolra arlolra commented Nov 5, 2016

Great, I'm starting a build.

@azadi
Copy link
Member

@azadi azadi commented Nov 5, 2016

Great work as usual @boklm, thank you! I will start a build later as well.

@arlolra
Copy link
Member

@arlolra arlolra commented Nov 5, 2016

I ran make tor-messenger. This is what I see in my screen now,

Adding symlink add instructions to update manifests

Adding file and directory remove instructions from file 'removed-files'
/var/tmp/dist/mar-tools/make_full_update.sh: line 155: /var/tmp/dist/mar-tools/mar: No such file or directory
mv: cannot stat `tor-messenger/Browser.work/output.mar': No such file or directory

Finished

@arlolra
Copy link
Member

@arlolra arlolra commented Nov 5, 2016

The next lines were,

./rbm/rbm build tor-messenger --target tor-messenger --target windows-i686
Building project instantbird - instantbird-8d00ed48c485-windows-i686-920858
Created /tmp/rbm-4k2Vp/instantbird-8d00ed48c485.tar.gz

so that was after build Linux on both archs. The output looks like,

~/tor-messenger-build/out/tor-messenger/tor-messenger-0.2.0b2-linux-i686-24a58f$ ls
mar-tools-linux32.zip  tor-messenger-linux32-0.2.0b2_en-US.tar.xz
~/tor-messenger-build/out/tor-messenger/tor-messenger-0.2.0b2-linux-x86_64-8c1261$ ls
mar-tools-linux64.zip  tor-messenger-linux64-0.2.0b2_en-US.mar  tor-messenger-linux64-0.2.0b2_en-US.tar.xz

@boklm
Copy link
Member Author

@boklm boklm commented Nov 5, 2016

Thanks for noticing this. This should be fixed by 0b7aae4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment