Stop using hidden directory for build

Now that we no longer dump a bunch of goo into our .build directory, we
can go back to using the more standard "build" directory.

FAB-16647 #done

Change-Id: I9ac582e9601565b609789c78cb7282c65eeaf115
Signed-off-by: Matthew Sykes <[email protected]>

Author: sykesm

.gitignore

@@ -1,46 +1,27 @@
 #SPDX-License-Identifier: Apache-2.0
-
-# Local build binaries
-node-cli/node-cli
-*.pyc
-/bin
-docs/build/*
-.idea
-*.iml
-.DS_Store
-tags
-.tags
-.vagrant/
-/.build
-build/
-/release/darwin-amd64
-/release/linux-amd64
-/release/linux-s390x
-/release/linux-ppc64le
-/release/windows-amd64
-# Emacs backup files
+.#*
 *~
 *#
-.#*
-# Vim file artifacts
-.*.sw*
-# Makefile dummy artifacts
+/bin
+/build
+/.build
+*.cov
+/docs/build/*
+.DS_Store
 .*-dummy
-# log files
+.gradle
+.idea
+*.iml
 *.log
-# code coverage
-*.cov
-go-carpet-coverage*
-# Test result xml files
+.project
+/release
 report.xml
 results.xml
-TESTS*.xml
 .settings
-.project
-.gradle
-bin/
-# tox
+.*.sw*
+tags
+.tags
+TESTS*.xml
 .tox/
-# vscode settings
+.vagrant/
 .vscode
-maven_data.xml

Makefile

@@ -54,7 +54,7 @@ COUCHDB_VER ?= 2.3
 .SUFFIXES:
 MAKEFLAGS += --no-builtin-rules
 
-BUILD_DIR ?= .build
+BUILD_DIR ?= build
 NEXUS_REPO = nexus3.hyperledger.org:10001/hyperledger
 
 EXTRA_VERSION ?= $(shell git rev-parse --short HEAD)

images/orderer/Dockerfile

@@ -25,7 +25,7 @@ FROM base
 ENV FABRIC_CFG_PATH /etc/hyperledger/fabric
 VOLUME /etc/hyperledger/fabric
 VOLUME /var/hyperledger
-COPY --from=orderer /go/src/github.com/hyperledger/fabric/.build/bin /usr/local/bin
+COPY --from=orderer /go/src/github.com/hyperledger/fabric/build/bin /usr/local/bin
 COPY --from=orderer /go/src/github.com/hyperledger/fabric/sampleconfig/msp ${FABRIC_CFG_PATH}/msp
 COPY --from=orderer /go/src/github.com/hyperledger/fabric/sampleconfig/orderer.yaml ${FABRIC_CFG_PATH}
 COPY --from=orderer /go/src/github.com/hyperledger/fabric/sampleconfig/configtx.yaml ${FABRIC_CFG_PATH}

images/peer/Dockerfile

@@ -26,7 +26,7 @@ FROM peer-base
 ENV FABRIC_CFG_PATH /etc/hyperledger/fabric
 VOLUME /etc/hyperledger/fabric
 VOLUME /var/hyperledger
-COPY --from=peer /go/src/github.com/hyperledger/fabric/.build/bin /usr/local/bin
+COPY --from=peer /go/src/github.com/hyperledger/fabric/build/bin /usr/local/bin
 COPY --from=peer /go/src/github.com/hyperledger/fabric/sampleconfig/msp ${FABRIC_CFG_PATH}/msp
 COPY --from=peer /go/src/github.com/hyperledger/fabric/sampleconfig/core.yaml ${FABRIC_CFG_PATH}
 EXPOSE 7051

images/tools/Dockerfile

@@ -28,5 +28,5 @@ RUN apk add --no-cache \
 	tzdata;
 ENV FABRIC_CFG_PATH /etc/hyperledger/fabric
 VOLUME /etc/hyperledger/fabric
-COPY --from=tools /go/src/github.com/hyperledger/fabric/.build/bin /usr/local/bin
+COPY --from=tools /go/src/github.com/hyperledger/fabric/build/bin /usr/local/bin
 COPY --from=tools /go/src/github.com/hyperledger/fabric/sampleconfig ${FABRIC_CFG_PATH}

scripts/compile_protos.sh

@@ -10,7 +10,7 @@ set -eux -o pipefail
 # Find all proto dirs to be processed
 PROTO_DIRS="$(find "$(pwd)" \
     -path "$(pwd)/vendor" -prune -o \
-    -path "$(pwd)/.build" -prune -o \
+    -path "$(pwd)/build" -prune -o \
     -name '*.proto' -print0 | \
     xargs -0 -n 1 dirname | \
     sort -u | grep -v testdata)"

scripts/functions.sh

@@ -9,12 +9,14 @@ function filterExcludedAndGeneratedFiles {
     excluded_files=(
         '\.block$'
         '^\.build/'
+        '^build/'
         '(^|/)ci\.properties$'
         '(^|/)\.git/'
         '\.gen\.go$'
         '(^|/)go.mod$'
         '(^|/)go.sum$'
         '(^|/)Gopkg\.lock$'
+        '\.json$'
         '\.key$'
         '(^|/)LICENSE$'
         '\.md$'
@@ -28,7 +30,6 @@ function filterExcludedAndGeneratedFiles {
         '\.txt$'
         '(^|/)testdata\/'
         '(^|/)vendor\/'
-        '\.json$'
         '(^|/)Pipfile$'
         '(^|/)Pipfile\.lock$'
     )

scripts/generateHelpDocs.sh

@@ -4,7 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-PATH=.build/bin/:${PATH}
+PATH=build/bin/:${PATH}
 
 # Takes in 4 arguments
 # 1. Output doc file

scripts/golinter.sh

@@ -11,8 +11,8 @@ source "$(cd "$(dirname "$0")" && pwd)/functions.sh"
 
 # place the Go build cache directory into the default build tree if it exists
 base_dir="$(cd "$(dirname "$0")/.." && pwd)"
-if [ -d "${base_dir}/.build" ]; then
-    export GOCACHE="${base_dir}/.build/go-cache"
+if [ -d "${base_dir}/build" ]; then
+    export GOCACHE="${base_dir}/build/go-cache"
 fi
 
 fabric_dir="$(cd "$(dirname "$0")/.." && pwd)"

scripts/run-unit-tests.sh

@@ -176,8 +176,8 @@ run_tests_with_coverage() {
 
 main() {
     # place the cache directory into the default build tree if it exists
-    if [ -d "${base_dir}/.build" ]; then
-        export GOCACHE="${base_dir}/.build/go-cache"
+    if [ -d "${base_dir}/build" ]; then
+        export GOCACHE="${base_dir}/build/go-cache"
     fi
 
     # explicit exclusions for ppc and s390x