diff options
| -rw-r--r-- | README.md | 26 | ||||
| -rw-r--r-- | contrib/gitian.yml | 6 | ||||
| -rw-r--r-- | contrib/wxwidgets.yml | 4 | ||||
| -rw-r--r-- | locale/readme.txt | 2 | ||||
| -rw-r--r-- | src/ui.cpp | 4 |
5 files changed, 32 insertions, 10 deletions
@@ -1,16 +1,30 @@ + Bitcoin integration/staging tree Development process =================== -Developers work in their own trees, then submit pull requests when they think their feature or bug fix is ready. +Developers work in their own trees, then submit pull requests when +they think their feature or bug fix is ready. + +If it is a simple/trivial/non-controversial change, then one of the +bitcoin development team members simply pulls it. -If it is a simple/trivial/non-controversial change, then one of the bitcoin development team members simply pulls it. +If it is a more complicated or potentially controversial +change, then the patch submitter will be asked to start a +discussion (if they haven't already) on the mailing list: +http://sourceforge.net/mailarchive/forum.php?forum_name=bitcoin-development -If it is a more complicated or potentially controversial change, then the patch submitter will be asked to start a discussion (if they haven't already) on the development forums: http://www.bitcoin.org/smf/index.php?board=6.0 -The patch will be accepted if there is broad consensus that it is a good thing. Developers should expect to rework and resubmit patches if they don't match the project's coding conventions (see coding.txt) or are controversial. +The patch will be accepted if there is broad consensus that it is a +good thing. Developers should expect to rework and resubmit patches +if they don't match the project's coding conventions (see coding.txt) +or are controversial. -The master branch is regularly built and tested (by who? need people willing to be quality assurance testers), and periodically pushed to the subversion repo to become the official, stable, released bitcoin. +The master branch is regularly built and tested, but is not guaranteed +to be completely stable. Tags are regularly created to indicate new +official, stable release versions of Bitcoin. If you would like to +help test the Bitcoin core, please contact QA@Bitcoin.org. +Feature branches are created when there are major new features being +worked on by several people. -Feature branches are created when there are major new features being worked on by several people. diff --git a/contrib/gitian.yml b/contrib/gitian.yml index 9f03ba1bc4..8d0abf8994 100644 --- a/contrib/gitian.yml +++ b/contrib/gitian.yml @@ -18,7 +18,8 @@ remotes: - "url": "https://github.com/bitcoin/bitcoin.git" "dir": "bitcoin" files: -- "wxWidgets-2.9.2-gitian.zip" +- "wxWidgets-2.9.2-x64-gitian.zip" +- "wxWidgets-2.9.2-x32-gitian.zip" - "miniupnpc-1.6.tar.gz" script: | INSTDIR="$HOME/install" @@ -32,7 +33,8 @@ script: | mkdir -p $INSTDIR/bin $INSTDIR/lib/wx $INSTDIR/include mkdir wxWidgets-2.9.2 cd wxWidgets-2.9.2 - unzip ../wxWidgets-2.9.2-gitian.zip + unzip ../wxWidgets-2.9.2-x32-gitian.zip + unzip -f ../wxWidgets-2.9.2-x64-gitian.zip cp -a bin/$GBUILD_BITS/wx/config/gtk2-unicode-static-2.9 $INSTDIR/bin/wx-config for lib in wx_gtk2u wxregexu wxtiff; do ar rc $INSTDIR/lib/lib${lib}-2.9.a bin/$GBUILD_BITS/$lib/*.o diff --git a/contrib/wxwidgets.yml b/contrib/wxwidgets.yml index a2406936d3..0509615101 100644 --- a/contrib/wxwidgets.yml +++ b/contrib/wxwidgets.yml @@ -38,5 +38,5 @@ script: | cd $TMPDIR export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME - zip -r wxWidgets-2.9.2-gitian.zip * - cp wxWidgets-2.9.2-gitian.zip $OUTDIR + zip -r wxWidgets-2.9.2-x$GBUILD_BITS-gitian.zip * + cp wxWidgets-2.9.2-x$GBUILD_BITS-gitian.zip $OUTDIR diff --git a/locale/readme.txt b/locale/readme.txt index 9fca3ce657..4019bf43c9 100644 --- a/locale/readme.txt +++ b/locale/readme.txt @@ -3,3 +3,5 @@ locale/<langcode>/LC_MESSAGES/bitcoin.mo and .po .po is the sourcefile
.mo is the compiled translation
+
+Note: pull requests should only include the .po file. Do not include .mo file
\ No newline at end of file diff --git a/src/ui.cpp b/src/ui.cpp index 198a27209a..6b7ecdbc8d 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -1805,7 +1805,11 @@ void SetStartOnSystemStartup(bool fAutoStart) { if (!fAutoStart) { +#if defined(BOOST_FILESYSTEM_VERSION) && BOOST_FILESYSTEM_VERSION >= 3 + unlink(GetAutostartFilePath().string().c_str()); +#else unlink(GetAutostartFilePath().native_file_string().c_str()); +#endif } else { |