Initial merge

zcutil/build-debian-package.sh

@@ -9,6 +9,7 @@ BUILD_PATH="/tmp/zcbuild"
 PACKAGE_NAME="zcash"
 SRC_PATH=`pwd`
 SRC_DEB=$SRC_PATH/contrib/debian
+SRC_DOC=$SRC_PATH/doc
 
 umask 022
 
@@ -45,9 +46,9 @@ cp $SRC_DEB/changelog $DEB_DOC/changelog.Debian
 cp $SRC_DEB/copyright $DEB_DOC
 cp -r $SRC_DEB/examples $DEB_DOC
 # Copy manpages
-cp $SRC_DEB/manpages/zcashd.1 $DEB_MAN
-cp $SRC_DEB/manpages/zcash-cli.1 $DEB_MAN
-cp $SRC_DEB/manpages/zcash-fetch-params.1 $DEB_MAN
+cp $SRC_DOC/man/zcashd.1 $DEB_MAN
+cp $SRC_DOC/man/zcash-cli.1 $DEB_MAN
+cp $SRC_DOC/man/zcash-fetch-params.1 $DEB_MAN
 # Copy bash completion files
 cp $SRC_PATH/contrib/bitcoind.bash-completion $DEB_CMP/zcashd
 cp $SRC_PATH/contrib/bitcoin-cli.bash-completion $DEB_CMP/zcash-cli

zcutil/build.sh

@@ -33,13 +33,19 @@ Usage:
 $0 --help
   Show this help message and exit.
 
-$0 [ --enable-lcov || --disable-tests ] [ MAKEARGS... ]
+$0 [ --enable-lcov || --disable-tests ] [ --disable-mining ] [ --disable-rust ] [ MAKEARGS... ]
   Build Zcash and most of its transitive dependencies from
   source. MAKEARGS are applied to both dependencies and Zcash itself.
 
   If --enable-lcov is passed, Zcash is configured to add coverage
   instrumentation, thus enabling "make cov" to work.
   If --disable-tests is passed instead, the Zcash tests are not built.
+
+  If --disable-mining is passed, Zcash is configured to not build any mining
+  code. It must be passed after the test arguments, if present.
+
+  If --disable-rust is passed, Zcash is configured to not build any Rust language
+  assets. It must be passed after mining/test arguments, if present.
 EOF
     exit 0
 fi
@@ -62,9 +68,25 @@ then
     shift
 fi
 
+# If --disable-mining is the next argument, disable mining code:
+MINING_ARG=''
+if [ "x${1:-}" = 'x--disable-mining' ]
+then
+    MINING_ARG='--enable-mining=no'
+    shift
+fi
+
+# If --disable-rust is the next argument, disable Rust code:
+RUST_ARG=''
+if [ "x${1:-}" = 'x--disable-rust' ]
+then
+    RUST_ARG='--enable-rust=no'
+    shift
+fi
+
 PREFIX="$(pwd)/depends/$BUILD/"
 
-HOST="$HOST" BUILD="$BUILD" "$MAKE" "$@" -C ./depends/ V=1 NO_QT=1
+HOST="$HOST" BUILD="$BUILD" NO_RUST="$RUST_ARG" "$MAKE" "$@" -C ./depends/ V=1
 ./autogen.sh
-CC="$CC" CXX="$CXX" ./configure --prefix="${PREFIX}" --host="$HOST" --build="$BUILD" --with-gui=no "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" CXXFLAGS='-fwrapv -fno-strict-aliasing -Werror -g -fopenmp'
+CC="$CC" CXX="$CXX" ./configure --prefix="${PREFIX}" --host="$HOST" --build="$BUILD" "$RUST_ARG" "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" CXXFLAGS='-fwrapv -fno-strict-aliasing -Werror -g'
 "$MAKE" "$@" V=1

zcutil/fetch-params.sh

@@ -28,7 +28,7 @@ function fetch_params {
             --retry-connrefused --waitretry=3 --timeout=30 \
             "$url"
 
-        "$SHA256CMD" $SHA256ARGS --check <<EOF
+        "$SHA256CMD" $SHA256ARGS -c <<EOF
 $expectedhash  $dlname
 EOF
 

zcutil/release-notes.py

@@ -17,7 +17,7 @@ def apply_author_aliases(name):
         return name
 
 def parse_authors(line):
-    commit_search = re.search('(\d+)', line)
+    commit_search = re.search('\((\d+)\)', line)
     if commit_search:
         commits = commit_search.group(1)
     else:
@@ -70,6 +70,8 @@ def document_authors():
 ## Writes release note to ./doc/release-notes based on git shortlog when current version number is specified
 def generate_release_note(version, filename):
     print "Automatically generating release notes for {0} from git shortlog. Should review {1} for accuracy.".format(version, filename)
+    # fetches latest tags, so that latest_tag will be correct
+    subprocess.Popen(['git fetch -t'], shell=True, stdout=subprocess.PIPE).communicate()[0]
     latest_tag = subprocess.Popen(['git describe --abbrev=0'], shell=True, stdout=subprocess.PIPE).communicate()[0].strip()
     print "Previous release tag: ", latest_tag
     notes = subprocess.Popen(['git shortlog --no-merges {0}..HEAD'.format(latest_tag)], shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE).communicate()[0]