Skip to content

Commit

Permalink
Update build docs that refer to old makefile.* files.
Browse files Browse the repository at this point in the history
Also update pull-tester's error message.
  • Loading branch information
brandondahler committed Nov 11, 2013
1 parent 16d5f2c commit 2b91707
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 19 deletions.
6 changes: 4 additions & 2 deletions doc/build-msw.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 10 additions & 16 deletions doc/build-osx.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
----------------------
Expand Down Expand Up @@ -89,22 +90,15 @@ Rerunning "openssl version" should now return the correct version.
git clone [email protected]: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
------------------------
Expand Down
2 changes: 1 addition & 1 deletion qa/pull-tester/pull-tester.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def commentOn(commentUrl, success, inMerge, needTests, linkUrl):
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
Expand Down

0 comments on commit 2b91707

Please sign in to comment.