-minor code change, comment changes

Author: ajohns

src/rez/utils/_version.py

@@ -1,7 +1,7 @@
 
 
 # Update this value to version up Rez. Do not place anything else in this file.
-_rez_version = "2.20.1"
+_rez_version = "2.21.0"
 
 try:
     from rez.vendor.version.version import Version

src/rezplugins/build_system/cmake.py

@@ -37,12 +37,14 @@ class CMakeBuildSystem(BuildSystem):
       if 0, just a build is occurring.
     """
 
-    build_systems = {'eclipse':     "Eclipse CDT4 - Unix Makefiles",
-                     'codeblocks':  "CodeBlocks - Unix Makefiles",
-                     'make':        "Unix Makefiles",
-                     'nmake':       "NMake Makefiles",
-                     'mingw':       "MinGW Makefiles",
-                     'xcode':       "Xcode"}
+    build_systems = {
+        'eclipse':     "Eclipse CDT4 - Unix Makefiles",
+        'codeblocks':  "CodeBlocks - Unix Makefiles",
+        'make':        "Unix Makefiles",
+        'nmake':       "NMake Makefiles",
+        'mingw':       "MinGW Makefiles",
+        'xcode':       "Xcode"
+    }
 
     build_targets = ["Debug", "Release", "RelWithDebInfo"]
 
@@ -51,7 +53,8 @@ class CMakeBuildSystem(BuildSystem):
         "build_system":     Or(*build_systems.keys()),
         "cmake_args":       [basestring],
         "cmake_binary":     Or(None, basestring),
-        "make_binary":     Or(None, basestring)}
+        "make_binary":     Or(None, basestring)
+    }
 
     @classmethod
     def name(cls):
@@ -177,19 +180,19 @@ def _pr(s):
 
         # assemble make command
         make_binary = self.settings.make_binary
-        if self.settings.make_binary:
-            cmd = [self.settings.make_binary]
-        elif self.cmake_build_system == 'mingw':
-            cmd = ["mingw32-make"]
-        elif self.cmake_build_system == 'nmake':
-            make_binary = 'nmake'
-            cmd = ["nmake"]
-        else:
-            cmd = ["make"]
-        cmd += (self.child_build_args or [])
+
+        if not make_binary:
+            if self.cmake_build_system == "mingw":
+                make_binary = "mingw32-make"
+            elif self.cmake_build_system == "nmake":
+                make_binary = "nmake"
+            else:
+                make_binary = "make"
+
+        cmd = [make_binary] + (self.child_build_args or [])
 
         # nmake has no -j
-        if make_binary != 'nmake':
+        if make_binary != "nmake":
             if not any(x.startswith("-j") for x in (self.child_build_args or [])):
                 n = variant.config.build_thread_count
                 cmd.append("-j%d" % n)

src/rezplugins/build_system/rezconfig

@@ -1,3 +1,6 @@
+# TODO remove this file in PR for https://github.com/nerdvegas/rez/issues/525,
+# it is unused
+
 cmake:
     # The name of the CMake build system to use, valid options are
     # eclipse, make, xcode and codeblocks.

src/rezplugins/build_system/rezconfig.py

@@ -11,7 +11,7 @@
     "build_target": "Release",
 
     # A list of default arguments to be passed to the cmake binary.
-    "cmake_args" : [
+    "cmake_args": [
         '-Wno-dev',
         '-DCMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT=TRUE',
         '-D_ECLIPSE_VERSION=4.3',
@@ -21,7 +21,8 @@
     # Optionally specify an explicit cmake executable to use for building.
     "cmake_binary": None,
 
-    # Optionally specify an explicit make executable to use for building.
+    # Optionally specify an explicit make executable to use for building. If
+    # not specified, this is determined automatically based on `build_system`.
     "make_binary": None,
 
     # If True, install pyc files when the 'rez_install_python' macro is used.