Merge pull request #21 from MasterNodesPro/GitianBuilder

Gitian Builder Fixes
MasterNodesPro · Jan 22, 2019 · a82e8b0 · a82e8b0
2 parents f0748b9 + 8e3af8d
commit a82e8b0
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 53 deletions.
diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh
@@ -17,7 +17,7 @@ osx=true
 SIGNER=
 VERSION=
 commit=false
-url=https://github.com/mnpcoin/mnpcoin
+url=https://github.com/MasterNodesPro/MNPCoin
 proc=2
 mem=2000
 lxc=true
@@ -31,15 +31,15 @@ commitFiles=true
 read -d '' usage <<- EOF
 Usage: $scriptName [-c|u|v|b|s|B|o|h|j|m|] signer version
 
-Run this script from the directory containing the mnpcoin, gitian-builder, gitian.sigs, and mnpcoin-detached-sigs.
+Run this script from the directory containing the MNPCoin, gitian-builder, gitian.sigs, and MNPCoin-detached-sigs.
 
 Arguments:
 signer          GPG signer to sign each build assert file
 version		Version number, commit, or branch to build. If building a commit or branch, the -c option must be specified
 
 Options:
 -c|--commit	Indicate that the version argument is for a commit or branch
--u|--url	Specify the URL of the repository. Default is https://github.com/mnpcoin/mnpcoin
+-u|--url	Specify the URL of the repository. Default is $url
 -v|--verify 	Verify the gitian build
 -b|--build	Do a gitian build
 -s|--sign	Make signed binaries for Windows and Mac OSX
@@ -237,8 +237,8 @@ echo ${COMMIT}
 if [[ $setup = true ]]
 then
     sudo apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm qemu-utils
-    git clone https://github.com/mnpcoin/gitian.sigs.git
-    git clone https://github.com/mnpcoin/mnpcoin-detached-sigs.git
+    git clone https://github.com/MasterNodesPro/gitian.sigs.git
+    git clone https://github.com/MasterNodesPro/MNPCoin-detached-sigs.git
     git clone https://github.com/devrandom/gitian-builder.git
     pushd ./gitian-builder
     if [[ -n "$USE_LXC" ]]
@@ -252,7 +252,7 @@ then
 fi
 
 # Set up build
-pushd ./mnpcoin
+pushd ./MNPCoin
 git fetch
 git checkout ${COMMIT}
 popd
@@ -261,7 +261,7 @@ popd
 if [[ $build = true ]]
 then
 	# Make output folder
-	mkdir -p ./mnpcoin-binaries/${VERSION}
+	mkdir -p ./MNPCoin-binaries/${VERSION}
 
 	# Build Dependencies
 	echo ""
@@ -271,49 +271,49 @@ then
 	mkdir -p inputs
 	wget -N -P inputs $osslPatchUrl
 	wget -N -P inputs $osslTarUrl
-	make -C ../mnpcoin/depends download SOURCES_PATH=`pwd`/cache/common
+	make -C ../MNPCoin/depends download SOURCES_PATH=`pwd`/cache/common
 
 	# Linux
 	if [[ $linux = true ]]
 	then
             echo ""
 	    echo "Compiling ${VERSION} Linux"
 	    echo ""
-	    ./bin/gbuild -j ${proc} -m ${mem} --commit mnpcoin=${COMMIT} --url mnpcoin=${url} ../mnpcoin/contrib/gitian-descriptors/gitian-linux.yml
-	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../mnpcoin/contrib/gitian-descriptors/gitian-linux.yml
-	    mv build/out/mnpcoin-*.tar.gz build/out/src/mnpcoin-*.tar.gz ../mnpcoin-binaries/${VERSION}
+	    ./bin/gbuild -j ${proc} -m ${mem} --commit MNPCoin=${COMMIT} --url MNPCoin=${url} ../MNPCoin/contrib/gitian-descriptors/gitian-linux.yml
+	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../MNPCoin/contrib/gitian-descriptors/gitian-linux.yml
+	    mv build/out/MNPCoin-*.tar.gz build/out/src/MNPCoin-*.tar.gz ../MNPCoin-binaries/${VERSION}
 	fi
 	# Windows
 	if [[ $windows = true ]]
 	then
 	    echo ""
 	    echo "Compiling ${VERSION} Windows"
 	    echo ""
-	    ./bin/gbuild -j ${proc} -m ${mem} --commit mnpcoin=${COMMIT} --url mnpcoin=${url} ../mnpcoin/contrib/gitian-descriptors/gitian-win.yml
-	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../mnpcoin/contrib/gitian-descriptors/gitian-win.yml
-	    mv build/out/mnpcoin-*-win-unsigned.tar.gz inputs/mnpcoin-win-unsigned.tar.gz
-	    mv build/out/mnpcoin-*.zip build/out/mnpcoin-*.exe ../mnpcoin-binaries/${VERSION}
+	    ./bin/gbuild -j ${proc} -m ${mem} --commit MNPCoin=${COMMIT} --url MNPCoin=${url} ../MNPCoin/contrib/gitian-descriptors/gitian-win.yml
+	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../MNPCoin/contrib/gitian-descriptors/gitian-win.yml
+	    mv build/out/MNPCoin-*-win-unsigned.tar.gz inputs/MNPCoin-win-unsigned.tar.gz
+	    mv build/out/MNPCoin-*.zip build/out/MNPCoin-*.exe ../MNPCoin-binaries/${VERSION}
 	fi
 	# Mac OSX
 	if [[ $osx = true ]]
 	then
 	    echo ""
 	    echo "Compiling ${VERSION} Mac OSX"
 	    echo ""
-	    ./bin/gbuild -j ${proc} -m ${mem} --commit mnpcoin=${COMMIT} --url mnpcoin=${url} ../mnpcoin/contrib/gitian-descriptors/gitian-osx.yml
-	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../mnpcoin/contrib/gitian-descriptors/gitian-osx.yml
-	    mv build/out/mnpcoin-*-osx-unsigned.tar.gz inputs/mnpcoin-osx-unsigned.tar.gz
-	    mv build/out/mnpcoin-*.tar.gz build/out/mnpcoin-*.dmg ../mnpcoin-binaries/${VERSION}
+	    ./bin/gbuild -j ${proc} -m ${mem} --commit MNPCoinn=${COMMIT} --url MNPCoin=${url} ../MNPCoin/contrib/gitian-descriptors/gitian-osx.yml
+	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../MNPCoin/contrib/gitian-descriptors/gitian-osx.yml
+	    mv build/out/MNPCoin-*-osx-unsigned.tar.gz inputs/MNPCoin-osx-unsigned.tar.gz
+	    mv build/out/MNPCoin-*.tar.gz build/out/MNPCoin-*.dmg ../MNPCoin-binaries/${VERSION}
 	fi
 	# AArch64
 	if [[ $aarch64 = true ]]
 	then
 	    echo ""
 	    echo "Compiling ${VERSION} AArch64"
 	    echo ""
-	    ./bin/gbuild -j ${proc} -m ${mem} --commit mnpcoin=${COMMIT} --url mnpcoin=${url} ../mnpcoin/contrib/gitian-descriptors/gitian-aarch64.yml
-	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-aarch64 --destination ../gitian.sigs/ ../mnpcoin/contrib/gitian-descriptors/gitian-aarch64.yml
-	    mv build/out/mnpcoin-*.tar.gz build/out/src/mnpcoin-*.tar.gz ../mnpcoin-binaries/${VERSION}
+	    ./bin/gbuild -j ${proc} -m ${mem} --commit MNPCoin=${COMMIT} --url MNPCoin=${url} ../MNPCoin/contrib/gitian-descriptors/gitian-aarch64.yml
+	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-aarch64 --destination ../gitian.sigs/ ../MNPCoin/contrib/gitian-descriptors/gitian-aarch64.yml
+	    mv build/out/MNPCoin-*.tar.gz build/out/src/MNPCoin-*.tar.gz ../MNPCoin-binaries/${VERSION}
 	popd
 
         if [[ $commitFiles = true ]]
@@ -340,32 +340,32 @@ then
 	echo ""
 	echo "Verifying v${VERSION} Linux"
 	echo ""
-	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-linux ../mnpcoin/contrib/gitian-descriptors/gitian-linux.yml
+	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-linux ../MNPCoin/contrib/gitian-descriptors/gitian-linux.yml
 	# Windows
 	echo ""
 	echo "Verifying v${VERSION} Windows"
 	echo ""
-	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-unsigned ../mnpcoin/contrib/gitian-descriptors/gitian-win.yml
+	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-unsigned ../MNPCoin/contrib/gitian-descriptors/gitian-win.yml
 	# Mac OSX
 	echo ""
 	echo "Verifying v${VERSION} Mac OSX"
 	echo ""
-	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-unsigned ../mnpcoin/contrib/gitian-descriptors/gitian-osx.yml
+	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-unsigned ../MNPCoin/contrib/gitian-descriptors/gitian-osx.yml
 	# AArch64
 	echo ""
 	echo "Verifying v${VERSION} AArch64"
 	echo ""
-	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-aarch64 ../mnpcoin/contrib/gitian-descriptors/gitian-aarch64.yml
+	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-aarch64 ../MNPCoin/contrib/gitian-descriptors/gitian-aarch64.yml
 	# Signed Windows
 	echo ""
 	echo "Verifying v${VERSION} Signed Windows"
 	echo ""
-	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../mnpcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
+	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../MNPCoin/contrib/gitian-descriptors/gitian-osx-signer.yml
 	# Signed Mac OSX
 	echo ""
 	echo "Verifying v${VERSION} Signed Mac OSX"
 	echo ""
-	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../mnpcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
+	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../MNPCoin/contrib/gitian-descriptors/gitian-osx-signer.yml
 	popd
 fi
 
@@ -380,20 +380,20 @@ then
 	    echo ""
 	    echo "Signing ${VERSION} Windows"
 	    echo ""
-	    ./bin/gbuild -i --commit signature=${COMMIT} ../mnpcoin/contrib/gitian-descriptors/gitian-win-signer.yml
-	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../mnpcoin/contrib/gitian-descriptors/gitian-win-signer.yml
-	    mv build/out/mnpcoin-*win64-setup.exe ../mnpcoin-binaries/${VERSION}
-	    mv build/out/mnpcoin-*win32-setup.exe ../mnpcoin-binaries/${VERSION}
+	    ./bin/gbuild -i --commit signature=${COMMIT} ../MNPCoin/contrib/gitian-descriptors/gitian-win-signer.yml
+	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../MNPCoin/contrib/gitian-descriptors/gitian-win-signer.yml
+	    mv build/out/MNPCoin-*win64-setup.exe ../MNPCoin-binaries/${VERSION}
+	    mv build/out/MNPCoin-*win32-setup.exe ../MNPCoin-binaries/${VERSION}
 	fi
 	# Sign Mac OSX
 	if [[ $osx = true ]]
 	then
 	    echo ""
 	    echo "Signing ${VERSION} Mac OSX"
 	    echo ""
-	    ./bin/gbuild -i --commit signature=${COMMIT} ../mnpcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
-	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../mnpcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
-	    mv build/out/mnpcoin-osx-signed.dmg ../mnpcoin-binaries/${VERSION}/mnpcoin-${VERSION}-osx.dmg
+	    ./bin/gbuild -i --commit signature=${COMMIT} ../MNPCoin/contrib/gitian-descriptors/gitian-osx-signer.yml
+	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../MNPCoin/contrib/gitian-descriptors/gitian-osx-signer.yml
+	    mv build/out/MNPCoin-osx-signed.dmg ../MNPCoin-binaries/${VERSION}/MNPCoin-${VERSION}-osx.dmg
 	fi
 	popd
 

diff --git a/contrib/gitian-descriptors/gitian-aarch64.yml b/contrib/gitian-descriptors/gitian-aarch64.yml
@@ -1,5 +1,5 @@
 ---
-name: "mnpcoin-aarch64-3.1"
+name: "MNPCoin-aarch64-3.1"
 enable_cache: true
 suites:
 - "xenial"
@@ -25,8 +25,8 @@ packages:
 - "python"
 reference_datetime: "2015-06-01 00:00:00"
 remotes:
-- "url": "https://github.com/mnpcoin/mnpcoin.git"
-  "dir": "mnpcoin"
+- "url": "https://github.com/MasterNodesPro/MNPCoin.git"
+  "dir": "MNPCoin"
 files: []
 script: |
 

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
 ---
-name: "mnpcoin-linux-3.1"
+name: "MNPCoin-linux-3.1"
 enable_cache: true
 suites:
 - "trusty"
@@ -24,8 +24,8 @@ packages:
 - "libc6-dev:i386"
 reference_datetime: "2015-06-01 00:00:00"
 remotes:
-- "url": "https://github.com/mnpcoin/mnpcoin.git"
-  "dir": "mnpcoin"
+- "url": "https://github.com/MasterNodesPro/MNPCoin.git"
+  "dir": "MNPCoin"
 multiarch:
 - "i386"
 files: []

diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml
@@ -1,16 +1,16 @@
 ---
-name: "mnpcoin-dmg-signer"
+name: "MNPCoin-dmg-signer"
 suites:
 - "xenial"
 architectures:
 - "amd64"
 packages:
 - "faketime"
 remotes:
-- "url": "https://github.com/mnpcoin/mnpcoin-detached-sigs.git"
+- "url": "https://github.com/MasterNodesPro/mnpcoin-detached-sigs.git"
   "dir": "signature"
 files:
-- "mnpcoin-osx-unsigned.tar.gz"
+- "MNPCoin-osx-unsigned.tar.gz"
 script: |
   WRAP_DIR=$HOME/wrapped
   mkdir -p ${WRAP_DIR}

diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
@@ -1,5 +1,5 @@
 ---
-name: "mnpcoin-osx-3.1"
+name: "MNPCoin-osx-3.1"
 enable_cache: true
 suites:
 - "xenial"
@@ -28,8 +28,8 @@ packages:
 - "python-setuptools"
 - "fonts-tuffy"
 remotes:
-- "url": "https://github.com/mnpcoin/mnpcoin.git"
-  "dir": "mnpcoin"
+- "url": "https://github.com/MasterNodesPro/MNPCoin.git"
+  "dir": "MNPCoin"
 files:
 - "MacOSX10.11.sdk.tar.gz"
 script: |

diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml
@@ -1,5 +1,5 @@
 ---
-name: "mnpcoin-win-signer"
+name: "MNPCoin-win-signer"
 suites:
 - "xenial"
 architectures:
@@ -8,12 +8,12 @@ packages:
 - "libssl-dev"
 - "autoconf"
 remotes:
-- "url": "https://github.com/mnpcoin/mnpcoin-detached-sigs.git"
+- "url": "https://github.com/MasterNodesPro/MNPCoin-detached-sigs.git"
   "dir": "signature"
 files:
 - "osslsigncode-1.7.1.tar.gz"
 - "osslsigncode-Backports-to-1.7.1.patch"
-- "mnpcoin-win-unsigned.tar.gz"
+- "MNPCoin-win-unsigned.tar.gz"
 script: |
   BUILD_DIR=`pwd`
   SIGDIR=${BUILD_DIR}/signature/win

diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
@@ -1,5 +1,5 @@
 ---
-name: "mnpcoin-win-3.1"
+name: "MNPCoin-win-3.1"
 enable_cache: true
 suites:
 - "xenial"
@@ -22,8 +22,8 @@ packages:
 - "ca-certificates"
 - "python"
 remotes:
-- "url": "https://github.com/mnpcoin/mnpcoin.git"
-  "dir": "mnpcoin"
+- "url": "https://github.com/MasterNodesPro/MNPCoin.git"
+  "dir": "MNPCoin"
 files: []
 script: |
   WRAP_DIR=$HOME/wrapped