[tor-commits] [tor-messenger-build/master] Fix indentation: use sw=2 everywhere

boklm at torproject.org boklm at torproject.org
Wed Jun 24 11:32:12 UTC 2015


commit 41029c77ba5e8304839aedfa84d36d574c1c2015
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Tue Jun 23 22:19:50 2015 +0200

    Fix indentation: use sw=2 everywhere
---
 projects/binutils/config      |    2 +-
 projects/ctypes-otr/config    |    2 +-
 projects/docker-image/config  |    2 +-
 projects/gcc/config           |    2 +-
 projects/instantbird/config   |    2 +-
 projects/libgcrypt/config     |    2 +-
 projects/libgpg-error/config  |    2 +-
 projects/libotr/config        |    2 +-
 projects/mingw-w64/config     |    2 +-
 projects/mozilla/config       |    2 +-
 projects/python/config        |    2 +-
 projects/thunderbird/config   |   24 ++++++++++++------------
 projects/tor-browser/config   |   32 ++++++++++++++++----------------
 projects/tor-launcher/config  |    2 +-
 projects/tor-mail/config      |   14 +++++++-------
 projects/tor-messenger/config |   16 ++++++++--------
 projects/torbirdy/config      |    4 ++--
 rbm.conf                      |   20 ++++++++++----------
 18 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/projects/binutils/config b/projects/binutils/config
index be5f0f1..0882ea5 100644
--- a/projects/binutils/config
+++ b/projects/binutils/config
@@ -1,4 +1,4 @@
-# vim: filetype=yaml
+# vim: filetype=yaml sw=2
 version: 2.25
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 remote_docker: 1
diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config
index 8d4a662..fcb3659 100644
--- a/projects/ctypes-otr/config
+++ b/projects/ctypes-otr/config
@@ -1,4 +1,4 @@
-# vim: filetype=yaml
+# vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 git_url: https://github.com/arlolra/ctypes-otr
 git_hash: master
diff --git a/projects/docker-image/config b/projects/docker-image/config
index 3e6c99c..f1b411c 100644
--- a/projects/docker-image/config
+++ b/projects/docker-image/config
@@ -1,4 +1,4 @@
-# vim: filetype=yaml
+# vim: filetype=yaml sw=2
 filename: '[% sha256(c("pre")).substr(0, 12) %]'
 remote_docker: 1
 docker_image_prefix: 'tor-messenger_[% GET ENV.RBM_BUILDNAME ? ENV.RBM_BUILDNAME : ENV.USER ? ENV.USER : c("uid") %]'
diff --git a/projects/gcc/config b/projects/gcc/config
index 81cf982..ae202bf 100644
--- a/projects/gcc/config
+++ b/projects/gcc/config
@@ -1,4 +1,4 @@
-# vim: filetype=yaml
+# vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 version: 4.9.1
 remote_docker: 1
diff --git a/projects/instantbird/config b/projects/instantbird/config
index fbcaab1..2d04dc8 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -1,4 +1,4 @@
-# vim: filetype=yaml
+# vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 hg_url: https://hg.mozilla.org/releases/comm-beta/
 hg_hash: THUNDERBIRD_38_0b4_RELEASE
diff --git a/projects/libgcrypt/config b/projects/libgcrypt/config
index d98d4f7..90c5ab7 100644
--- a/projects/libgcrypt/config
+++ b/projects/libgcrypt/config
@@ -1,4 +1,4 @@
-# vim: filetype=yaml
+# vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 version: 1.6.2
 remote_docker: 1
diff --git a/projects/libgpg-error/config b/projects/libgpg-error/config
index 1ca6d02..036ba8c 100644
--- a/projects/libgpg-error/config
+++ b/projects/libgpg-error/config
@@ -1,4 +1,4 @@
-# vim: filetype=yaml
+# vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 version: 1.16
 remote_docker: 1
diff --git a/projects/libotr/config b/projects/libotr/config
index 5bc9225..8ca4a78 100644
--- a/projects/libotr/config
+++ b/projects/libotr/config
@@ -1,4 +1,4 @@
-# vim: filetype=yaml
+# vim: filetype=yaml sw=2
 version: 4.1.0
 filename: 'libotr-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 remote_docker: 1
diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config
index 1d44213..20c76ef 100644
--- a/projects/mingw-w64/config
+++ b/projects/mingw-w64/config
@@ -1,4 +1,4 @@
-# vim: filetype=yaml
+# vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64
 git_hash: 85b403445b2308fa6277aa26446da790866fe052
diff --git a/projects/mozilla/config b/projects/mozilla/config
index 8eaabe1..1301bd5 100644
--- a/projects/mozilla/config
+++ b/projects/mozilla/config
@@ -1,4 +1,4 @@
-# vim: filetype=yaml
+# vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 git_url: https://github.com/mozilla/gecko-dev
 git_hash: esr38
diff --git a/projects/python/config b/projects/python/config
index 357f87a..8362293 100644
--- a/projects/python/config
+++ b/projects/python/config
@@ -1,4 +1,4 @@
-# vim: filetype=yaml
+# vim: filetype=yaml sw=2
 version: 2.7.8
 filename: 'python-[% c("lsb_release/id") %]-[% c("lsb_release/codename") %]-[% c("var/build_id") %].tar.gz'
 lsb_release:
diff --git a/projects/thunderbird/config b/projects/thunderbird/config
index 135376f..9fd2f77 100644
--- a/projects/thunderbird/config
+++ b/projects/thunderbird/config
@@ -1,18 +1,18 @@
-# vim: filetype=yaml
+# vim: filetype=yaml sw=2
 version: 31.5.0
 filename: 'thunderbird-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]'
 
 var:
-    moz_osname: '[% c("var/osname") %]'
-    extension: tar.bz2
-    src_filename: 'thunderbird-[% c("version") %].[% c("var/extension") %]'
+  moz_osname: '[% c("var/osname") %]'
+  extension: tar.bz2
+  src_filename: 'thunderbird-[% c("version") %].[% c("var/extension") %]'
 
 input_files:
-    - filename: 'mozilla-thunderbird-[% c("version") %]-[% c("var/moz_osname") %].[% c("var/extension") %]'
-      URL: 'https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/[% c("version") %]/[% c("var/moz_osname") %]/en-US/[% c("var/src_filename") %]'
-      name: thunderbird
-    - filename: 'sha512sums-[% c("version") %]'
-      URL: 'https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/[% c("version") %]/SHA512SUMS'
-      file_gpg_id: 1
-      sig_ext: asc
-      gpg_keyring: thunderbird.gpg
+  - filename: 'mozilla-thunderbird-[% c("version") %]-[% c("var/moz_osname") %].[% c("var/extension") %]'
+    URL: 'https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/[% c("version") %]/[% c("var/moz_osname") %]/en-US/[% c("var/src_filename") %]'
+    name: thunderbird
+  - filename: 'sha512sums-[% c("version") %]'
+    URL: 'https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/[% c("version") %]/SHA512SUMS'
+    file_gpg_id: 1
+    sig_ext: asc
+    gpg_keyring: thunderbird.gpg
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index c318209..5561821 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -1,20 +1,20 @@
-# vim: filetype=yaml
+# vim: filetype=yaml sw=2
 version: 4.5.2
 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]'
 
 input_files:
- - URL: "[% c('var/base_url') %]/tor-browser-[% c('var/tb_osname') %]-[% c('version') %]_en-US.tar.xz"
-   name: torbrowser
-   file_gpg_id: 1
-   sig_ext: asc
-   gpg_keyring: tor-browser.gpg
-   var:
-       base_url: "https://dist.torproject.org/torbrowser/[% c('version') %]"
-   targets:
-       windows-i686:
-           URL: "[% c('var/base_url') %]/torbrowser-install-[% c('version') %]_en-US.exe"
-       osx-x86_64:
-         URL: "[% c('var/base_url') %]/TorBrowser-[% c('version') %]-osx64_en-US.dmg"
+  - URL: "[% c('var/base_url') %]/tor-browser-[% c('var/tb_osname') %]-[% c('version') %]_en-US.tar.xz"
+    name: torbrowser
+    file_gpg_id: 1
+    sig_ext: asc
+    gpg_keyring: tor-browser.gpg
+    var:
+      base_url: "https://dist.torproject.org/torbrowser/[% c('version') %]"
+    targets:
+      windows-i686:
+        URL: "[% c('var/base_url') %]/torbrowser-install-[% c('version') %]_en-US.exe"
+      osx-x86_64:
+        URL: "[% c('var/base_url') %]/TorBrowser-[% c('version') %]-osx64_en-US.dmg"
 
 var:
   extension: 'tar.xz'
@@ -22,13 +22,13 @@ var:
 targets:
   linux-x86_64:
     var:
-       tb_osname: linux64
+      tb_osname: linux64
   linux-i686:
     var:
-       tb_osname: linux32
+      tb_osname: linux32
   windows-i686:
     var:
-       extension: 'exe'
+      extension: 'exe'
   osx-x86_64:
     var:
       extension: 'dmg'
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index 3e8c704..b6d8524 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,4 +1,4 @@
-# vim: filetype=yaml
+# vim: filetype=yaml sw=2
 version: 0.2.7.2
 git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c("version") %]'
diff --git a/projects/tor-mail/config b/projects/tor-mail/config
index 0fa7dcb..fd1f417 100644
--- a/projects/tor-mail/config
+++ b/projects/tor-mail/config
@@ -1,4 +1,4 @@
-# vim: filetype=yaml
+# vim: filetype=yaml sw=2
 version: 0.0.1
 filename: 'tor-mail-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.xz'
 input_files:
@@ -16,10 +16,10 @@ input_files:
 
 remote_docker: 1
 lsb_release:
-    id: Ubuntu
-    release: 12.04
-    codename: precise
+  id: Ubuntu
+  release: 12.04
+  codename: precise
 var:
-    deps:
-        - bzip2
-        - p7zip-full
+  deps:
+    - bzip2
+    - p7zip-full
diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config
index e5aec36..fa234b0 100644
--- a/projects/tor-messenger/config
+++ b/projects/tor-messenger/config
@@ -1,4 +1,4 @@
-# vim: filetype=yaml
+# vim: filetype=yaml sw=2
 version: 0.0.5
 filename: 'tor-messenger-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].[% c("var/filename_ext") %]'
 input_files:
@@ -22,14 +22,14 @@ input_files:
 
 remote_docker: 1
 lsb_release:
-    id: Ubuntu
-    release: 12.04
-    codename: precise
+  id: Ubuntu
+  release: 12.04
+  codename: precise
 var:
-    filename_ext: 'tar.xz'
-    deps:
-        - p7zip-full
-        - bzip2
+  filename_ext: 'tar.xz'
+  deps:
+    - p7zip-full
+    - bzip2
 targets:
   windows-i686:
     lsb_release:
diff --git a/projects/torbirdy/config b/projects/torbirdy/config
index 990f215..a54f70a 100644
--- a/projects/torbirdy/config
+++ b/projects/torbirdy/config
@@ -1,7 +1,7 @@
-# vim: filetype=yaml
+# vim: filetype=yaml sw=2
 filename: 'torbirdy-[% c("version") %].xpi'
 version: 0.1.4
 git_hash: 4cdded42ca5c6f900c893a8b3d27c50ce6854eac
 git_url: https://git.torproject.org/torbirdy.git
 input_files:
-    - filename: tormailbundle.patch
+  - filename: tormailbundle.patch
diff --git a/rbm.conf b/rbm.conf
index 1208318..4e81508 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -1,4 +1,4 @@
-# vim: filetype=yaml
+# vim: filetype=yaml sw=2
 fetch: 0
 debug: 1
 compress_tar: gz
@@ -40,7 +40,7 @@ var:
 targets:
   notarget: linux-x86_64
   noint:
-      debug: 0
+    debug: 0
   linux-x86_64:
     arch: x86_64
     var:
@@ -73,16 +73,16 @@ targets:
       CLANG_FLAGS: '-arch x86_64 -isysroot /var/tmp/dist/macosx-toolchain/SDK/MacOSX10.6.sdk'
 
   tor-messenger:
-      var:
-          tor-messenger: 1
-          tor_socks_port: 9152
-          tor_control_port: 9153
+    var:
+      tor-messenger: 1
+      tor_socks_port: 9152
+      tor_control_port: 9153
 
   tor-mail:
-      var:
-          tor-mail: 1
-          tor_socks_port: 9154
-          tor_control_port: 9155
+    var:
+      tor-mail: 1
+      tor_socks_port: 9154
+      tor_control_port: 9155
 
   # The no_build_id target can be useful if you want to quickly display
   # a build template or other option but don't want to spend time to



More information about the tor-commits mailing list