!15 global_resource_tool孵化准除，manifest加仓

Merge pull request !15 from 陈程/master

BUILD.gn

@@ -14,72 +14,74 @@
 import("//build/ohos.gni")
 import("//build/test.gni")
 ohos_executable("restool") {
-    sources = [ 
-        "src/xml/key_manager.cpp",
-        "src/xml/solid_xml.cpp",
-        "src/xml/xml_converter.cpp",
-        "src/xml/xml_key_node.cpp",
-        "src/cmd_list.cpp",
-        "src/cmd_parser.cpp",
-        "src/config_parser.cpp",
-        "src/factory_resource_compiler.cpp",
-        "src/file_entry.cpp",
-        "src/file_manager.cpp",
-        "src/generic_compiler.cpp",
-        "src/header.cpp",
-        "src/i_resource_compiler.cpp",
-        "src/id_worker.cpp",
-        "src/increment_index.cpp",
-        "src/increment_list.cpp",
-        "src/increment_manager.cpp",
-        "src/json_compiler.cpp",
-        "src/key_parser.cpp",
-        "src/module_combine.cpp",
-        "src/preview_manager.cpp",
-        "src/reference_parser.cpp",
-        "src/resource_directory.cpp",
-        "src/resource_item.cpp",
-        "src/resource_merge.cpp",
-        "src/resource_module.cpp",
-        "src/resource_module_inc.cpp",
-        "src/resource_pack.cpp",
-        "src/resource_table.cpp",
-        "src/resource_util.cpp",
-        "src/restool.cpp",
-        "src/solid_xml_compiler.cpp",
-        "src/sqlite_database.cpp",
-        "src/task_handle.cpp" 
-    ]
+  sources = [
+    "src/cmd_list.cpp",
+    "src/cmd_parser.cpp",
+    "src/config_parser.cpp",
+    "src/factory_resource_compiler.cpp",
+    "src/file_entry.cpp",
+    "src/file_manager.cpp",
+    "src/generic_compiler.cpp",
+    "src/header.cpp",
+    "src/i_resource_compiler.cpp",
+    "src/id_worker.cpp",
+    "src/increment_index.cpp",
+    "src/increment_list.cpp",
+    "src/increment_manager.cpp",
+    "src/json_compiler.cpp",
+    "src/key_parser.cpp",
+    "src/module_combine.cpp",
+    "src/preview_manager.cpp",
+    "src/reference_parser.cpp",
+    "src/resource_directory.cpp",
+    "src/resource_item.cpp",
+    "src/resource_merge.cpp",
+    "src/resource_module.cpp",
+    "src/resource_module_inc.cpp",
+    "src/resource_pack.cpp",
+    "src/resource_table.cpp",
+    "src/resource_util.cpp",
+    "src/restool.cpp",
+    "src/solid_xml_compiler.cpp",
+    "src/sqlite_database.cpp",
+    "src/task_handle.cpp",
+    "src/xml/key_manager.cpp",
+    "src/xml/solid_xml.cpp",
+    "src/xml/xml_converter.cpp",
+    "src/xml/xml_key_node.cpp",
+  ]
 
-    include_dirs = []
-    if (is_mingw) {
-        include_dirs += [
-            "//developtools/global_resource_tool/build/libxml2/win32/include"
-        ]
-    }
-    include_dirs += [
-        "include",
-        "//third_party/libxml2/include",
-        "//third_party/jsoncpp/include",
-        "//third_party/sqlite/include",
-        "//third_party/bounds_checking_function/include"
-    ]
+  include_dirs = []
+  if (is_mingw) {
+    include_dirs +=
+        [ "//developtools/global_resource_tool/build/libxml2/win32/include" ]
+  }
+  include_dirs += [
+    "include",
+    "//third_party/libxml2/include",
+    "//third_party/jsoncpp/include",
+    "//third_party/sqlite/include",
+    "//third_party/bounds_checking_function/include",
+  ]
 
-    deps = [ 
-        "//developtools/global_resource_tool/build/jsoncpp:restool_jsoncpp",
-        "//developtools/global_resource_tool/build/sqlite3:restool_sqlite",
-       "//developtools/global_resource_tool/build/libxml2:restool_libxml2",
-        "//developtools/global_resource_tool/build/bounds_checking_function:restool_bounds_checking_function"
-    ]
+  deps = [
+    "//developtools/global_resource_tool/build/bounds_checking_function:restool_bounds_checking_function",
+    "//developtools/global_resource_tool/build/jsoncpp:restool_jsoncpp",
+    "//developtools/global_resource_tool/build/libxml2:restool_libxml2",
+    "//developtools/global_resource_tool/build/sqlite3:restool_sqlite",
+  ]
 
-    cflags = [ "-std=c++17" ]
-    if (is_mingw) {
-        ldflags = [ "-static", "-lws2_32" ]
-    }
-    subsystem_name = "developtools"
-    part_name = "global_restool"
+  cflags = [ "-std=c++17" ]
+  if (is_mingw) {
+    ldflags = [
+      "-static",
+      "-lws2_32",
+    ]
+  }
+  subsystem_name = "developtools"
+  part_name = "global_restool"
 }
 
 ohos_unittest_py("restool_test") {
-    sources = [ "test/test.py" ]
-}
+  sources = [ "test/test.py" ]
+}

build/bounds_checking_function/BUILD.gn

@@ -10,28 +10,26 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
- 
+
 import("//build/ohos.gni")
 import("//third_party/bounds_checking_function/libsec_src.gni")
 ohos_static_library("restool_bounds_checking_function") {
-    sources = libsec_sources
+  sources = libsec_sources
 
-    include_dirs = [
-        "//third_party/bounds_checking_function/include"
-    ]
+  include_dirs = [ "//third_party/bounds_checking_function/include" ]
 
-    cflags_cc  = [ "-std=c++17" ]
-    cflags_c =[
-        "-Wno-attributes",
-        "-Wno-inconsistent-dllimport",
-        "-D_INC_STRING_S",
-        "-D_INC_WCHAR_S",
-        "-D_SECIMP=//",
-        "-D_STDIO_S_DEFINED",
-       "-D_INC_STDIO_S",
-       "-D_INC_STDLIB_S",
-       "-D_INC_MEMORY_S"
-    ]
-    subsystem_name = "developtools"
-    part_name = "global_restool"
-}
+  cflags_cc = [ "-std=c++17" ]
+  cflags_c = [
+    "-Wno-attributes",
+    "-Wno-inconsistent-dllimport",
+    "-D_INC_STRING_S",
+    "-D_INC_WCHAR_S",
+    "-D_SECIMP=//",
+    "-D_STDIO_S_DEFINED",
+    "-D_INC_STDIO_S",
+    "-D_INC_STDLIB_S",
+    "-D_INC_MEMORY_S",
+  ]
+  subsystem_name = "developtools"
+  part_name = "global_restool"
+}

build/jsoncpp/BUILD.gn

@@ -10,21 +10,19 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
- 
+
 import("//build/ohos.gni")
 ohos_static_library("restool_jsoncpp") {
-    sources = [
-        "//third_party/jsoncpp/src/lib_json/json_reader.cpp",
-        "//third_party/jsoncpp/src/lib_json/json_value.cpp",
-        "//third_party/jsoncpp/src/lib_json/json_writer.cpp"
-    ]
+  sources = [
+    "//third_party/jsoncpp/src/lib_json/json_reader.cpp",
+    "//third_party/jsoncpp/src/lib_json/json_value.cpp",
+    "//third_party/jsoncpp/src/lib_json/json_writer.cpp",
+  ]
 
-    include_dirs = [
-        "//third_party/jsoncpp/include"
-    ]
+  include_dirs = [ "//third_party/jsoncpp/include" ]
 
-    cflags = [ "-std=c++17" ]
-    use_exceptions = true
-    subsystem_name = "developtools"
-    part_name = "global_restool"
-}
+  cflags = [ "-std=c++17" ]
+  use_exceptions = true
+  subsystem_name = "developtools"
+  part_name = "global_restool"
+}

build/libxml2/BUILD.gn

@@ -14,31 +14,24 @@ import("//build/ohos.gni")
 LIBXML_PATH = "//third_party/libxml2"
 
 config("restool_libxml2_config") {
-    include_dirs = []
-    if (is_mingw) {
-        include_dirs += [ 
-          "//developtools/global_resource_tool/build/libxml2/win32/include"
-        ]
-        defines = [ "LIBXML_STATIC"]
-    } else {
-        include_dirs += [ 
-          "${LIBXML_PATH}/config"
-        ]
-    }
+  include_dirs = []
+  if (is_mingw) {
+    include_dirs +=
+        [ "//developtools/global_resource_tool/build/libxml2/win32/include" ]
+    defines = [ "LIBXML_STATIC" ]
+  } else {
+    include_dirs += [ "${LIBXML_PATH}/config" ]
+  }
 
-    include_dirs += [
-        "${LIBXML_PATH}/include"
-    ]
+  include_dirs += [ "${LIBXML_PATH}/include" ]
 
-    cflags_cc = [
-      "-std=c++17"
-    ]
+  cflags_cc = [ "-std=c++17" ]
 
-    cflags_c = [
-      "-Wno-implicit-fallthrough",
-      "-Wno-implicit-function-declaration",
-      "-Wno-int-conversion"
-    ]
+  cflags_c = [
+    "-Wno-implicit-fallthrough",
+    "-Wno-implicit-function-declaration",
+    "-Wno-int-conversion",
+  ]
 }
 
 ohos_static_library("restool_libxml2") {
@@ -133,11 +126,11 @@ ohos_static_library("restool_libxml2") {
     "${LIBXML_PATH}/xmlwriter.c",
     "${LIBXML_PATH}/xpath.c",
     "${LIBXML_PATH}/xpointer.c",
-    "${LIBXML_PATH}/xzlib.c"
-    ]
+    "${LIBXML_PATH}/xzlib.c",
+  ]
 
-    public_configs = [ ":restool_libxml2_config" ]
+  public_configs = [ ":restool_libxml2_config" ]
 
-    subsystem_name = "developtools"
-    part_name = "global_restool"
-}
+  subsystem_name = "developtools"
+  part_name = "global_restool"
+}

build/sqlite3/BUILD.gn

@@ -10,17 +10,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
- 
+
 import("//build/ohos.gni")
 ohos_static_library("restool_sqlite") {
-    sources = [
-        "//third_party/sqlite/src/sqlite3.c"
-    ]
+  sources = [ "//third_party/sqlite/src/sqlite3.c" ]
 
-    include_dirs = [
-        "//third_party/sqlite/include"
-    ]
+  include_dirs = [ "//third_party/sqlite/include" ]
 
-    subsystem_name = "developtools"
-    part_name = "global_restool"
-}
+  subsystem_name = "developtools"
+  part_name = "global_restool"
+}