bugfix (#905)

chen3feng · Mar 2, 2021 · 4709c3b · 4709c3b
1 parent 7040eb9
commit 4709c3b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/blade/build_manager.py b/src/blade/build_manager.py
@@ -203,8 +203,8 @@ def build(self):
             self.get_build_dir(),
             self.build_script(),
             self.build_jobs_num(),
-            _ALL_COMMAND_TARGETS,
-            self.__options)
+            targets='',  # FIXME: because not all targets has a targets
+            options=self.__options)
         self._write_build_stamp_fime(start_time, returncode)
         if returncode != 0:
             console.error('Build failure.')
@@ -547,7 +547,8 @@ def generate_targets_build_code(self):
                 code += 'include %s\n' % target_ninja
                 if k in self.__expanded_command_targets:
                     command_target_outputs.append(target.get_outputs_goal())
-        code.append('build %s: phony %s\n' % (_ALL_COMMAND_TARGETS, ' '.join(command_target_outputs)))
+        # TODO: reland this feature
+        # code.append('build %s: phony %s\n' % (_ALL_COMMAND_TARGETS, ' '.join(command_target_outputs)))
         # code.append('default %s\n' % (_ALL_COMMAND_TARGETS))
         return code
 

diff --git a/src/blade/ninja_runner.py b/src/blade/ninja_runner.py
@@ -28,7 +28,8 @@ def build(build_dir, build_script, jobs_num, targets, options):
         cmd.append('-k0')
     if console.verbosity_compare(options.verbosity, 'verbose') >= 0:
         cmd.append('-v')
-    cmd.append(targets)
+    if targets:
+        cmd.append(targets)
     build_start_time = time.time()
     ret = _run_ninja_build(cmd, options)
     if options.show_builds_slower_than is not None:

diff --git a/src/blade/util.py b/src/blade/util.py
@@ -316,9 +316,10 @@ def parse_command_line(argv):
 
 def open_zip_file_for_write(filename, compression_level):
     """Open a zip file for writing with specified compression level."""
-    compression = zipfile.ZIP_STORED if compression_level == "0" else zipfile.ZIP_DEFLATED
-    if sys.version_info.major == 3 and sys.version_info.minor >= 7:
-        # pylint: disable=unexpected-keyword-arg
-        return zipfile.ZipFile(filename, 'w', zipfile.ZIP_DEFLATED,
-                               compresslevel=int(compression_level))
-    return zipfile.ZipFile(filename, 'w', )
+    compression = zipfile.ZIP_DEFLATED
+    if sys.version_info.major < 3 or sys.version_info.major == 3 and sys.version_info.minor < 7:
+        if compression_level == "0":
+            compression = zipfile.ZIP_STORED
+        return zipfile.ZipFile(filename, 'w', compression)
+    # pylint: disable=unexpected-keyword-arg
+    return zipfile.ZipFile(filename, 'w', compression, compresslevel=int(compression_level))