diff --git a/projects/generate_nmc_cert/build b/projects/generate_nmc_cert/build new file mode 100644 index 0000000..09a75a2 --- /dev/null +++ b/projects/generate_nmc_cert/build @@ -0,0 +1,37 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] +export CGO_ENABLED=0 +distdir=/var/tmp/dist/[% project %] +mkdir -p $distdir + +[% FOREACH dep = c("var/go_lib_deps") -%] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/' _ dep) %] +[% END -%] + +mkdir -p $GOPATH/src/github.com/namecoin +tar -C $GOPATH/src/github.com/namecoin -xf [% project %]-[% c('version') %].tar.gz +mv $GOPATH/src/github.com/namecoin/[% project %]-[% c('version') %] $GOPATH/src/github.com/namecoin/[% project %] + +[% FOREACH inst IN c("var/go_lib_install") %] + # TODO: Remove static build ID after migrating to Go 1.13.3+ + go install -ldflags '-s -buildid=' [% inst %] +[% END %] + +[% IF c("var/linux-x86_64") -%] + GOPATHBIN="${GOPATH}/bin" +[% ELSE -%] + GOPATHBIN="${GOPATH}/bin/${GOOS}_${GOARCH}" +[% END -%] + +ls $GOPATHBIN + +for x in [% project %]; do + cp -a $GOPATHBIN/"$x"[% IF c("var/windows") %].exe[% END %] $distdir/ +done + +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/generate_nmc_cert/config b/projects/generate_nmc_cert/config new file mode 100644 index 0000000..5f96e90 --- /dev/null +++ b/projects/generate_nmc_cert/config @@ -0,0 +1,31 @@ +version: '1.14' +git_url: https://github.com/namecoin/generate_nmc_cert.git +git_hash: 'v[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: namecoin.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + go_lib_deps: + - gox509compressed + - ncdns + go_lib_install: + - github.com/namecoin/generate_nmc_cert + cgo: 0 + build_go_lib_pre: | + export CGO_ENABLED=[% c("var/cgo") %] + +input_files: + - project: container-image + - name: go + project: go + - name: gox509compressed + project: gox509compressed + - name: ncdns + project: ncdns + # Build ncdns as a library, not an executable. + # TODO: refactor this once our build_go_lib executable patch is merged by upstream Tor + var: + go_lib_no_output: 0 diff --git a/projects/ncdns/build b/projects/ncdns/build index 81a9709..f66fde3 100644 --- a/projects/ncdns/build +++ b/projects/ncdns/build @@ -88,7 +88,7 @@ cd /var/tmp/dist done [% IF c("var/enable_namecoin_tlsa") %] - for x in ncdumpzone generate_nmc_cert tlsrestrict_chromium_tool; do + for x in ncdumpzone tlsrestrict_chromium_tool; do cp -a $GOPATHBIN/"$x"[% IF c("var/windows") %].exe[% END %] $distdir/ done [% END %] diff --git a/projects/ncdns/config b/projects/ncdns/config index e1985e8..f586a23 100644 --- a/projects/ncdns/config +++ b/projects/ncdns/config @@ -40,7 +40,6 @@ var: optional_go_lib_install: - github.com/namecoin/ncdns/certdehydrate - github.com/namecoin/ncdns/certinject - - github.com/namecoin/ncdns/generate_nmc_cert - github.com/namecoin/ncdns/ncdumpzone - github.com/namecoin/ncdns/ncdumpzone/ncdumpzone - github.com/namecoin/ncdns/tlsoverridefirefox diff --git a/projects/plain-binaries/build b/projects/plain-binaries/build index e716a9d..c7c4461 100644 --- a/projects/plain-binaries/build +++ b/projects/plain-binaries/build @@ -8,6 +8,7 @@ mkdir -p $distdir tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/certinject') %] [% END %] tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/encaya') %] +tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/generate_nmc_cert') %] tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/ncdns') %] tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/ncp11') %] tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/ncprop279') %] diff --git a/projects/plain-binaries/config b/projects/plain-binaries/config index 3d0902b..4d62423 100644 --- a/projects/plain-binaries/config +++ b/projects/plain-binaries/config @@ -12,6 +12,8 @@ input_files: enable: '[% c("var/windows") %]' - name: encaya project: encaya + - name: generate_nmc_cert + project: generate_nmc_cert - name: ncdns project: ncdns - name: ncp11