diff --git a/Makefile b/Makefile index dcad1dbb..69798c62 100644 --- a/Makefile +++ b/Makefile @@ -54,6 +54,7 @@ clean-bin: find build -maxdepth 1 -type f -executable -delete clean-deb: + rm -rf build/pkg-defs rm -f build/*.deb clean-images: clean-bin-image clean-deb-image diff --git a/build/docker/deb/build-deb.sh b/build/docker/deb/build-deb.sh index 6dad89cb..e51f88f7 100755 --- a/build/docker/deb/build-deb.sh +++ b/build/docker/deb/build-deb.sh @@ -11,25 +11,26 @@ package=$1 coin=$2 shift 2 -cp -r /src/build/templates . +mkdir build +cp -r /src/build/templates build cp -r /src/configs . -go run templates/generate.go $coin +go run build/templates/generate.go $coin # backend if [ $package = "backend" ] || [ $package = "all" ]; then - (cd pkg-defs/backend && dpkg-buildpackage -us -uc $@) + (cd build/pkg-defs/backend && dpkg-buildpackage -us -uc $@) fi # blockbook if [ $package = "blockbook" ] || [ $package = "all" ]; then - export VERSION=$(cd pkg-defs/blockbook && dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)([-+~].+)?$/\1/p') + export VERSION=$(cd build/pkg-defs/blockbook && dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)([-+~].+)?$/\1/p') - cp Makefile ldb sst_dump pkg-defs/blockbook - cp -r /src/static pkg-defs/blockbook - mkdir pkg-defs/blockbook/cert && cp /src/server/testcert.* pkg-defs/blockbook/cert - (cd pkg-defs/blockbook && dpkg-buildpackage -us -uc $@) + cp Makefile ldb sst_dump build/pkg-defs/blockbook + cp -r /src/static build/pkg-defs/blockbook + mkdir build/pkg-defs/blockbook/cert && cp /src/server/testcert.* build/pkg-defs/blockbook/cert + (cd build/pkg-defs/blockbook && dpkg-buildpackage -us -uc $@) fi # copy packages -mv pkg-defs/*.deb /out +mv build/pkg-defs/*.deb /out chown $PACKAGER /out/*.deb diff --git a/build/templates/generate.go b/build/templates/generate.go index aa4bc8e3..31615781 100644 --- a/build/templates/generate.go +++ b/build/templates/generate.go @@ -11,8 +11,8 @@ import ( ) const ( - inputDir = "templates" - outputDir = "pkg-defs" + inputDir = "build/templates" + outputDir = "build/pkg-defs" ) type Config struct {