LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #3231 from brandondahler/doc-autotool-update

Browse source 
Update build docs that refer to old makefile.* files.
This commit is contained in:
Wladimir J. van der Laan 2013-11-11 00:59:38 -08:00
commit 59be91ae1e
3 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/build-msw.md
View file

@ -76,6 +76,8 @@ Bitcoin
------- -------
DOS prompt: DOS prompt:
cd \bitcoin\src cd \bitcoin
mingw32-make -f makefile.mingw sh autogen.sh
sh configure
mingw32-make
strip bitcoind.exe strip bitcoind.exe

26
doc/build-osx.md
View file

@ -56,12 +56,13 @@ Installing the dependencies using MacPorts is very straightforward.
2. Build bitcoind: 2. Build bitcoind:
cd src ./autogen.sh
make -f makefile.osx ./configure
make
3. It is a good idea to build and run the unit tests, too: 3. It is a good idea to build and run the unit tests, too:
make -f makefile.osx test make test
Instructions: HomeBrew Instructions: HomeBrew
---------------------- ----------------------
@ -89,22 +90,15 @@ Rerunning "openssl version" should now return the correct version.
git clone git@github.com:bitcoin/bitcoin.git bitcoin git clone git@github.com:bitcoin/bitcoin.git bitcoin
cd bitcoin cd bitcoin
2. Modify source in order to pick up the `openssl` library. 2. Build bitcoind:
Edit `makefile.osx` to account for library location differences. There's a ./autogen.sh
diff in `contrib/homebrew/makefile.osx.patch` that shows what you need to ./configure
change, or you can just patch by doing make
patch -p1 < contrib/homebrew/makefile.osx.patch 3. It is a good idea to build and run the unit tests, too:
3. Build bitcoind: make test
cd src
make -f makefile.osx
4. It is a good idea to build and run the unit tests, too:
make -f makefile.osx test
Creating a release build Creating a release build
------------------------ ------------------------

2
qa/pull-tester/pull-tester.py
View file

@ -81,7 +81,7 @@ This pull does not merge cleanly onto current master""" + common_message}
post_data = { "body" : "Automatic sanity-testing: FAILED BUILD/TEST, see " + linkUrl + " for binaries and test log." + """ post_data = { "body" : "Automatic sanity-testing: FAILED BUILD/TEST, see " + linkUrl + " for binaries and test log." + """
This could happen for one of several reasons: This could happen for one of several reasons:
1. It chanages paths in makefile.linux-mingw or otherwise changes build scripts in a way that made them incompatible with the automated testing scripts (please tweak those patches in qa/pull-tester) 1. It chanages changes build scripts in a way that made them incompatible with the automated testing scripts (please tweak those patches in qa/pull-tester)
2. It adds/modifies tests which test network rules (thanks for doing that), which conflicts with a patch applied at test time 2. It adds/modifies tests which test network rules (thanks for doing that), which conflicts with a patch applied at test time
3. It does not build on either Linux i386 or Win32 (via MinGW cross compile) 3. It does not build on either Linux i386 or Win32 (via MinGW cross compile)
4. The test suite fails on either Linux i386 or Win32 4. The test suite fails on either Linux i386 or Win32