fix:code update

Author: chli

python/base/__init__.py

@@ -37,6 +37,28 @@ class BuildConfigure(object):
  workspace: str
  install_prefix: str
  action: str
+ 
+ def prepare(self):
+ if not os.path.exists(self.workspace):
+ os.makedirs(self.workspace)
+ if not os.path.exists(self.install_prefix):
+ os.makedirs(self.install_prefix)
+ if not os.path.exists(self.get_arch_workspace()):
+ os.makedirs(self.get_arch_workspace())
+ if not os.path.exists(self.get_patch_dir()):
+ os.makedirs(self.get_patch_dir())
+ if not os.path.exists(self.get_samples_dir()):
+ os.makedirs(self.get_samples_dir())
+ 
+ def get_arch_workspace(self):
+ return os.path.join(self.workspace, self.arch)
+ 
+ def get_patch_dir(self):
+ return os.path.join(self.workspace, "patches")
+ 
+ def get_samples_dir(self):
+ return os.path.join(self.workspace, "samples")
+ 
 
 @dataclass
 class HostVars(object):
@@ -166,7 +188,7 @@ def get_platform_envs(cfg:BuildConfigure):
 
 
 class FFModule(ABC):
- def __init__(self, cfg: BuildConfigure, configs:dict = None):
+ def __init__(self, cfg: BuildConfigure, toolchain:ToolchainVars, host:HostVars):
  """_summary_
 
  Args:
@@ -175,13 +197,18 @@ def __init__(self, cfg: BuildConfigure, configs:dict = None):
  """
  self.cfg = cfg
  self.repo = None
- if configs:
- self.repo = Repo(configs["repo_url"], configs["repo_save_dir"])
 
+ @abstractmethod
+ def get_module_config(self) ->dict:
+ pass
 
- def init_sample_repo(self):
+ def init_sample_repo(self, repo_url, repo_save):
+ self.repo = Repo(repo_url, repo_save)
  if self.repo:
- self.repo.clone()
+ if not os.path.exists(repo_save):
+ self.repo.clone()
+ return
+ print(f"Sample repo {repo_save} exists, skip cloing!")
  else:
  raise InitError("No repo, maybe not initialized?")
 
@@ -202,21 +229,42 @@ def copy_sample_to_arch(self, parent_dir:str):
 
  @abstractmethod
  def do_init():
+ """do the initialization
+ 1. clone the source code, or download the library
+ 2. prepare all the patches
+ """
  pass
 
  @abstractmethod
  def do_install_prebuilt():
+ """install the prebuilt libraries
+ if no prebuilt, an error will be raised.
+ """
  pass
 
  @abstractmethod
  def prebuild(self):
+ """jobs before building
+ 1. copy to arch
+ 2. apply patches
+ 3. detect and setup third libraries
+ 4. prepare the directories
+ """
  pass
 
  @abstractmethod
- def build(self, toolchain_vars: dict):
+ def build(self, toolchain_vars: dict, host_vars: dict):
+ """do the build work
+
+ Args:
+ toolchain_vars (dict): the detected toolchain variables
+ host_vars: the detected host variables
+ """
  pass
 
  @abstractmethod
  def postbuild(self):
+ """dirty works after build
+ """
  pass
 

python/main.py

@@ -1,6 +1,8 @@
 import argparse
 import logging
 import base
+import os
+import module_ffmpeg
 
 def setup_loggers(logger_path:str):
  logger = logging.getLogger('build')
@@ -24,23 +26,45 @@ def setup_loggers(logger_path:str):
  logger.addHandler(console_handler)
  return logger
 
+
 def parse_args():
  parser = argparse.ArgumentParser()
  parser.add_argument('-p', '--platform', type=str, default='android', choices=['apple', 'android', 'ios', 'tvos', 'macos', 'all'], help='platform must be: [apple|android|ios|tvos|macos|all]')
  # only avalibale for apple
  parser.add_argument('-a', '--arch', type=str, default='arm64', choices=['arm64', 'arm64-simulator','x86_64', 'x86_64-simulator', 'all'], help='arch must be: [arm64|arm64-simulator|x86_64|x86_64-simulator|all], only avaliable for apple')
  parser.add_argument('-w', '--workspace', type=str, default='build', help='specify workspace')
  parser.add_argument('--prefix', type=str, help='install the library')
- parser.add_argument('--install', action='store_true', help='install the library')
- parser.add_argument('--init', action='store_true', help='initialize the library')
- parser.add_argument('--build', action='store_true', help='build the library')
+ parser.add_argument('--action', type=str, default='init', choices=['init', 'build', 'install'], help='action must be: [init|build|install]')
+ parser.add_argument('--library', type=str, default="", help='specify the library name')
+ # parser.add_argument('--install', action='store_true', help='install the library')
+ # # prepare the repo, clone the sample code, and don't build it.
+ # parser.add_argument('--init', action='store_true', help='initialize the library')
+ # parser.add_argument('--build', action='store_true', help='build the library')
 
  args = parser.parse_args()
  return args
 
+def preapre_workspaces(bcfg:base.BuildConfigure):
+ if not bcfg.action == "init":
+ logger.info("Not initialize the library, skip checking workspace!")
+ return
+ bcfg.prepare()
+ 
 if __name__ == "__main__":
  args = parse_args()
  logger = setup_loggers("build.log")
- args = base.BuildConfigure(args.platform, args.arch, args.workspace, args.prefix, args.build)
- print(base.get_platform_envs(args))
+ build_cfg = base.BuildConfigure(args.platform, args.arch, args.workspace, args.prefix, args.action)
+ toolchain_vars, host_vars = base.get_platform_envs(build_cfg)
+ preapre_workspaces(build_cfg)
+
+ ffmpeg_module = module_ffmpeg.FFMpegModule(build_cfg, toolchain_vars, host_vars)
+ # "repo": "https://github.com/FFmpeg/FFmpeg.git",
+ # "repo_env": "REPO_FFMPEG",
+ # "repo_save_dir": "FFmpeg"
+ ffconfig=ffmpeg_module.get_module_config()
+ repo = os.environ.get(ffconfig["repo_env"], ffconfig['repo'])
+ repo_save_dir= os.path.join(build_cfg.get_samples_dir(), ffconfig['repo_save_dir'])
+ ffmpeg_module.init_sample_repo(repo, repo_save_dir)
+ 
+ # print(base.get_platform_envs(args))
  pass

python/module_ffmpeg/__init__.py

@@ -1,6 +1,9 @@
 import os
 import subprocess
-import config
+# import config
+from .config import *
+from base import *
+
 MODULE_CONFIG = {
  "name": "ffmpeg",
  "libraries": [
@@ -16,6 +19,8 @@
  "repo_save_dir": "FFmpeg"
 }
 
+
+
 def wait_proc(proc:subprocess.Popen):
  sto, ste = proc.communicate()
  if proc.returncode != 0 :
@@ -39,7 +44,7 @@ def build_repo_android(source_path: str, install_prefix: str, toolchain_vars: di
  env.update(toolchain_vars)
  if not os.path.exists("config.h") or force_re_compile:
  # 构建命令参数
- cfg_flags = config.configs
+ cfg_flags = configs
  triple_cc = env.get('TRIPLE_CC', '')
  ar = env.get('AR', '')
  nm = env.get('NM', '')
@@ -86,4 +91,49 @@ def build_repo_android(source_path: str, install_prefix: str, toolchain_vars: di
  finally:
  os.chdir(old_wk_dir)
 
-# after build
+# after build
+
+class FFMpegModule(FFModule):
+ def __init__(self, cfg: BuildConfigure,toolchain:ToolchainVars, host:HostVars):
+ super().__init__(cfg, toolchain, host)
+ 
+ def get_module_config(self):
+ return MODULE_CONFIG
+ 
+
+ def do_init():
+ """do the initialization
+ 1. clone the source code, or download the library
+ 2. prepare all the patches
+ """
+ pass
+
+ def do_install_prebuilt():
+ """install the prebuilt libraries
+ if no prebuilt, an error will be raised.
+ """
+ pass
+ 
+ def prebuild(self):
+ """jobs before building
+ 1. copy to arch
+ 2. apply patches
+ 3. detect and setup third libraries
+ 4. prepare the directories
+ """
+ pass
+ 
+ def build(self, toolchain_vars: dict, host_vars: dict):
+ """do the build work
+
+ Args:
+ toolchain_vars (dict): the detected toolchain variables
+ host_vars: the detected host variables
+ """
+ pass
+ 
+ def postbuild(self):
+ """dirty works after build
+ """
+ pass
+