Browse Source

Update build docs that refer to old makefile.* files.

Also update pull-tester's error message.
pull/1/head
Brandon Dahler 9 years ago
parent
commit
2b91707469
  1. 6
      doc/build-msw.md
  2. 26
      doc/build-osx.md
  3. 2
      qa/pull-tester/pull-tester.py

6
doc/build-msw.md

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

26
doc/build-osx.md

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

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

@ -81,7 +81,7 @@ This pull does not merge cleanly onto current master""" + common_message} @@ -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." + """
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
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

Loading…
Cancel
Save