[tbb-commits] [tor-browser-build/master] Bug 23075: rename RBM_NB_CORES to RBM_NUM_CORES

boklm at torproject.org boklm at torproject.org
Fri Aug 4 11:06:55 UTC 2017


commit b466ec4bcf9e534652dd98e0f401309e79a93447
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri Aug 4 13:03:52 2017 +0200

    Bug 23075: rename RBM_NB_CORES to RBM_NUM_CORES
    
    And buildconf/nb_procs to buildconf/num_procs.
---
 README                        | 6 +++---
 projects/binutils/build       | 2 +-
 projects/cmake/build          | 2 +-
 projects/elfutils/build       | 2 +-
 projects/firefox/build        | 2 +-
 projects/gcc/build            | 2 +-
 projects/gmp/build            | 2 +-
 projects/libdmg-hfsplus/build | 2 +-
 projects/libevent/build       | 2 +-
 projects/llvm/build           | 2 +-
 projects/mingw-w64/build      | 8 ++++----
 projects/tor/build            | 2 +-
 projects/yasm/build           | 2 +-
 rbm.conf                      | 4 ++--
 rbm.local.conf.example        | 6 +++---
 15 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/README b/README
index 7a2a671..751ccdd 100644
--- a/README
+++ b/README
@@ -96,11 +96,11 @@ Number of make processes
 
 By default the builds are run with 4 processes simultaneously (with
 make -j4). If you want to change the number of processes used, you can
-set the RBM_NB_PROCS environment variable:
+set the RBM_NUM_PROCS environment variable:
 
-  $ export RBM_NB_PROCS=8
+  $ export RBM_NUM_PROCS=8
 
-You can also set the buildconf/nb_procs option in rbm.local.conf.
+You can also set the buildconf/num_procs option in rbm.local.conf.
 
 
 Automated builds
diff --git a/projects/binutils/build b/projects/binutils/build
index cdfd045..a7d83d9 100644
--- a/projects/binutils/build
+++ b/projects/binutils/build
@@ -32,7 +32,7 @@ cd [% project %]-[% c("version") %]
   patch -p1 < $rootdir/binutils-224-gold.patch
 [% END -%]
 ./configure --prefix=$distdir [% c('var/configure_opt') %]
-make -j[% c("buildconf/nb_procs") %]
+make -j[% c("buildconf/num_procs") %]
 make install
 
 [% IF c("var/linux") %]
diff --git a/projects/cmake/build b/projects/cmake/build
index 4a58896..a5eca23 100644
--- a/projects/cmake/build
+++ b/projects/cmake/build
@@ -5,7 +5,7 @@ mkdir -p /var/tmp/build
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 cd /var/tmp/build/[% project %]-[% c('version') %]
 ./bootstrap --prefix=$distdir
-make -j[% c("buildconf/nb_procs") %]
+make -j[% c("buildconf/num_procs") %]
 make install
 cd /var/tmp/dist
 [% c('tar', {
diff --git a/projects/elfutils/build b/projects/elfutils/build
index 57adf83..5e24dba 100644
--- a/projects/elfutils/build
+++ b/projects/elfutils/build
@@ -13,7 +13,7 @@ tar -C /var/tmp/build -xf $rootdir/[% c('input_files_by_name/elfutils') %]
 
 cd /var/tmp/build/[% project %]-[% c("version") %]
 ./configure --prefix="$distdir"
-make -j[% c("buildconf/nb_procs") %]
+make -j[% c("buildconf/num_procs") %]
 make install
 
 cd /var/tmp/dist
diff --git a/projects/firefox/build b/projects/firefox/build
index 439369e..8ff265d 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -90,7 +90,7 @@ rm -f configure
 rm -f js/src/configure
 make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts"
 
-make -j[% c("buildconf/nb_procs") %] -f client.mk build
+make -j[% c("buildconf/num_procs") %] -f client.mk build
 make -C obj-* package INNER_MAKE_PACKAGE=true
 
 [% IF c("var/osx") %]
diff --git a/projects/gcc/build b/projects/gcc/build
index c7e3ea8..79cc5f7 100644
--- a/projects/gcc/build
+++ b/projects/gcc/build
@@ -17,7 +17,7 @@ mkdir /var/tmp/build
 tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.bz2
 cd /var/tmp/build/[% project %]-[% c("version") %]
 ./configure --prefix=$distdir [% c("var/configure_opt") %]
-make -j[% c("buildconf/nb_procs") %]
+make -j[% c("buildconf/num_procs") %]
 make install
 cd /var/tmp/dist
 [% c('tar', {
diff --git a/projects/gmp/build b/projects/gmp/build
index b9ea3bc..2752afe 100644
--- a/projects/gmp/build
+++ b/projects/gmp/build
@@ -9,7 +9,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
 # during compile time.
 ./configure --disable-static --enable-shared --enable-cxx \
     [% c("var/configure_opt") %] [% c("var/configure_opt_gmp") %] --prefix=$distdir
-make -j[% c("buildconf/nb_procs") %]
+make -j[% c("buildconf/num_procs") %]
 make install
 cd /var/tmp/dist
 [% c('tar', {
diff --git a/projects/libdmg-hfsplus/build b/projects/libdmg-hfsplus/build
index 66e4232..80d5f75 100644
--- a/projects/libdmg-hfsplus/build
+++ b/projects/libdmg-hfsplus/build
@@ -7,7 +7,7 @@ cd [% project %]-[% c('version') %]
 patch -p1 < ../libdmg.patch
 cmake -DCMAKE_INSTALL_PREFIX:PATH=$distdir/[% project %] CMakeLists.txt
 cd dmg
-make -j[% c("buildconf/nb_procs") %]
+make -j[% c("buildconf/num_procs") %]
 make install
 cd $distdir
 [% c('tar', {
diff --git a/projects/libevent/build b/projects/libevent/build
index d44371d..a38422a 100644
--- a/projects/libevent/build
+++ b/projects/libevent/build
@@ -11,7 +11,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
   export LD_PRELOAD=[% c("var/faketime_path") %]
   export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"
 [% END -%]
-make -j[% c("buildconf/nb_procs") %]
+make -j[% c("buildconf/num_procs") %]
 make install
 cd /var/tmp/dist
 [% c('tar', {
diff --git a/projects/llvm/build b/projects/llvm/build
index fc72e38..b018ca5 100644
--- a/projects/llvm/build
+++ b/projects/llvm/build
@@ -21,7 +21,7 @@ export LLVM_HOME=$(pwd)
 mkdir build
 cd build
 cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME
-make -j[% c("buildconf/nb_procs") %]
+make -j[% c("buildconf/num_procs") %]
 make install
 cd /var/tmp/dist
 [% c('tar', {
diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build
index 246ade1..0fc4517 100644
--- a/projects/mingw-w64/build
+++ b/projects/mingw-w64/build
@@ -31,25 +31,25 @@ sed 's/msvcrt/msvcr100/' -i gcc-[% c("var/gcc_version") %]/gcc/config/i386/t-min
 # CFLAGS_FOR_TARGET.
 export CFLAGS_FOR_TARGET="-specs=$distdir/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase"
 gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=i686-w64-mingw32 --disable-multilib --enable-languages=c,c++
-make -j[% c("buildconf/nb_procs") %] all-gcc
+make -j[% c("buildconf/num_procs") %] all-gcc
 make install-gcc
 
 mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-crt32
 cd /var/tmp/build/builddir/mingw-w64/mingw-w64-crt32
 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-crt/configure \
                  --host=i686-w64-mingw32 --prefix=$distdir/i686-w64-mingw32
-make -j[% c("buildconf/nb_procs") %]
+make -j[% c("buildconf/num_procs") %]
 make install
 
 mkdir -p /var/tmp/build/builddir/mingw-w64/widl32
 cd /var/tmp/build/builddir/mingw-w64/widl32
 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-tools/widl/configure \
                  --prefix=$distdir --target=i686-w64-mingw32
-make -j[% c("buildconf/nb_procs") %]
+make -j[% c("buildconf/num_procs") %]
 make install
 
 cd /var/tmp/build/gcc
-make -j[% c("buildconf/nb_procs") %]
+make -j[% c("buildconf/num_procs") %]
 make install
 mkdir -p $distdir/gcclibs
 cp i686-w64-mingw32/libssp/.libs/libssp-0.dll $distdir/gcclibs
diff --git a/projects/tor/build b/projects/tor/build
index 577c194..86d4384 100644
--- a/projects/tor/build
+++ b/projects/tor/build
@@ -64,7 +64,7 @@ find -type f -print0 | xargs -0 [% c("var/touch") %]
   export LD_PRELOAD=[% c("var/faketime_path") %]
   export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"
 [% END -%]
-make -j[% c("buildconf/nb_procs") %]
+make -j[% c("buildconf/num_procs") %]
 make install
 [% IF c("var/osx") -%]
   unset LD_PRELOAD
diff --git a/projects/yasm/build b/projects/yasm/build
index b736761..c11924c 100644
--- a/projects/yasm/build
+++ b/projects/yasm/build
@@ -5,7 +5,7 @@ mkdir -p /var/tmp/build
 tar -C /var/tmp/build -xf $rootdir/[% c('input_files_by_name/yasm') %]
 cd /var/tmp/build/yasm-[% c("version") %]
 ./configure --prefix="$distdir"
-make -j[% c("buildconf/nb_procs") %]
+make -j[% c("buildconf/num_procs") %]
 make install
 cd /var/tmp/dist
 [% c('tar', {
diff --git a/rbm.conf b/rbm.conf
index 327cd39..f89fa74 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -10,7 +10,7 @@ pkg_type: build
 # When adding a new option to buildconf, a default value should be defined
 # in var/build_id, so that changing this option does not affect the build_id.
 buildconf:
-  nb_procs: '[% GET ENV.RBM_NB_PROCS ? ENV.RBM_NB_PROCS : "4" %]'
+  num_procs: '[% GET ENV.RBM_NUM_PROCS ? ENV.RBM_NUM_PROCS : "4" %]'
 
 var:
   torbrowser_version: '7.5a3'
@@ -22,7 +22,7 @@ var:
   # in the same order. In the cases where the installation order is
   # important, sort_deps should be set to 0.
   sort_deps: 1
-  build_id: '[% sha256(c("var/build_id_txt", { buildconf => { nb_procs => 4 } })).substr(0, 6) %]'
+  build_id: '[% sha256(c("var/build_id_txt", { buildconf => { num_procs => 4 } })).substr(0, 6) %]'
   build_id_txt: |
     [% c("version") %]
     [% IF c("git_hash") || c("hg_hash"); GET c("abbrev"); END; %]
diff --git a/rbm.local.conf.example b/rbm.local.conf.example
index 5e322cf..a4b0212 100644
--- a/rbm.local.conf.example
+++ b/rbm.local.conf.example
@@ -24,10 +24,10 @@
 buildconf:
   buildconf: 1
 
-  ### The buildconf/nb_procs option can be used to select the number of
+  ### The buildconf/num_procs option can be used to select the number of
   ### build processes to run simultaneously. You can also use the
-  ### RBM_NB_PROCS environment variable. The default is 4.
-  #nb_procs: 8
+  ### RBM_NUM_PROCS environment variable. The default is 4.
+  #num_procs: 8
 
 var:
   local_conf: 1



More information about the tbb-commits mailing list