diff --git a/BUILD.gn b/BUILD.gn index 602a3c5290b8b9719aae55e73d129450350f6bdd..79e146a90ebaad7b1c02728b624908fc742f3257 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -52,13 +52,14 @@ action("backends_action") { ] } -config("base_config") { +config("backends_public_config") { include_dirs = [ - ".", "./include", "./include/sane", ] +} +config("backends_private_config") { cflags = [ "-Wall", "-g", @@ -84,20 +85,17 @@ config("base_config") { "PATH_SANE_TMP_DIR=$SANE_TMP_DIR", "V_MAJOR=$SANE_V_MAJOR", "V_MINOR=$SANE_V_MINOR", + "LIBDIR=\"$SANE_LIB_DIR\"", ] } -config("backend_config") { - configs = [ ":base_config" ] - - defines = [ "LIBDIR=\"$SANE_LIB_DIR\"" ] -} - #build targets in /lib ohos_source_set("lib") { sources = [ "./lib/md5.c" ] - configs = [ ":base_config" ] + public_configs = [ ":backends_public_config" ] + + configs = [ ":backends_private_config" ] subsystem_name = "thirdparty" part_name = "backends" @@ -139,7 +137,9 @@ foreach(name, sanei_names) { external_deps = [ "hilog:libhilog" ] } - configs = [ ":base_config" ] + public_configs = [ ":backends_public_config" ] + + configs = [ ":backends_private_config" ] subsystem_name = "thirdparty" part_name = "backends" @@ -163,7 +163,9 @@ ohos_source_set("sanei_usb") { "usb_manager:usbsrv_client", ] - configs = [ ":base_config" ] + public_configs = [ ":backends_public_config" ] + + configs = [ ":backends_private_config" ] subsystem_name = "thirdparty" part_name = "backends" @@ -180,7 +182,9 @@ ohos_static_library("sanei") { external_deps = [ "hilog:libhilog" ] } - configs = [ ":base_config" ] + public_configs = [ ":backends_public_config" ] + + configs = [ ":backends_private_config" ] subsystem_name = "thirdparty" part_name = "backends" @@ -190,7 +194,9 @@ ohos_static_library("sanei") { ohos_source_set("sane_strstatus") { sources = [ "./backend/sane_strstatus.c" ] - configs = [ ":backend_config" ] + public_configs = [ ":backends_public_config" ] + + configs = [ ":backends_private_config" ] subsystem_name = "thirdparty" part_name = "backends" @@ -202,7 +208,9 @@ ohos_shared_library("sane") { "./backend/stubs.c", ] - configs = [ ":backend_config" ] + public_configs = [ ":backends_public_config" ] + + configs = [ ":backends_private_config" ] defines = [ "BACKEND_NAME=dll" ] diff --git a/bundle.json b/bundle.json index 14586538f2e513fc903d5cd57c830291089604df..889b4b20d981c3393f446a411ed7cb7e8d159574 100644 --- a/bundle.json +++ b/bundle.json @@ -32,14 +32,14 @@ ], "inner_kits": [ { - "name": "//third_party/backends:third_sane", "header": { + "header_base": "//third_party/backends/include/sane/", "header_files": [ - "sane/sane.h", - "sane/saneopts.h" - ], - "header_base": "//third_party/backends/include" - } + "sane.h", + "saneopts.h" + ] + }, + "name": "//third_party/backends:sane" } ], "test": [] diff --git a/install.py b/install.py index dae99bb1ff1cc902ee0a2167f1a465c5e5aef58d..e6efcc18d861b3379963761b66cb1e9fc02dcff5 100755 --- a/install.py +++ b/install.py @@ -25,16 +25,18 @@ def apply_patch(source_dir): 'usbmanager.patch' ] + reject_file = '/dev/null' + for patch in patch_list: patch_dir = os.path.join(source_dir, 'patches', patch) - try : - patch_cmd = ['patch', '-p1', "--fuzz=0", "--no-backup-if-mismatch", '-i', patch_dir, '-d', source_dir] - subprocess.run(patch_cmd, check=True) - except Exception as e: - print("apply_patch error, revserse patch") - patch_cmd = ['patch', '-R', '-p1', "--fuzz=0", "--no-backup-if-mismatch", '-i', patch_dir, '-d', source_dir] - subprocess.run(patch_cmd, check=True) - continue + patch_cmd = ['patch', '-p1', "--fuzz=0", "--no-backup-if-mismatch", '--reject-file=' + reject_file, '-i', patch_dir, '-d', source_dir] + + try: + result = subprocess.run(patch_cmd, check=True, text=True, capture_output=True) + if result.returncode != 0: + raise subprocess.CalledProcessError(result.returncode, result.args) + except subprocess.CalledProcessError: + print("//third_party/backends/patches/usbmanager.patch apply error!") def cp_file(source_dir, gen_dir): src_list = [