[tor-commits] [tor-messenger-build/master] Make projects/tor-messenger output to a directory

[boklm@xxxxxxxxxxxxxx]

commit 0bee903d5ce1141ec6175ecc7aa8bc477c7ed619
Author: Nicolas Vigier <boklm@xxxxxxxxxxxxxx>
Date:   Fri Nov 4 18:28:00 2016 +0100

    Make projects/tor-messenger output to a directory
    
    This will now output to a directory, only containing one file. This is
    the first step before adding the mar file and mar-tools.zip to that
    directory.
---
 projects/tor-messenger-release/config |  8 ++++----
 projects/tor-messenger/build          |  6 ++++--
 projects/tor-messenger/build.osx      |  3 ++-
 projects/tor-messenger/config         | 13 +++++++++----
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/projects/tor-messenger-release/config b/projects/tor-messenger-release/config
index 87185ca..aa19275 100644
--- a/projects/tor-messenger-release/config
+++ b/projects/tor-messenger-release/config
@@ -34,10 +34,10 @@ build: |
   export LC_ALL=C
   destdir="[% dest_dir _ '/' _ c("version") %]"
   mkdir -p "$destdir"
-  mv [% c('input_files_by_name/linux-x86_64') %] "$destdir"/tor-messenger-linux64-[% c("version") %]_en-US.tar.xz
-  mv [% c('input_files_by_name/linux-i686') %] "$destdir"/tor-messenger-linux32-[% c("version") %]_en-US.tar.xz
-  mv [% c('input_files_by_name/windows-i686') %] "$destdir"/tormessenger-install-[% c("version") %]_en-US.exe
-  mv [% c('input_files_by_name/osx-x86_64') %] "$destdir"/TorMessenger-[% c("version") %]-osx64_en-US.dmg
+  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 | sort) > sha256sums.txt
   cat sha256sums.txt
diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build
index 821cd4e..ee6b2f3 100755
--- a/projects/tor-messenger/build
+++ b/projects/tor-messenger/build
@@ -89,6 +89,7 @@ rm -Rf Browser/TorBrowser/Data/Browser/profile.default/extensions/tor-browser_en
 cd ..
 
 mv bundle tor-messenger
+mkdir -p '[% dest_dir _ "/" _ c("filename") %]'
 [% IF c('var/windows') -%]
 makensis tor-messenger.nsi
 
@@ -106,10 +107,11 @@ mv tor-messenger-install.exe tor-messenger-install-tmp.exe
 python pe_checksum_fix.py
 mv tor-messenger-install-tmp2.exe tor-messenger-install.exe
 rm tor-messenger-install-tmp.exe
-mv tor-messenger-install.exe [% dest_dir _ '/' _ c('filename') %]
+mv tor-messenger-install.exe [% dest_dir _ '/' _ c('filename') _ '/' _ c('var/bundle_filename') %]
 [% ELSE -%]
 [% c('tar', {
         tar_src => [ 'tor-messenger' ],
-        tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename'),
+        tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename')
+                        _ '/' _ c('var/bundle_filename'),
         }) %]
 [% END -%]
diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx
index 2c8bc83..02fa589 100755
--- a/projects/tor-messenger/build.osx
+++ b/projects/tor-messenger/build.osx
@@ -62,4 +62,5 @@ find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ../filelis
 
 mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o ../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755
 cd ..
-dmg dmg TorMessenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') %]
+mkdir -p '[% dest_dir _ "/" _ c("filename") %]'
+dmg dmg TorMessenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') _ '/' _ c('var/bundle_filename') %]
diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config
index 70ae860..0b861ce 100644
--- a/projects/tor-messenger/config
+++ b/projects/tor-messenger/config
@@ -1,6 +1,6 @@
 # vim: filetype=yaml sw=2
 version: '[% c("var/tormessenger_version") %]'
-filename: 'tor-messenger-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].[% c("var/filename_ext") %]'
+filename: 'tor-messenger-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
 input_files:
   - name: instantbird
     project: instantbird
@@ -47,7 +47,6 @@ input_files:
 remote_docker: 1
 distribution: Debian-7.11
 var:
-  filename_ext: 'tar.xz'
   deps:
     - p7zip-full
     - bzip2
@@ -55,7 +54,7 @@ targets:
   windows-i686:
     distribution: Ubuntu-14.10
     var:
-      filename_ext: 'exe'
+      bundle_filename: 'tormessenger-install-[% c("version") %]_en-US.exe'
       arch_deps:
         - nsis
         - python
@@ -64,7 +63,13 @@ targets:
   osx-x86_64:
     distribution: Ubuntu-12.04
     var:
-      filename_ext: 'dmg'
+      bundle_filename: 'TorMessenger-[% c("version") %]-osx64_en-US.dmg'
       arch_deps:
         - genisoimage
         - bsdtar
+  linux-i686:
+    var:
+      bundle_filename: 'tor-messenger-linux32-[% c("version") %]_en-US.tar.xz'
+  linux-x86_64:
+    var:
+      bundle_filename: 'tor-messenger-linux64-[% c("version") %]_en-US.tar.xz'



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits