diff options
| author | p2k <patrick.p2k.schneider@gmail.com> | 2012-01-19 21:45:49 +0100 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-02-06 09:33:12 -0500 |
| commit | f118b5fc5d4376bb314687d8d272e39bb95f8291 (patch) | |
| tree | 68e6485a887536ff6834eaf2ef9610e917214aaa /doc | |
| parent | f69b82e78a16ea2ab124663414e6b2902b1b05e0 (diff) | |
| download | bitcoin-f118b5fc5d4376bb314687d8d272e39bb95f8291.tar.xz | |
miniupnpc Porfile removed; new and improved macdeployqtplus
* My patch for miniupnpc has made it into the latest MacPorts release: https://trac.macports.org/ticket/31354
* Documentation has been changed appropriately
* New pure-Python macdeployqt; leverages all problems with the stock macdeployqt
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/build-osx.txt | 7 | ||||
| -rw-r--r-- | doc/readme-qt.rst | 10 | ||||
| -rw-r--r-- | doc/release-process.txt | 7 |
3 files changed, 6 insertions, 18 deletions
diff --git a/doc/build-osx.txt b/doc/build-osx.txt index d47febe94b..8d89745679 100644 --- a/doc/build-osx.txt +++ b/doc/build-osx.txt @@ -36,12 +36,7 @@ git clone git@github.com:bitcoin/bitcoin.git bitcoin 3. Install dependencies from MacPorts -sudo port install boost db48 openssl - -Install the right version of miniupnpc: -pushd bitcoin/contrib/minipupnpc; sudo port install; popd -(this will be unnecessary soon, you will just port install miniupnpc -along with the rest of the dependencies). +sudo port install boost db48 openssl miniupnpc Optionally install qrencode (and set USE_QRCODE=1): sudo port install qrencode diff --git a/doc/readme-qt.rst b/doc/readme-qt.rst index 090177321e..8fce96bb07 100644 --- a/doc/readme-qt.rst +++ b/doc/readme-qt.rst @@ -92,7 +92,7 @@ Mac OS X :: sudo port selfupdate - sudo port install boost db48 + sudo port install boost db48 miniupnpc - Open the .pro file in Qt Creator and build as normal (cmd-B) @@ -127,14 +127,6 @@ Set USE_UPNP to a different value to control this: | USE_UPNP=1 | build with UPnP support turned on by default at runtime. | +------------+--------------------------------------------------------------------------+ -Mac OS X users: miniupnpc is currently outdated on MacPorts. An updated Portfile is provided in contrib/miniupnpc within this project. -You can execute the following commands in a terminal to install it: - -:: - - cd <location of bitcoin-qt>/contrib/miniupnpc - sudo port install - Notification support for recent (k)ubuntu versions --------------------------------------------------- diff --git a/doc/release-process.txt b/doc/release-process.txt index 3f1a6a5fb7..7d9770d9c4 100644 --- a/doc/release-process.txt +++ b/doc/release-process.txt @@ -67,14 +67,15 @@ rm -rf bitcoin-${VERSION}-win32 * perform Mac build - See this blog post for how Gavin set up his build environment and - patched macdeployqt to build the OSX release: + See this blog post for how Gavin set up his build environment to build the OSX + release; note that a patched version of macdeployqt is not needed anymore, as + the required functionality and fixes are implemented directly in macdeployqtplus: http://gavintech.blogspot.com/2011/11/deploying-bitcoin-qt-on-osx.html qmake USE_SSL=1 USE_UPNP=1 bitcoin-qt.pro make export QTDIR=/opt/local/share/qt4 # needed to find translations/qt_*.qm files T=$(contrib/qt_translations.py $QTDIR/translations src/qt/locale) - contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr $T -dmg -fancy contrib/macdeploy/fancy.plist + contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr $T -dmg -fancy contrib/macdeploy/fancy.plist Build output expected: Bitcoin-Qt.dmg |