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

Autotools and Gitian in a single change set to be merged into master #312

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

josephbisch
Copy link

@droark

This is the stuff from my autotools-gitian-0.94. I took the appropriate files from that branch and put them on this new branch based off of master.

So far I just tested this with a normal Linux build (./autogen.sh, ./configure, make). I haven't tested depends or the Gitian build. Nothing should have changed to break the depends or Gitian build, but it might be a good idea to do a Gitian build before this is merged, because that covers the depends build too and it will ensure that a file wasn't accidentally left out or that there is some change that needs to be made for the master branch.

@josephbisch josephbisch force-pushed the autotools-gitian-master-based branch 2 times, most recently from d05c470 to f80a070 Compare September 13, 2015 23:08
@josephbisch
Copy link
Author

The OS X build (via osxbuild/build-app.py) was also tested.

@droark
Copy link
Collaborator

droark commented Sep 22, 2015

Thanks, Joseph. Everything looks good to me. I'll see what I can do about getting the code pushed ASAP.

@achow101
Copy link

@josephbisch Could you submit this PR to the new Armory repo at https://github.com/goatpig/BitcoinArmory

@josephbisch
Copy link
Author

@achow101 - As I was an intern at ATI when I was developing this PR, I believe that it is not eligable to be merged into Goatpig's tree due to the same legal issues that have Goatpig redoing 0.94.

Maybe @goatpig can comment further on this, but from what I read, it seems like this work needs to be redone in order for it to be included in the new Armory repo. Which is unfortunate, because a lot of work was put into this, and it isn't particularly useful in a non open source context, but things are the way they are.

Though maybe this is okay to merge as it was left on here when all the 0.94 stuff was taken down. I really have no idea. But until it is clear to me that it is okay, I won't be submitting a PR to the new Armory repo, since the code isn't really mine from an ownership perspective as I was doing it as part of my job.

Thanks though for looking through the PRs over here and trying to get people to resubmit them to the new repo.

@goatpig
Copy link
Collaborator

goatpig commented Feb 17, 2016

I don't believe I can use this unless ATI was to release the copyright or relicense it under the MIT license.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants