diff options
| author | TheCharlatan <seb.kung@gmail.com> | 2018-10-09 22:24:49 +0200 |
|---|---|---|
| committer | TheCharlatan <seb.kung@gmail.com> | 2018-10-09 22:24:49 +0200 |
| commit | d147d24058ef4d4e25ff0603b6bc89f2d4095874 (patch) | |
| tree | 610409b2406ad4d0669b9c293c616f2431370071 /contrib/gitian/gitian-build.py | |
| parent | Change gitian.sigs repo from bitcoin-core to monero-project remote host (diff) | |
| download | monero-d147d24058ef4d4e25ff0603b6bc89f2d4095874.tar.xz | |
Add windows descriptor to gitian descriptors
Windows is built with a seperate descriptor to handle additional changes
that need to be done to the end binary. Consolidate the gitian-build
script for this change.
Diffstat (limited to '')
| -rwxr-xr-x | contrib/gitian/gitian-build.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/gitian/gitian-build.py b/contrib/gitian/gitian-build.py index 0a93dbf5b..feb193a32 100755 --- a/contrib/gitian/gitian-build.py +++ b/contrib/gitian/gitian-build.py @@ -60,20 +60,20 @@ def build(): print('\nCompiling ' + args.version + ' Linux') subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'monero='+args.commit, '--url', 'monero='+args.url, '../monero/contrib/gitian/gitian-linux.yml']) subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-linux', '--destination', '../gitian.sigs/', '../monero/contrib/gitian/gitian-linux.yml']) - subprocess.check_call('mv build/out/monero-*.tar.gz build/out/monero-*.tar.gz ../monero-binaries/'+args.version, shell=True) + subprocess.check_call('mv build/out/monero-*.tar.gz ../monero-binaries/'+args.version, shell=True) if args.windows: print('\nCompiling ' + args.version + ' Windows') subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'monero='+args.commit, '--url', 'monero='+args.url, '../monero/contrib/gitian/gitian-win.yml']) subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win-unsigned', '--destination', '../gitian.sigs/', '../monero/contrib/gitian/gitian-win.yml']) - subprocess.check_call('mv build/out/monero*-win-unsigned.tar.gz inputs/monerowin-unsigned.tar.gz', shell=True) - subprocess.check_call('mv build/out/monero*.zip build/out/monero*.exe ../monerobinaries/'+args.version, shell=True) + subprocess.check_call('mv build/out/monero*-unsigned.tar.gz inputs/', shell=True) + subprocess.check_call('mv build/out/monero*.zip ../monerobinaries/'+args.version, shell=True) if args.macos: print('\nCompiling ' + args.version + ' MacOS') subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'monero'+args.commit, '--url', 'monero'+args.url, '../monero/contrib/gitian/gitian-osx.yml']) subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx-unsigned', '--destination', '../gitian.sigs/', '../monero/contrib/gitian/gitian-osx.yml']) - subprocess.check_call('mv build/out/monero*-osx-unsigned.tar.gz inputs/moneroosx-unsigned.tar.gz', shell=True) + subprocess.check_call('mv build/out/monero*-osx-unsigned.tar.gz inputs/', shell=True) subprocess.check_call('mv build/out/monero*.tar.gz build/out/monero*.dmg ../monerobinaries/'+args.version, shell=True) os.chdir(workdir) |