commit 73e2a43a7b396a2fd29965b8261bf7498046f5cc Author: Sukhbir Singh <sukhbir@torproject.org> Date: Tue Aug 15 12:55:36 2017 -0400 Update Makefile for tor-messenger-release --- Makefile | 2 +- projects/tor-messenger-release/build | 23 ++++++++++++++++ projects/tor-messenger-release/config | 49 +++++++++++++++++++---------------- 3 files changed, 51 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index d76b0ac..cdef67c 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ all: tor-messenger tor-messenger: tor-messenger-linux-x86_64 tor-messenger-linux-i686 tor-messenger-windows-i686 tor-messenger-osx-x86_64 tor-messenger-release: submodule-update - $(rbm) build tor-messenger-release + $(rbm) build tor-messenger-release --target tormessenger-all tor-mail: tor-mail-linux-x86_64 tor-mail-linux-i686 diff --git a/projects/tor-messenger-release/build b/projects/tor-messenger-release/build new file mode 100644 index 0000000..993845f --- /dev/null +++ b/projects/tor-messenger-release/build @@ -0,0 +1,23 @@ +#!/bin/sh +[% c("var/set_default_env") -%] +[% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] +destdir="[% dest_dir _ '/' _ c("version") %]" +mkdir -p "$destdir" +[% IF c("var/tormessenger-windows-i686") -%] +mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ +[% END -%] +[% IF c("var/tormessenger-osx-x86_64") -%] +mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ +[% END -%] +[% IF c("var/tormessenger-linux-i686") -%] +mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/ +[% END -%] +[% IF c("var/tormessenger-linux-x86_64") -%] +mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ +[% END -%] +cd "$destdir" +sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt +[% IF c("var/sign_build") -%] +gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt +[% END -%] +cat sha256sums-unsigned-build.txt diff --git a/projects/tor-messenger-release/config b/projects/tor-messenger-release/config index 2258d3c..d1ce6ac 100644 --- a/projects/tor-messenger-release/config +++ b/projects/tor-messenger-release/config @@ -2,42 +2,47 @@ version: '[% c("var/tormessenger_version") %]' output_dir: 'release' +targets: + tormessenger-all: + - tormessenger-linux-x86_64 + - tormessenger-linux-i686 + - tormessenger-windows-i686 + - tormessenger-osx-x86_64 + tormessenger-linux-x86_64: + var: + tormessenger-linux-x86_64: 1 + tormessenger-linux-i686: + var: + tormessenger-linux-i686: 1 + tormessenger-windows-i686: + var: + tormessenger-windows-i686: 1 + tormessenger-osx-x86_64: + var: + tormessenger-osx-x86_64: 1 + input_files: - name: linux-x86_64 project: tor-messenger + enable: '[% c("var/tormessenger-linux-x86_64") %]' target: - - tor-messenger - - linux-x86_64 + - tormessenger-linux-x86_64 - name: linux-i686 project: tor-messenger + enable: '[% c("var/tormessenger-linux-x86_64") %]' target: - - tor-messenger - - linux-i686 + - tormessenger-linux-i686 - name: windows-i686 project: tor-messenger + enable: '[% c("var/tormessenger-windows-i686") %]' target: - - tor-messenger - - windows-i686 + - tormessenger-windows-i686 - name: osx-x86_64 project: tor-messenger + enable: '[% c("var/tormessenger-osx-x86_64") %]' target: - - tor-messenger - - osx-x86_64 - -build: | - #!/bin/sh - set -e - export LC_ALL=C - destdir="[% dest_dir _ '/' _ c("version") %]" - mkdir -p "$destdir" - mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ - mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ - mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/ - mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ - cd "$destdir" - sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt - cat sha256sums-unsigned-build.txt + - tormessenger-osx-x86_64