[tor-commits] [tor-messenger-build/master] Create mar-tools zip files

[boklm at torproject.org]

commit b3ebc0f25959a034b609f6d6ba697da30ee43efa
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Sat Nov 5 00:58:46 2016 +0100

    Create mar-tools zip files
---
 projects/instantbird/build       | 22 ++++++++++++++++++++++
 projects/instantbird/config      |  4 ++++
 projects/tor-messenger/build     |  1 +
 projects/tor-messenger/build.osx |  1 +
 4 files changed, 28 insertions(+)

diff --git a/projects/instantbird/build b/projects/instantbird/build
index 08b22a5..999c2a0 100644
--- a/projects/instantbird/build
+++ b/projects/instantbird/build
@@ -66,3 +66,25 @@ echo ac_add_options --with-tor-browser-version='[% c("var/tormessenger_version")
 
 mkdir -p [% dest_dir _ '/' _ c('filename') %]
 mv obj-*/dist/instantbird-*.[% c('var/archive_suffix') %] [% dest_dir _ '/' _ c('filename') %]/instantbird.[% c('var/archive_suffix') %]
+
+MARTOOLS=/var/tmp/dist/mar-tools
+mkdir -p $MARTOOLS
+cp -p mozilla/config/createprecomplete.py $MARTOOLS/
+cp -p mozilla/tools/update-packaging/*.sh $MARTOOLS/
+cp -p obj-*/dist/host/bin/mar $MARTOOLS/
+cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/
+[% IF c("var/linux") -%]
+cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/
+cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/
+NSS_LIBS="libfreebl3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so"
+NSPR_LIBS="libnspr4.so libplc4.so libplds4.so"
+for LIB in $NSS_LIBS $NSPR_LIBS; do
+    cp -p obj-*/dist/bin/$LIB $MARTOOLS/
+done
+[% END -%]
+
+cd /var/tmp/dist
+[% c('zip', {
+        zip_src => [ 'mar-tools' ],
+        zip_args => dest_dir _ '/' _ c('filename') _ '/' _ c('var/martools_filename'),
+    }) %]
diff --git a/projects/instantbird/config b/projects/instantbird/config
index e2ee4dd..d105f91 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -21,9 +21,11 @@ var:
 targets:
   windows-i686:
     var:
+      martools_filename: mar-tools-win32.zip
       archive_suffix: zip
   linux-x86_64:
     var:
+      martools_filename: mar-tools-linux64.zip
       arch_deps:
         - libgconf2-dev
         - libgtk2.0-dev
@@ -37,6 +39,7 @@ targets:
         - libxt-dev
   linux-i686:
     var:
+      martools_filename: mar-tools-linux32.zip
       arch_deps:
         - libc6-dev-i386
         - ia32-libs
@@ -54,6 +57,7 @@ targets:
         - libxt-dev:i386
   osx-x86_64:
     var:
+      martools_filename: mar-tools-mac64.zip
       arch_deps:
         - rsync
         - sqlite3
diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build
index 23834b2..688c932 100755
--- a/projects/tor-messenger/build
+++ b/projects/tor-messenger/build
@@ -115,3 +115,4 @@ mv tor-messenger-install.exe [% dest_dir _ '/' _ c('filename') _ '/' _ c('var/bu
                         _ '/' _ c('var/bundle_filename'),
         }) %]
 [% END -%]
+mv -f [% c('input_files_by_name/instantbird') %]/mar-tools-*.zip [% dest_dir _ '/' _ c('filename') %]
diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx
index e9d3d07..99cde39 100755
--- a/projects/tor-messenger/build.osx
+++ b/projects/tor-messenger/build.osx
@@ -64,3 +64,4 @@ mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o ../TorMessenger-uncompressed.
 cd ..
 mkdir -p '[% dest_dir _ "/" _ c("filename") %]'
 dmg dmg TorMessenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') _ '/' _ c('var/bundle_filename') %]
+mv -f [% c('input_files_by_name/instantbird') %]/mar-tools-*.zip [% dest_dir _ '/' _ c('filename') %]