Add flag to clean up temporary results after building iOS Framework or static lib

tools-webrtc/ios/build_ios_libs.py

 #!/usr/bin/env python
 
 # Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
@@ skipping 32 matching lines @@
            'Defaults to "framework".')
   parser.add_argument('--build_config', default='release',
       choices=['debug', 'release'],
       help='The build config. Can be "debug" or "release". '
            'Defaults to "release".')
   parser.add_argument('--arch', nargs='+', default=DEFAULT_ARCHS,
       choices=ENABLED_ARCHS,
       help='Architectures to build. Defaults to %(default)s.')
   parser.add_argument('-c', '--clean', action='store_true', default=False,
       help='Removes the previously generated build output, if any.')
+  parser.add_argument('-p', '--clean-temp', action='store_true', default=False,
+      help='Removes the temporary build files from the output directory.')

[kjellander_webrtc, 2017/03/13 13:15:02]

It's not clear to me that the script will exit after doing this. Either make it
clear here or just skip return 0 at line 163.

   parser.add_argument('-o', '--output-dir', default=SDK_OUTPUT_DIR,
       help='Specifies a directory to output the build artifacts to. '
            'If specified together with -c, deletes the dir.')
   parser.add_argument('-r', '--revision', type=int, default=0,
       help='Specifies a revision number to embed if building the framework.')
   parser.add_argument('-e', '--bitcode', action='store_true', default=False,
       help='Compile with bitcode.')
   parser.add_argument('--verbose', action='store_true', default=False,
       help='Debug logging.')
   parser.add_argument('--use-goma', action='store_true', default=False,
       help='Use goma to build.')
   parser.add_argument('--extra-gn-args', default=[], nargs='*',
       help='Additional GN args to be used during Ninja generation.')
 
   return parser.parse_args()
 
 
 def _RunCommand(cmd):
   logging.debug('Running: %r', cmd)
   subprocess.check_call(cmd, cwd=WEBRTC_SRC_DIR)
 
 
 def _CleanArtifacts(output_dir):
   if os.path.isdir(output_dir):
     logging.info('Deleting %s', output_dir)
     shutil.rmtree(output_dir)
 
 
+def _CleanTemporary(output_dir, architectures):
+  if os.path.isdir(output_dir):
+    logging.info('Removing temporary build files.')
+    for arch in architectures:
+      arch_lib_path = os.path.join(output_dir, arch + '_libs')
+      if os.path.isdir(arch_lib_path):
+        shutil.rmtree(arch_lib_path)
+
+
 def BuildWebRTC(output_dir, target_arch, flavor, build_type,
                 ios_deployment_target, libvpx_build_vp9, use_bitcode,
                 use_goma, extra_gn_args):
   output_dir = os.path.join(output_dir, target_arch + '_libs')
   gn_args = ['target_os="ios"', 'ios_enable_code_signing=false',
              'use_xcode_clang=true', 'is_component_build=false']
 
   # Add flavor option.
   if flavor == 'debug':
     gn_args.append('is_debug=true')
@@ skipping 48 matching lines @@
 def main():
   args = _ParseArgs()
 
   logging.basicConfig(level=logging.DEBUG if args.verbose else logging.INFO)
 
   if args.clean:
     _CleanArtifacts(args.output_dir)
     return 0
 
   architectures = list(args.arch)
+
+  if args.clean_temp:
+    _CleanTemporary(args.output_dir, architectures)
+    return 0
+
   # Ignoring x86 except for static libraries for now because of a GN build issue
   # where the generated dynamic framework has the wrong architectures.
   if 'x86' in architectures and args.build_type != 'static_only':
     architectures.remove('x86')
 
   # Build all architectures.
   for arch in architectures:
     BuildWebRTC(args.output_dir, arch, args.build_config, args.build_type,
                 IOS_DEPLOYMENT_TARGET, LIBVPX_BUILD_VP9, args.bitcode,
                 args.use_goma, args.extra_gn_args)
@@ skipping 53 matching lines @@
     cmd = ['PlistBuddy', '-c',
            'Print :CFBundleShortVersionString', infoplist_path]
     major_minor = subprocess.check_output(cmd).strip()
     version_number = '%s.%s' % (major_minor, args.revision)
     logging.info('Substituting revision number: %s', version_number)
     cmd = ['PlistBuddy', '-c',
            'Set :CFBundleVersion ' + version_number, infoplist_path]
     _RunCommand(cmd)
     _RunCommand(['plutil', '-convert', 'binary1', infoplist_path])
 
+

[kjellander_webrtc, 2017/03/13 13:15:02]

nit: Remove this blank line.

   logging.info('Done.')
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())