From a4c36fe96a2d06da8f18a8889a22e6274c50dfd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caner=20=C3=87=C4=B1dam?= Date: Fri, 9 Feb 2018 16:38:18 +0300 Subject: [PATCH] Move non-go related files to the `_assets` folder. #621 (#630) --- Makefile | 27 ++++++++++--------- Dockerfile => _assets/build/Dockerfile | 0 {build => _assets/build}/mainnet-flags.sh | 2 +- {build => _assets/build}/testnet-flags.sh | 2 +- {xgo => _assets/build/xgo}/base/Dockerfile | 0 {xgo => _assets/build/xgo}/base/build.sh | 0 .../build/xgo}/ios-simulator/Dockerfile | 0 .../build/xgo}/ios-simulator/update_ios.sh | 0 Jenkinsfile => _assets/ci/Jenkinsfile | 0 .../ci/Jenkinsfile-manual | 0 {ci => _assets/ci}/validate-vendor.sh | 0 .../metrics-collector/config.grafana.env | 0 .../metrics-collector/docker-compose.yml | 0 .../prometheus/prometheus.yml | 0 .../compose}/wnode-test-cluster/README.md | 0 .../wnode-test-cluster/docker-compose.yml | 0 .../docs/DEPENDENCIES.md | 0 .../package-lock.json | 0 package.json => _assets/package.json | 0 .../patches/geth}/0000-accounts-hd-keys.patch | 0 .../patches/geth}/0002-les-api-status.patch | 0 .../geth}/0003-dockerfiles-wnode-swarm.patch | 0 .../geth}/0004-whisper-notifications.patch | 0 .../patches/geth}/0006-latest-cht.patch | 0 .../patches/geth}/0007-README.patch | 0 .../0009-whisper-envelopes-tracing.patch | 0 ...010-geth-17-fix-npe-in-filter-system.patch | 0 .../patches/geth}/README.md | 2 +- patcher => _assets/patches/patcher | 2 +- 29 files changed, 19 insertions(+), 16 deletions(-) rename Dockerfile => _assets/build/Dockerfile (100%) rename {build => _assets/build}/mainnet-flags.sh (87%) rename {build => _assets/build}/testnet-flags.sh (87%) rename {xgo => _assets/build/xgo}/base/Dockerfile (100%) rename {xgo => _assets/build/xgo}/base/build.sh (100%) rename {xgo => _assets/build/xgo}/ios-simulator/Dockerfile (100%) rename {xgo => _assets/build/xgo}/ios-simulator/update_ios.sh (100%) rename Jenkinsfile => _assets/ci/Jenkinsfile (100%) rename Jenkinsfile-manual => _assets/ci/Jenkinsfile-manual (100%) rename {ci => _assets/ci}/validate-vendor.sh (100%) rename {docker => _assets/compose}/metrics-collector/config.grafana.env (100%) rename {docker => _assets/compose}/metrics-collector/docker-compose.yml (100%) rename {docker => _assets/compose}/metrics-collector/prometheus/prometheus.yml (100%) rename {docker => _assets/compose}/wnode-test-cluster/README.md (100%) rename {docker => _assets/compose}/wnode-test-cluster/docker-compose.yml (100%) rename DEPENDENCIES.md => _assets/docs/DEPENDENCIES.md (100%) rename package-lock.json => _assets/package-lock.json (100%) rename package.json => _assets/package.json (100%) rename {geth-patches => _assets/patches/geth}/0000-accounts-hd-keys.patch (100%) rename {geth-patches => _assets/patches/geth}/0002-les-api-status.patch (100%) rename {geth-patches => _assets/patches/geth}/0003-dockerfiles-wnode-swarm.patch (100%) rename {geth-patches => _assets/patches/geth}/0004-whisper-notifications.patch (100%) rename {geth-patches => _assets/patches/geth}/0006-latest-cht.patch (100%) rename {geth-patches => _assets/patches/geth}/0007-README.patch (100%) rename {geth-patches => _assets/patches/geth}/0009-whisper-envelopes-tracing.patch (100%) rename {geth-patches => _assets/patches/geth}/0010-geth-17-fix-npe-in-filter-system.patch (100%) rename {geth-patches => _assets/patches/geth}/README.md (97%) rename patcher => _assets/patches/patcher (97%) diff --git a/Makefile b/Makefile index e05125f51..29f8573ee 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ HELP_FUN = \ } statusgo: ##@build Build status-go as statusd server - go build -i -o $(GOBIN)/statusd -v -tags '$(BUILD_TAGS)' $(shell build/testnet-flags.sh) ./cmd/statusd + go build -i -o $(GOBIN)/statusd -v -tags '$(BUILD_TAGS)' $(shell _assets/build/testnet-flags.sh) ./cmd/statusd @echo "Compilation done." @echo "Run \"build/bin/statusd -h\" to view available commands." @@ -52,16 +52,16 @@ statusgo-cross: statusgo-android statusgo-ios @ls -ld $(GOBIN)/statusgo-* statusgo-android: xgo ##@cross-compile Build status-go for Android - $(GOPATH)/bin/xgo --image $(XGOIMAGE) --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=android-16/aar -v -tags '$(BUILD_TAGS)' $(shell build/testnet-flags.sh) ./lib + $(GOPATH)/bin/xgo --image $(XGOIMAGE) --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=android-16/aar -v -tags '$(BUILD_TAGS)' $(shell _assets/build/testnet-flags.sh) ./lib @echo "Android cross compilation done." statusgo-ios: xgo ##@cross-compile Build status-go for iOS - $(GOPATH)/bin/xgo --image $(XGOIMAGE) --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=ios-9.3/framework -v -tags '$(BUILD_TAGS)' $(shell build/testnet-flags.sh) ./lib + $(GOPATH)/bin/xgo --image $(XGOIMAGE) --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=ios-9.3/framework -v -tags '$(BUILD_TAGS)' $(shell _assets/build/testnet-flags.sh) ./lib @echo "iOS framework cross compilation done." statusgo-ios-simulator: xgo ##@cross-compile Build status-go for iOS Simulator @docker pull $(XGOIMAGEIOSSIM) - $(GOPATH)/bin/xgo --image $(XGOIMAGEIOSSIM) --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=ios-9.3/framework -v -tags '$(BUILD_TAGS)' $(shell build/testnet-flags.sh) ./lib + $(GOPATH)/bin/xgo --image $(XGOIMAGEIOSSIM) --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=ios-9.3/framework -v -tags '$(BUILD_TAGS)' $(shell _assets/build/testnet-flags.sh) ./lib @echo "iOS framework cross compilation done." statusgo-library: ##@cross-compile Build status-go as static library for current platform @@ -72,32 +72,32 @@ statusgo-library: ##@cross-compile Build status-go as static library for current docker-image: ##@docker Build docker image (use DOCKER_IMAGE_NAME to set the image name) @echo "Building docker image..." - docker build --build-arg "build_tags=$(BUILD_TAGS)" . -t $(DOCKER_IMAGE_NAME) + docker build --file _assets/build/Dockerfile --build-arg "build_tags=$(BUILD_TAGS)" . -t $(DOCKER_IMAGE_NAME) xgo-docker-images: ##@docker Build xgo docker images @echo "Building xgo docker images..." - docker build xgo/base -t $(XGOIMAGE) - docker build xgo/ios-simulator -t $(XGOIMAGEIOSSIM) + docker build _assets/build/xgo/base -t $(XGOIMAGE) + docker build _assets/build/xgo/ios-simulator -t $(XGOIMAGEIOSSIM) xgo: docker pull $(XGOIMAGE) go get github.com/karalabe/xgo statusgo-mainnet: - go build -i -o $(GOBIN)/statusgo -v $(shell build/mainnet-flags.sh) ./cmd/statusd + go build -i -o $(GOBIN)/statusgo -v $(shell _assets/build/mainnet-flags.sh) ./cmd/statusd @echo "status go compilation done (mainnet)." @echo "Run \"build/bin/statusgo\" to view available commands" statusgo-android-mainnet: xgo - $(GOPATH)/bin/xgo --image $(XGOIMAGE) --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=android-16/aar -v $(shell build/mainnet-flags.sh) ./lib + $(GOPATH)/bin/xgo --image $(XGOIMAGE) --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=android-16/aar -v $(shell _assets/build/mainnet-flags.sh) ./lib @echo "Android cross compilation done (mainnet)." statusgo-ios-mainnet: xgo - $(GOPATH)/bin/xgo --image $(XGOIMAGE) --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=ios-9.3/framework -v $(shell build/mainnet-flags.sh) ./lib + $(GOPATH)/bin/xgo --image $(XGOIMAGE) --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=ios-9.3/framework -v $(shell _assets/build/mainnet-flags.sh) ./lib @echo "iOS framework cross compilation done (mainnet)." statusgo-ios-simulator-mainnet: xgo - $(GOPATH)/bin/xgo --image $(XGOIMAGEIOSSIM) --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=ios-9.3/framework -v $(shell build/mainnet-flags.sh) ./lib + $(GOPATH)/bin/xgo --image $(XGOIMAGEIOSSIM) --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=ios-9.3/framework -v $(shell _assets/build/mainnet-flags.sh) ./lib @echo "iOS framework cross compilation done (mainnet)." generate: ##@other Regenerate assets and other auto-generated stuff @@ -155,7 +155,10 @@ deep-clean: clean vendor-check: @dep ensure - ./ci/validate-vendor.sh + ./_assets/ci/validate-vendor.sh dep-install: go get -u github.com/golang/dep/cmd/dep + +patch: + ./_assets/patches/patcher diff --git a/Dockerfile b/_assets/build/Dockerfile similarity index 100% rename from Dockerfile rename to _assets/build/Dockerfile diff --git a/build/mainnet-flags.sh b/_assets/build/mainnet-flags.sh similarity index 87% rename from build/mainnet-flags.sh rename to _assets/build/mainnet-flags.sh index 893dfe26a..d053e24d9 100755 --- a/build/mainnet-flags.sh +++ b/_assets/build/mainnet-flags.sh @@ -2,7 +2,7 @@ set -e -if [ ! -f "build/mainnet-flags.sh" ]; then +if [ ! -f "_assets/build/mainnet-flags.sh" ]; then echo "$0 must be run from the root of the repository." exit 2 fi diff --git a/build/testnet-flags.sh b/_assets/build/testnet-flags.sh similarity index 87% rename from build/testnet-flags.sh rename to _assets/build/testnet-flags.sh index bd8c74bee..3d6f37eed 100755 --- a/build/testnet-flags.sh +++ b/_assets/build/testnet-flags.sh @@ -2,7 +2,7 @@ set -e -if [ ! -f "build/testnet-flags.sh" ]; then +if [ ! -f "_assets/build/testnet-flags.sh" ]; then echo "$0 must be run from the root of the repository." exit 2 fi diff --git a/xgo/base/Dockerfile b/_assets/build/xgo/base/Dockerfile similarity index 100% rename from xgo/base/Dockerfile rename to _assets/build/xgo/base/Dockerfile diff --git a/xgo/base/build.sh b/_assets/build/xgo/base/build.sh similarity index 100% rename from xgo/base/build.sh rename to _assets/build/xgo/base/build.sh diff --git a/xgo/ios-simulator/Dockerfile b/_assets/build/xgo/ios-simulator/Dockerfile similarity index 100% rename from xgo/ios-simulator/Dockerfile rename to _assets/build/xgo/ios-simulator/Dockerfile diff --git a/xgo/ios-simulator/update_ios.sh b/_assets/build/xgo/ios-simulator/update_ios.sh similarity index 100% rename from xgo/ios-simulator/update_ios.sh rename to _assets/build/xgo/ios-simulator/update_ios.sh diff --git a/Jenkinsfile b/_assets/ci/Jenkinsfile similarity index 100% rename from Jenkinsfile rename to _assets/ci/Jenkinsfile diff --git a/Jenkinsfile-manual b/_assets/ci/Jenkinsfile-manual similarity index 100% rename from Jenkinsfile-manual rename to _assets/ci/Jenkinsfile-manual diff --git a/ci/validate-vendor.sh b/_assets/ci/validate-vendor.sh similarity index 100% rename from ci/validate-vendor.sh rename to _assets/ci/validate-vendor.sh diff --git a/docker/metrics-collector/config.grafana.env b/_assets/compose/metrics-collector/config.grafana.env similarity index 100% rename from docker/metrics-collector/config.grafana.env rename to _assets/compose/metrics-collector/config.grafana.env diff --git a/docker/metrics-collector/docker-compose.yml b/_assets/compose/metrics-collector/docker-compose.yml similarity index 100% rename from docker/metrics-collector/docker-compose.yml rename to _assets/compose/metrics-collector/docker-compose.yml diff --git a/docker/metrics-collector/prometheus/prometheus.yml b/_assets/compose/metrics-collector/prometheus/prometheus.yml similarity index 100% rename from docker/metrics-collector/prometheus/prometheus.yml rename to _assets/compose/metrics-collector/prometheus/prometheus.yml diff --git a/docker/wnode-test-cluster/README.md b/_assets/compose/wnode-test-cluster/README.md similarity index 100% rename from docker/wnode-test-cluster/README.md rename to _assets/compose/wnode-test-cluster/README.md diff --git a/docker/wnode-test-cluster/docker-compose.yml b/_assets/compose/wnode-test-cluster/docker-compose.yml similarity index 100% rename from docker/wnode-test-cluster/docker-compose.yml rename to _assets/compose/wnode-test-cluster/docker-compose.yml diff --git a/DEPENDENCIES.md b/_assets/docs/DEPENDENCIES.md similarity index 100% rename from DEPENDENCIES.md rename to _assets/docs/DEPENDENCIES.md diff --git a/package-lock.json b/_assets/package-lock.json similarity index 100% rename from package-lock.json rename to _assets/package-lock.json diff --git a/package.json b/_assets/package.json similarity index 100% rename from package.json rename to _assets/package.json diff --git a/geth-patches/0000-accounts-hd-keys.patch b/_assets/patches/geth/0000-accounts-hd-keys.patch similarity index 100% rename from geth-patches/0000-accounts-hd-keys.patch rename to _assets/patches/geth/0000-accounts-hd-keys.patch diff --git a/geth-patches/0002-les-api-status.patch b/_assets/patches/geth/0002-les-api-status.patch similarity index 100% rename from geth-patches/0002-les-api-status.patch rename to _assets/patches/geth/0002-les-api-status.patch diff --git a/geth-patches/0003-dockerfiles-wnode-swarm.patch b/_assets/patches/geth/0003-dockerfiles-wnode-swarm.patch similarity index 100% rename from geth-patches/0003-dockerfiles-wnode-swarm.patch rename to _assets/patches/geth/0003-dockerfiles-wnode-swarm.patch diff --git a/geth-patches/0004-whisper-notifications.patch b/_assets/patches/geth/0004-whisper-notifications.patch similarity index 100% rename from geth-patches/0004-whisper-notifications.patch rename to _assets/patches/geth/0004-whisper-notifications.patch diff --git a/geth-patches/0006-latest-cht.patch b/_assets/patches/geth/0006-latest-cht.patch similarity index 100% rename from geth-patches/0006-latest-cht.patch rename to _assets/patches/geth/0006-latest-cht.patch diff --git a/geth-patches/0007-README.patch b/_assets/patches/geth/0007-README.patch similarity index 100% rename from geth-patches/0007-README.patch rename to _assets/patches/geth/0007-README.patch diff --git a/geth-patches/0009-whisper-envelopes-tracing.patch b/_assets/patches/geth/0009-whisper-envelopes-tracing.patch similarity index 100% rename from geth-patches/0009-whisper-envelopes-tracing.patch rename to _assets/patches/geth/0009-whisper-envelopes-tracing.patch diff --git a/geth-patches/0010-geth-17-fix-npe-in-filter-system.patch b/_assets/patches/geth/0010-geth-17-fix-npe-in-filter-system.patch similarity index 100% rename from geth-patches/0010-geth-17-fix-npe-in-filter-system.patch rename to _assets/patches/geth/0010-geth-17-fix-npe-in-filter-system.patch diff --git a/geth-patches/README.md b/_assets/patches/geth/README.md similarity index 97% rename from geth-patches/README.md rename to _assets/patches/geth/README.md index 746b1de0f..796916fe2 100644 --- a/geth-patches/README.md +++ b/_assets/patches/geth/README.md @@ -40,7 +40,7 @@ In our case `` would be `release/1.7` because the current stable 3. Apply patches ```bash -for patch in $GOPATH/src/github.com/status-im/status-go/geth-patches/*.patch; +for patch in $GOPATH/src/github.com/status-im/status-go/_assets/patches/geth/*.patch; do patch -p1 < $patch; done diff --git a/patcher b/_assets/patches/patcher similarity index 97% rename from patcher rename to _assets/patches/patcher index 3a916e337..b9fa301e9 100755 --- a/patcher +++ b/_assets/patches/patcher @@ -13,7 +13,7 @@ # # If -p is not present, default path is as below ($basepath). -patches=($(pwd)/geth-patches/*.patch) +patches=($(pwd)/_assets/patches/geth/*.patch) # Base path is vendor/github.com/ethereum/go-ethereum # unless specified.