cocoapods-kz 0.0.7 → 0.0.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/cocoapods-kz/command/info.rb +37 -0
- data/lib/cocoapods-kz/command/install.rb +1 -1
- data/lib/cocoapods-kz/command/kz.rb +1 -17
- data/lib/cocoapods-kz/command/repair.rb +1 -0
- data/lib/cocoapods-kz/command/update.rb +1 -1
- data/lib/cocoapods-kz/gem_version.rb +1 -1
- data/lib/cocoapods-kz/helpers/kz_analyzer.rb +23 -9
- data/lib/cocoapods-kz/helpers/kz_config_result.rb +1 -1
- data/lib/cocoapods-kz/helpers/kz_framework_manager.rb +3 -3
- data/lib/cocoapods-kz/helpers/kz_generator.rb +16 -57
- data/lib/cocoapods-kz/helpers/kz_global_helper.rb +48 -15
- data/lib/cocoapods-kz/helpers/kz_pod_target.rb +79 -14
- data/lib/cocoapods-kz/native/dls.rb +10 -0
- data/lib/cocoapods-kz/native/installer.rb +28 -5
- data/lib/cocoapods-kz/native/pod_target.rb +10 -0
- data/lib/cocoapods-kz/native/pod_target_installer.rb +22 -6
- data/lib/cocoapods-kz/native/pods_project_writer.rb +22 -0
- data/lib/cocoapods-kz/native/target_installer_helper.rb +33 -18
- data/lib/cocoapods-kz/native.rb +1 -1
- data/lib/cocoapods-kz/resources/kz_fix_force_load_exe.sh +12 -0
- data/lib/cocoapods-kz/resources/kz_generator_framework.sh +37 -0
- data/lib/cocoapods-kz/resources/kz_refresh_pods_pbxproj.rb +15 -0
- data/lib/cocoapods-kz/resources/kz_xml_build.sh +9 -0
- metadata +8 -4
- data/lib/cocoapods-kz/native/analyzer.rb +0 -23
- data/lib/cocoapods-kz/resources/kz_merge_swift_h.rb +0 -14
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 9f2ecfbcbc07e3ac505466898ae1b82fe6daf936bcfc56d7a128c7256a000888
|
4
|
+
data.tar.gz: '07248a9d57a52e6f2948b2d893d7463d8581f90d4bf29104df5d3465f991355c'
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b32004addf7c59b259281c83d92fab22dc85d5e7f021992f9a3a86af996d8c3de764885fc6bf8b44b2094716743d9cb45133398f4468733c95def92fba911886
|
7
|
+
data.tar.gz: 4552647daba1c5c5265bc67302e84788a17bed18d6d87c93e70f90c6d3e97d393c342f6109f1f2f43e3a82ad3ab7071168e39df64b4b9ab35f9b3a308d6a06a8
|
@@ -0,0 +1,37 @@
|
|
1
|
+
require 'json'
|
2
|
+
|
3
|
+
module Pod
|
4
|
+
class Command
|
5
|
+
class Kz < Command
|
6
|
+
class Info < Kz
|
7
|
+
self.summary = 'pod kz info,用于打印项目pod信息'
|
8
|
+
|
9
|
+
self.description = <<-DESC
|
10
|
+
结合可选子命令用于执行各种修补脚本
|
11
|
+
DESC
|
12
|
+
|
13
|
+
def initialize(argv)
|
14
|
+
KZ::KZGlobalHelper.instance.analyze_special_parameters(true, false, argv.arguments!)
|
15
|
+
KZ::KZGlobalHelper.instance.generate_kz_pod_targets = true
|
16
|
+
super
|
17
|
+
end
|
18
|
+
|
19
|
+
def run
|
20
|
+
installer = installer_for_config
|
21
|
+
installer.prepare
|
22
|
+
installer.resolve_dependencies
|
23
|
+
installer.download_dependencies
|
24
|
+
|
25
|
+
result_info = {}
|
26
|
+
KZ::KZGlobalHelper.instance.kz_analyzer.all_kz_pod_targets.values.each do |kz_pod_target|
|
27
|
+
pod_info = {}
|
28
|
+
pod_info["path"] = kz_pod_target.native_pod_target.sandbox.pod_dir(kz_pod_target.name)
|
29
|
+
pod_info["is_dev"] = kz_pod_target.is_dev_pod
|
30
|
+
result_info[kz_pod_target.name] = pod_info
|
31
|
+
end
|
32
|
+
puts result_info.to_json
|
33
|
+
end
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end
|
@@ -29,7 +29,7 @@ module Pod
|
|
29
29
|
def initialize(argv)
|
30
30
|
use_code_tag = argv.flag?('code')
|
31
31
|
use_framework_tag = argv.flag?('framework')
|
32
|
-
banner! if use_code_tag && use_framework_tag
|
32
|
+
banner! if (use_code_tag && use_framework_tag) || (!use_code_tag && !use_framework_tag && !argv.empty?)
|
33
33
|
|
34
34
|
KZ::KZGlobalHelper.instance.analyze_special_parameters(use_code_tag, use_framework_tag, argv.arguments!)
|
35
35
|
if Pod.match_version?('~> 1.11')
|
@@ -2,26 +2,10 @@ require_relative 'install'
|
|
2
2
|
require_relative 'update'
|
3
3
|
require_relative 'repair'
|
4
4
|
require_relative 'clean'
|
5
|
+
require_relative 'info'
|
5
6
|
|
6
7
|
module Pod
|
7
8
|
class Command
|
8
|
-
# This is an example of a cocoapods plugin adding a top-level subcommand
|
9
|
-
# to the 'pod' command.
|
10
|
-
#
|
11
|
-
# You can also create subcommands of existing or new commands. Say you
|
12
|
-
# wanted to add a subcommand to `list` to show newly deprecated pods,
|
13
|
-
# (e.g. `pod list deprecated`), there are a few things that would need
|
14
|
-
# to change.
|
15
|
-
#
|
16
|
-
# - move this file to `lib/pod/command/list/deprecated.rb` and update
|
17
|
-
# the class to exist in the the Pod::Command::List namespace
|
18
|
-
# - change this class to extend from `List` instead of `Command`. This
|
19
|
-
# tells the plugin system that it is a subcommand of `list`.
|
20
|
-
# - edit `lib/cocoapods_plugins.rb` to require this file
|
21
|
-
#
|
22
|
-
# @todo Create a PR to add your plugin to CocoaPods/cocoapods.org
|
23
|
-
# in the `plugins.json` file, once your plugin is released.
|
24
|
-
#
|
25
9
|
class Kz < Command
|
26
10
|
self.summary = 'Short description of cocoapods-kz.'
|
27
11
|
self.abstract_command = true
|
@@ -29,7 +29,7 @@ module Pod
|
|
29
29
|
def initialize(argv)
|
30
30
|
use_code_tag = argv.flag?('code')
|
31
31
|
use_framework_tag = argv.flag?('framework')
|
32
|
-
banner! if use_code_tag && use_framework_tag
|
32
|
+
banner! if (use_code_tag && use_framework_tag) || (!use_code_tag && !use_framework_tag && !argv.empty?)
|
33
33
|
|
34
34
|
KZ::KZGlobalHelper.instance.analyze_special_parameters(use_code_tag, use_framework_tag, argv.arguments!)
|
35
35
|
if Pod.match_version?('~> 1.11')
|
@@ -20,18 +20,32 @@ module KZ
|
|
20
20
|
# 检测是否有product名称相同的target
|
21
21
|
temp_repeat_product_name = []
|
22
22
|
@all_kz_pod_targets.each do |name, kz_pod_target|
|
23
|
-
|
23
|
+
result = KZGlobalHelper.instance.pod_config_result_with_target(kz_pod_target)
|
24
|
+
if temp_repeat_product_name.include?("#{kz_pod_target.product_name}_#{kz_pod_target.platform_name}")
|
24
25
|
kz_pod_target.product_name = "#{kz_pod_target.name}.framework"
|
25
26
|
kz_pod_target.product_basename = kz_pod_target.name
|
26
|
-
result = KZGlobalHelper.instance.pod_config_result_with_target(kz_pod_target)
|
27
27
|
if result
|
28
|
-
kz_pod_target.repair_modulemap_path =
|
28
|
+
kz_pod_target.repair_modulemap_path = "${PODS_XCFRAMEWORKS_BUILD_DIR}/#{kz_pod_target.root_name}/#{kz_pod_target.product_name}/Modules/module.modulemap"
|
29
|
+
if kz_pod_target.origin_uses_swift?
|
30
|
+
kz_pod_target.repair_swift_include_path = "${PODS_XCFRAMEWORKS_BUILD_DIR}/#{kz_pod_target.root_name}/#{kz_pod_target.product_name}/Modules"
|
31
|
+
end
|
29
32
|
else
|
30
|
-
kz_pod_target.repair_modulemap_path = "
|
33
|
+
kz_pod_target.repair_modulemap_path = "#{kz_pod_target.native_pod_target.configuration_build_dir}/#{kz_pod_target.product_name}/Modules/module.modulemap"
|
34
|
+
if kz_pod_target.origin_uses_swift?
|
35
|
+
kz_pod_target.repair_swift_include_path = "#{kz_pod_target.native_pod_target.configuration_build_dir}/#{kz_pod_target.product_name}/Modules"
|
36
|
+
end
|
31
37
|
end
|
32
38
|
kz_pod_target.need_repair_module_import = true
|
33
|
-
|
34
|
-
temp_repeat_product_name << kz_pod_target.product_name
|
39
|
+
elsif kz_pod_target.origin_should_build?
|
40
|
+
temp_repeat_product_name << "#{kz_pod_target.product_name}_#{kz_pod_target.platform_name}"
|
41
|
+
end
|
42
|
+
|
43
|
+
if kz_pod_target.force_load
|
44
|
+
if result
|
45
|
+
kz_pod_target.force_load_info = "${PODS_XCFRAMEWORKS_BUILD_DIR}/#{kz_pod_target.root_name}/#{kz_pod_target.product_name}/#{kz_pod_target.product_basename}"
|
46
|
+
else
|
47
|
+
kz_pod_target.force_load_info = "#{kz_pod_target.configuration_build_dir(true)}/#{kz_pod_target.product_name}/#{kz_pod_target.product_basename}"
|
48
|
+
end
|
35
49
|
end
|
36
50
|
end
|
37
51
|
end
|
@@ -131,9 +145,9 @@ module KZ
|
|
131
145
|
end
|
132
146
|
|
133
147
|
def use_framework_mode_from_lock_file?(kz_pod_target)
|
134
|
-
|
135
|
-
|
136
|
-
pod_lock_config =
|
148
|
+
olde_lock_file_content = KZGlobalHelper.instance.olde_lock_file_content
|
149
|
+
if olde_lock_file_content
|
150
|
+
pod_lock_config = olde_lock_file_content[kz_pod_target.name]
|
137
151
|
return :kz_pod_framework_mode if pod_lock_config && pod_lock_config['use_framework']
|
138
152
|
end
|
139
153
|
:kz_pod_code_mode
|
@@ -30,7 +30,7 @@ module KZ
|
|
30
30
|
next if framework_name == '.' || framework_name == '..' || framework_name == '.DS_Store'
|
31
31
|
|
32
32
|
framework_path = @resource_path + framework_name
|
33
|
-
if File.directory?(framework_path) && framework_name.end_with?(".
|
33
|
+
if File.directory?(framework_path) && framework_name.end_with?(".xcframework")
|
34
34
|
framework_paths << framework_path
|
35
35
|
end
|
36
36
|
end
|
@@ -21,10 +21,10 @@ module KZ
|
|
21
21
|
return @@all_resources_cache_info
|
22
22
|
end
|
23
23
|
|
24
|
-
Dir.foreach(
|
24
|
+
Dir.foreach(KZ_POD_CONFIG_POD_TARGETS) do |folder_name|
|
25
25
|
next if folder_name == '.' || folder_name == '..' || folder_name == '.DS_Store'
|
26
26
|
|
27
|
-
config_folder =
|
27
|
+
config_folder = KZ_POD_CONFIG_POD_TARGETS + folder_name
|
28
28
|
if File.directory?(config_folder)
|
29
29
|
Dir.foreach(config_folder) do |version|
|
30
30
|
next if version == '.' || version == '..' || version == '.DS_Store'
|
@@ -35,7 +35,7 @@ module KZ
|
|
35
35
|
Dir.foreach(version_folder) do |file_name|
|
36
36
|
next if file_name == '.' || file_name == '..' || file_name == '.DS_Store'
|
37
37
|
|
38
|
-
if file_name.end_with?(".
|
38
|
+
if file_name.end_with?(".xcframework") && File.directory?(version_folder + file_name)
|
39
39
|
have_framework = true
|
40
40
|
break
|
41
41
|
end
|
@@ -15,57 +15,15 @@ module KZ
|
|
15
15
|
|
16
16
|
build_phase = native_target.new_shell_script_build_phase('[KZ] Generate Framework')
|
17
17
|
build_phase.show_env_vars_in_log = '0'
|
18
|
-
build_phase.output_paths = ['${KZ_FRAMEWORK_CACHE_PATH}/${
|
19
|
-
build_phase.shell_script =
|
20
|
-
if [ "${MACH_O_TYPE}" != "staticlib" ]; then
|
21
|
-
exit 0
|
22
|
-
fi
|
23
|
-
|
24
|
-
PRODUCT_DIR=${PODS_BUILD_DIR}/Debug-iphoneos/${TARGET_NAME}/${FULL_PRODUCT_NAME}
|
25
|
-
PRODUCT_SIMULATOR_DIR=${PODS_BUILD_DIR}/Debug-iphonesimulator/${TARGET_NAME}/${FULL_PRODUCT_NAME}
|
26
|
-
CURRENT_PRODUCT_DIR=${PODS_CONFIGURATION_BUILD_DIR}/${TARGET_NAME}
|
27
|
-
|
28
|
-
if [ -d "${KZ_FRAMEWORK_CACHE_PATH}" ]; then
|
29
|
-
rm -r "${KZ_FRAMEWORK_CACHE_PATH}"
|
30
|
-
fi
|
31
|
-
mkdir -p "${KZ_FRAMEWORK_CACHE_PATH}"
|
32
|
-
|
33
|
-
if [ -d "${KZ_FRAMEWORK_CACHE_PATH}/${FULL_PRODUCT_NAME}" ]; then
|
34
|
-
rm -r "${KZ_FRAMEWORK_CACHE_PATH}/${FULL_PRODUCT_NAME}"
|
35
|
-
fi
|
36
|
-
cp -r ${CURRENT_PRODUCT_DIR}/${FULL_PRODUCT_NAME} "${KZ_FRAMEWORK_CACHE_PATH}"
|
37
|
-
|
38
|
-
find "${CURRENT_PRODUCT_DIR}" -iname "*.bundle" | while read -r BUNDLE_FILE; do
|
39
|
-
BUNDLE_NAME=$(basename ${BUNDLE_FILE})
|
40
|
-
if [ -d "${KZ_FRAMEWORK_CACHE_PATH}/${BUNDLE_NAME}" ]; then
|
41
|
-
rm -r "${KZ_FRAMEWORK_CACHE_PATH}/${BUNDLE_NAME}"
|
42
|
-
fi
|
43
|
-
cp -r ${BUNDLE_FILE} "${KZ_FRAMEWORK_CACHE_PATH}"
|
44
|
-
done
|
45
|
-
|
46
|
-
if [ -f ${PRODUCT_DIR}/${PRODUCT_NAME} ] && [ -f ${PRODUCT_SIMULATOR_DIR}/${PRODUCT_NAME} ]; then
|
47
|
-
lipo -create ${PRODUCT_DIR}/${PRODUCT_NAME} ${PRODUCT_SIMULATOR_DIR}/${PRODUCT_NAME} -output "${KZ_FRAMEWORK_CACHE_PATH}/${FULL_PRODUCT_NAME}/${PRODUCT_NAME}"
|
48
|
-
fi
|
49
|
-
|
50
|
-
if [ -d ${PRODUCT_DIR}/Modules/${PRODUCT_NAME}.swiftmodule ] && [ -d ${PRODUCT_SIMULATOR_DIR}/Modules/${PRODUCT_NAME}.swiftmodule ]; then
|
51
|
-
cp -r ${PRODUCT_DIR}/Modules/${PRODUCT_NAME}.swiftmodule "${KZ_FRAMEWORK_CACHE_PATH}/${FULL_PRODUCT_NAME}/Modules"
|
52
|
-
cp -r ${PRODUCT_SIMULATOR_DIR}/Modules/${PRODUCT_NAME}.swiftmodule "${KZ_FRAMEWORK_CACHE_PATH}/${FULL_PRODUCT_NAME}/Modules"
|
53
|
-
fi
|
54
|
-
|
55
|
-
PRODUCT_SWIFT_H=${PRODUCT_DIR}/Headers/${PRODUCT_NAME}-Swift.h
|
56
|
-
PRODUCT_SIMULATOR_SWIFT_H=${PRODUCT_SIMULATOR_DIR}/Headers/${PRODUCT_NAME}-Swift.h
|
57
|
-
TARGET_SWIFT_H=${KZ_FRAMEWORK_CACHE_PATH}/${FULL_PRODUCT_NAME}/Headers/${PRODUCT_NAME}-Swift.h
|
58
|
-
if [ -f $PRODUCT_SWIFT_H ] && [ -f $PRODUCT_SIMULATOR_SWIFT_H ]; then
|
59
|
-
ruby "$KZ_MERGE_SWIFT_H_PATH" "$PRODUCT_SWIFT_H" "$PRODUCT_SIMULATOR_SWIFT_H" "$TARGET_SWIFT_H"
|
60
|
-
fi
|
61
|
-
}
|
18
|
+
build_phase.output_paths = ['${KZ_FRAMEWORK_CACHE_PATH}/${PRODUCT_NAME}.xcframework']
|
19
|
+
build_phase.shell_script = KZ.deal_path_for_xcconfig(KZ_GENERATOR_FRAMEWORK_PATH, true)
|
62
20
|
end
|
63
21
|
|
64
22
|
def add_flexlib_xml_build_rules(project, native_target)
|
65
23
|
return unless KZ::KZGlobalHelper.instance.have_flexLib_pod_target
|
66
24
|
|
67
25
|
native_target.build_configurations.each do |config|
|
68
|
-
config.build_settings["KZ_XML_FLEX_COMPILER"] = FLEX_COMPLIER_PATH
|
26
|
+
config.build_settings["KZ_XML_FLEX_COMPILER"] = KZ.deal_path_for_xcconfig(FLEX_COMPLIER_PATH, false)
|
69
27
|
config.build_settings["KZ_XML_FLEX_DIR"] = "${TARGET_TEMP_DIR}/XmlFlexs"
|
70
28
|
config.build_settings["KZ_XML_FLEX_BUILD_DIR"] = "${TARGET_BUILD_DIR}/${PRODUCT_NAME}.bundle"
|
71
29
|
end
|
@@ -73,15 +31,16 @@ fi
|
|
73
31
|
xml_rule = new_build_rule(project, native_target, '[KZ] Custom Xml Build')
|
74
32
|
xml_rule.file_type = 'text.xml'
|
75
33
|
xml_rule.output_files = Array['${KZ_XML_FLEX_DIR}/${INPUT_FILE_BASE}.flex']
|
76
|
-
xml_rule.script =
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
34
|
+
xml_rule.script = KZ.deal_path_for_xcconfig(KZ_XML_BUILD_PATH, true)
|
35
|
+
end
|
36
|
+
|
37
|
+
def add_force_load_exe_path_build_phase(native_target, output_path)
|
38
|
+
return if KZ::KZGlobalHelper.instance.disable_generate_framework
|
39
|
+
|
40
|
+
build_phase = native_target.new_shell_script_build_phase('[KZ] Froce Load File Output Path')
|
41
|
+
build_phase.show_env_vars_in_log = '0'
|
42
|
+
build_phase.output_paths = [output_path]
|
43
|
+
build_phase.shell_script = KZ.deal_path_for_xcconfig(KZ_FIX_FORCE_LOAD_EXE, true)
|
85
44
|
end
|
86
45
|
|
87
46
|
def new_build_rule(project, native_target, name)
|
@@ -154,7 +113,7 @@ fi}
|
|
154
113
|
end
|
155
114
|
|
156
115
|
# 添加私有头文件引用
|
157
|
-
if kz_pod_target.
|
116
|
+
if kz_pod_target.current_should_build?
|
158
117
|
private_hamp_info = private_hmap_info(kz_pod_target)
|
159
118
|
if private_hamp_info.count > 0
|
160
119
|
hmap_cache_path = kz_pod_target.pod_config_cache_path(false)
|
@@ -219,7 +178,7 @@ fi}
|
|
219
178
|
def private_hmap_info(kz_pod_target)
|
220
179
|
header_paths = kz_pod_target.all_headers
|
221
180
|
# 更新Headers
|
222
|
-
if kz_pod_target.is_dev_pod
|
181
|
+
if kz_pod_target.is_dev_pod
|
223
182
|
header_paths.each do |header_pathname|
|
224
183
|
symlink_path = kz_pod_target.local_private_headers_path + header_pathname.basename
|
225
184
|
File.symlink(header_pathname, symlink_path) unless File.symlink?(symlink_path) || File.exist?(symlink_path)
|
@@ -246,7 +205,7 @@ fi}
|
|
246
205
|
hmap_info[kz_pod_target.product_basename + '/' + header_pathname_basename] = header_hmap_value_quotes
|
247
206
|
end
|
248
207
|
|
249
|
-
if kz_pod_target.
|
208
|
+
if kz_pod_target.current_uses_swift? && kz_pod_target.is_dev_pod
|
250
209
|
# 修改SPBoss-Swift.h文件的导入方式
|
251
210
|
swift_bridge_file_name = "#{kz_pod_target.name}-Swift.h"
|
252
211
|
hmap_info[swift_bridge_file_name] = { 'suffix' => swift_bridge_file_name, 'prefix' => "#{kz_pod_target.name}/" }
|
@@ -7,15 +7,22 @@ require_relative 'kz_config_result'
|
|
7
7
|
require_relative 'kz_pod_target'
|
8
8
|
|
9
9
|
module KZ
|
10
|
+
KZ_POD_CONFIG_VERSION = '1.0.2'
|
10
11
|
KZ_POD_CONFIG_ROOT = Pod::Config.instance.installation_root + 'Pods/KZPodConfigure'
|
12
|
+
KZ_POD_CONFIG_SUPPORT_FILES = KZ_POD_CONFIG_ROOT + 'SupportFiles'
|
13
|
+
KZ_POD_CONFIG_POD_TARGETS = KZ_POD_CONFIG_ROOT + 'PodTargets'
|
14
|
+
KZ_POD_CONFIG_POD_TEMPDIR = KZ_POD_CONFIG_ROOT + '.tempdir'
|
11
15
|
KZ_POD_CONFIG_ROOT_STR = "${PODS_ROOT}/KZPodConfigure"
|
12
16
|
# 修复pod lib报错问题
|
13
17
|
Pod::Config.instance.installation_root = nil
|
14
18
|
|
15
19
|
HMAP_EXECUTE_PATH = File.dirname(__FILE__) + '/../resources/hmap'
|
16
|
-
FLEX_COMPLIER_PATH =
|
20
|
+
FLEX_COMPLIER_PATH = KZ_POD_CONFIG_SUPPORT_FILES + 'FlexCompiler'
|
21
|
+
KZ_GENERATOR_FRAMEWORK_PATH = KZ_POD_CONFIG_SUPPORT_FILES + 'kz_generator_framework.sh'
|
22
|
+
KZ_XML_BUILD_PATH = KZ_POD_CONFIG_SUPPORT_FILES + 'kz_xml_build.sh'
|
17
23
|
KZ_LOCK_FILE_PATH = KZ_POD_CONFIG_ROOT + 'KZConfigLock'
|
18
|
-
|
24
|
+
KZ_FIX_FORCE_LOAD_EXE = KZ_POD_CONFIG_SUPPORT_FILES + 'kz_fix_force_load_exe.sh'
|
25
|
+
KZ_FEFRESH_PODS_PBXPROJ = KZ_POD_CONFIG_SUPPORT_FILES + 'kz_refresh_pods_pbxproj.rb'
|
19
26
|
|
20
27
|
def self.deal_path_for_xcconfig(path, add_quotes = false)
|
21
28
|
if path.is_a?(String)
|
@@ -52,6 +59,7 @@ module KZ
|
|
52
59
|
@kz_config_lock = {}
|
53
60
|
@disable_generate_framework = false
|
54
61
|
@generate_kz_pod_targets = false
|
62
|
+
@olde_lock_file_content = nil
|
55
63
|
end
|
56
64
|
|
57
65
|
@@instance = nil
|
@@ -62,14 +70,30 @@ module KZ
|
|
62
70
|
|
63
71
|
def prepare
|
64
72
|
if Pod::Config.instance.podfile && Pod::Config.instance.podfile.plugins.has_key?("cocoapods-kz")
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
FileUtils.
|
73
|
+
if olde_lock_file_content == nil || olde_lock_file_content['version'] != KZ_POD_CONFIG_VERSION
|
74
|
+
FileUtils.rm_rf(KZ_POD_CONFIG_ROOT)
|
75
|
+
FileUtils.mkdir_p(KZ_POD_CONFIG_ROOT)
|
76
|
+
end
|
77
|
+
FileUtils.mkdir_p(KZ_POD_CONFIG_SUPPORT_FILES) unless File.exist?(KZ_POD_CONFIG_SUPPORT_FILES)
|
78
|
+
FileUtils.mkdir_p(KZ_POD_CONFIG_POD_TARGETS) unless File.exist?(KZ_POD_CONFIG_POD_TARGETS)
|
79
|
+
FileUtils.mkdir_p(KZ_POD_CONFIG_POD_TEMPDIR) unless File.exist?(KZ_POD_CONFIG_POD_TEMPDIR)
|
80
|
+
|
81
|
+
FileUtils.rm(FLEX_COMPLIER_PATH) if File.exist?(FLEX_COMPLIER_PATH)
|
82
|
+
FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/FlexCompiler', FLEX_COMPLIER_PATH)
|
83
|
+
system("chmod +x #{FLEX_COMPLIER_PATH}")
|
84
|
+
|
85
|
+
FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/kz_generator_framework.sh', KZ_GENERATOR_FRAMEWORK_PATH)
|
86
|
+
system("chmod +x #{KZ_GENERATOR_FRAMEWORK_PATH}")
|
87
|
+
|
88
|
+
FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/kz_xml_build.sh', KZ_XML_BUILD_PATH)
|
89
|
+
system("chmod +x #{KZ_XML_BUILD_PATH}")
|
90
|
+
|
91
|
+
FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/kz_fix_force_load_exe.sh', KZ_FIX_FORCE_LOAD_EXE)
|
92
|
+
system("chmod +x #{KZ_FIX_FORCE_LOAD_EXE}")
|
93
|
+
|
94
|
+
FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/kz_refresh_pods_pbxproj.rb', KZ_FEFRESH_PODS_PBXPROJ)
|
70
95
|
|
71
96
|
Pod::Config.instance.podfile.use_frameworks!(:linkage => :static)
|
72
|
-
Pod::Config.instance.podfile.install!("cocoapods", :deterministic_uuids => false)
|
73
97
|
else
|
74
98
|
@kz_pod_enable = false
|
75
99
|
@generate_kz_pod_targets = false
|
@@ -108,17 +132,23 @@ module KZ
|
|
108
132
|
end
|
109
133
|
|
110
134
|
def have_flexLib_pod_target
|
111
|
-
@kz_analyzer.
|
135
|
+
@kz_analyzer.all_kz_pod_targets.values.each do |target|
|
136
|
+
return true if target.root_name == 'FlexLib' || target.root_name == 'KZSwiftUI'
|
137
|
+
end
|
138
|
+
false
|
112
139
|
end
|
113
140
|
|
114
141
|
def write_lock_file
|
115
142
|
self.kz_analyzer.all_kz_pod_targets.values.each do |kz_pod_target|
|
116
143
|
result = pod_config_result_with_target(kz_pod_target)
|
117
144
|
|
118
|
-
@kz_config_lock[
|
119
|
-
@kz_config_lock[
|
120
|
-
|
121
|
-
@kz_config_lock[kz_pod_target.name]
|
145
|
+
@kz_config_lock['version'] = KZ_POD_CONFIG_VERSION
|
146
|
+
@kz_config_lock['pod_targets'] ||= {}
|
147
|
+
|
148
|
+
@kz_config_lock['pod_targets'][kz_pod_target.name] ||= {}
|
149
|
+
@kz_config_lock['pod_targets'][kz_pod_target.name]["dev_pod"] = kz_pod_target.is_dev_pod
|
150
|
+
@kz_config_lock['pod_targets'][kz_pod_target.name]["use_framework"] = (result != nil)
|
151
|
+
@kz_config_lock['pod_targets'][kz_pod_target.name]["version"] = kz_pod_target.version
|
122
152
|
end
|
123
153
|
|
124
154
|
if @kz_config_lock.count > 0
|
@@ -129,8 +159,11 @@ module KZ
|
|
129
159
|
end
|
130
160
|
end
|
131
161
|
|
132
|
-
def
|
133
|
-
|
162
|
+
def olde_lock_file_content
|
163
|
+
if File.exist?(KZ_LOCK_FILE_PATH)
|
164
|
+
@olde_lock_file_content ||= JSON.parse(File.read(KZ_LOCK_FILE_PATH))
|
165
|
+
end
|
166
|
+
@olde_lock_file_content
|
134
167
|
end
|
135
168
|
|
136
169
|
end
|
@@ -27,17 +27,25 @@ module KZ
|
|
27
27
|
attr_accessor :private_header_search_path
|
28
28
|
attr_accessor :repair_header_search_path
|
29
29
|
|
30
|
+
attr_accessor :platform_name
|
30
31
|
# target编译最终的产物名称
|
31
32
|
attr_accessor :product_name
|
32
33
|
# 对应xcode配置PRODUCT_NAME,当多个target的PRODUCT_NAME相同时,需要手动修改,防止打包报错
|
33
34
|
attr_accessor :product_basename
|
34
|
-
# 当手动修改PRODUCT_NAME
|
35
|
+
# 当手动修改PRODUCT_NAME之后,产物名称会改变,在framework模式下对于OC组件需要使用modulemap文件配置寻找路径,对于Swift组件需要配置单独的include path
|
35
36
|
attr_accessor :repair_modulemap_path
|
37
|
+
attr_accessor :repair_swift_include_path
|
38
|
+
|
36
39
|
# 当手动修改PRODUCT_NAME之后,#import<xx/xxx.h>需要修复为原使用方式,使用hmap进行映射
|
37
40
|
attr_accessor :need_repair_module_import
|
38
41
|
|
39
42
|
attr_accessor :use_local_private_headers_path
|
40
43
|
|
44
|
+
attr_accessor :force_load
|
45
|
+
attr_accessor :force_load_info
|
46
|
+
|
47
|
+
attr_accessor :use_modulemap
|
48
|
+
|
41
49
|
def initialize(native_pod_target)
|
42
50
|
@native_pod_target = native_pod_target
|
43
51
|
@name = native_pod_target.name
|
@@ -49,10 +57,13 @@ module KZ
|
|
49
57
|
@is_dev_pod = false
|
50
58
|
@config_pod_mode = :kz_pod_origin_mode
|
51
59
|
|
60
|
+
@platform_name = native_pod_target.platform.symbolic_name
|
52
61
|
@product_name = native_pod_target.origin_product_name
|
53
62
|
@product_basename = native_pod_target.origin_product_basename
|
54
63
|
@need_repair_module_import = false
|
55
64
|
@use_local_private_headers_path = false
|
65
|
+
@force_load = false
|
66
|
+
@use_modulemap = true
|
56
67
|
|
57
68
|
native_pod_target.file_accessors.each do |file_accessor|
|
58
69
|
file_accessor.kz_pod_target = self
|
@@ -66,7 +77,6 @@ module KZ
|
|
66
77
|
end
|
67
78
|
|
68
79
|
def all_headers
|
69
|
-
return [] unless have_download_pod?
|
70
80
|
@all_headers ||= begin
|
71
81
|
all_headers = []
|
72
82
|
native_pod_target.file_accessors.each do |file_accessor|
|
@@ -79,8 +89,6 @@ module KZ
|
|
79
89
|
end
|
80
90
|
|
81
91
|
def public_headers
|
82
|
-
return [] unless have_download_pod?
|
83
|
-
|
84
92
|
@public_headers ||= begin
|
85
93
|
public_headers = []
|
86
94
|
native_pod_target.file_accessors.each do |file_accessor|
|
@@ -139,9 +147,20 @@ module KZ
|
|
139
147
|
elsif repair_import.is_a?(Array)
|
140
148
|
repair_import.each do |repair_import_target_name|
|
141
149
|
kz_repair_pod_target = yield(repair_import_target_name)
|
142
|
-
@repair_import << kz_repair_pod_target
|
150
|
+
@repair_import << kz_repair_pod_target if kz_repair_pod_target
|
143
151
|
end
|
144
152
|
end
|
153
|
+
|
154
|
+
force_load = pod_config[:force_load]
|
155
|
+
if force_load.is_a?(TrueClass)
|
156
|
+
@force_load = true
|
157
|
+
end
|
158
|
+
|
159
|
+
use_modulemap = pod_config[:use_modulemap]
|
160
|
+
if use_modulemap.is_a?(FalseClass)
|
161
|
+
@use_modulemap = false
|
162
|
+
end
|
163
|
+
|
145
164
|
end
|
146
165
|
|
147
166
|
# 在当前target的所有依赖中,过滤有有修补的target
|
@@ -168,7 +187,7 @@ module KZ
|
|
168
187
|
end
|
169
188
|
|
170
189
|
# 直接用于配置HEADER_SEARCH_PATHS
|
171
|
-
def header_search_paths
|
190
|
+
def header_search_paths(custom_paths)
|
172
191
|
header_search_paths = ''
|
173
192
|
header_search_paths = KZ.deal_path_for_xcconfig(@private_header_search_path, true) if @private_header_search_path
|
174
193
|
repair_header_search_paths = self.all_repair_header_search_paths.join(' ')
|
@@ -178,6 +197,10 @@ module KZ
|
|
178
197
|
if @use_local_private_headers_path
|
179
198
|
header_search_paths += (' ' + KZ.deal_path_for_xcconfig(local_private_headers_path, true))
|
180
199
|
end
|
200
|
+
header_search_paths += (' ' + KZ.deal_path_for_xcconfig(self.native_pod_target.sandbox.public_headers.root, true))
|
201
|
+
custom_paths.each do |custom_path|
|
202
|
+
header_search_paths += (' ' + custom_path)
|
203
|
+
end if custom_paths
|
181
204
|
header_search_paths
|
182
205
|
end
|
183
206
|
|
@@ -204,7 +227,7 @@ module KZ
|
|
204
227
|
|
205
228
|
# 获取target对应的配置根目录,部分文件需要依赖版本进行存储
|
206
229
|
def pod_config_cache_path(concat_version)
|
207
|
-
kz_target_framework_folder =
|
230
|
+
kz_target_framework_folder = KZ_POD_CONFIG_POD_TARGETS + @name
|
208
231
|
kz_target_framework_folder += @version if concat_version
|
209
232
|
FileUtils.mkdir_p(kz_target_framework_folder) unless File.exist?(kz_target_framework_folder) || concat_version
|
210
233
|
kz_target_framework_folder
|
@@ -238,30 +261,72 @@ module KZ
|
|
238
261
|
all_repair_modulemap_paths
|
239
262
|
end
|
240
263
|
|
264
|
+
def all_repair_swift_include_paths
|
265
|
+
all_repair_swift_include_paths = []
|
266
|
+
all_repair_swift_include_paths << repair_swift_include_path if self.repair_swift_include_path
|
267
|
+
recursive_dependent_targets.each do |recursive_dependent_target|
|
268
|
+
all_repair_swift_include_paths.concat(recursive_dependent_target.all_repair_swift_include_paths)
|
269
|
+
end
|
270
|
+
all_repair_swift_include_paths.uniq! if all_repair_swift_include_paths.count > 0
|
271
|
+
all_repair_swift_include_paths
|
272
|
+
end
|
273
|
+
|
241
274
|
def prefix_header_path
|
242
275
|
@native_pod_target.prefix_header_path
|
243
276
|
end
|
244
277
|
|
245
|
-
|
246
|
-
|
247
|
-
|
278
|
+
# 当前pod是否存在可编译的文件,配置framework后当前pod就不存在可编译文件
|
279
|
+
def current_should_build?
|
280
|
+
@native_pod_target.should_build?
|
248
281
|
end
|
249
282
|
|
250
|
-
|
251
|
-
|
283
|
+
# 原pod是否存在可编译的文件
|
284
|
+
def origin_should_build?
|
285
|
+
return @origin_should_build if defined? @origin_should_build
|
286
|
+
accessors = @native_pod_target.file_accessors.select { |fa| fa.spec.library_specification? }
|
287
|
+
all_origin_compile_files = []
|
288
|
+
accessors.each do |accessor|
|
289
|
+
all_origin_compile_files.concat(accessor.origin_source_files - accessor.kz_headers)
|
290
|
+
end
|
291
|
+
@origin_should_build = !all_origin_compile_files.empty?
|
252
292
|
end
|
253
293
|
|
254
|
-
def
|
294
|
+
def current_uses_swift?
|
255
295
|
@native_pod_target.uses_swift?
|
256
296
|
end
|
257
297
|
|
298
|
+
def origin_uses_swift?
|
299
|
+
return @uses_swift if defined? @uses_swift
|
300
|
+
@uses_swift = (!origin_should_build? && !@native_pod_target.spec_swift_versions.empty?) ||
|
301
|
+
@native_pod_target.file_accessors.select { |a| a.spec.library_specification? }.any? do |file_accessor|
|
302
|
+
uses_swift_for_spec?(file_accessor.spec)
|
303
|
+
end
|
304
|
+
end
|
305
|
+
|
306
|
+
def uses_swift_for_spec?(spec)
|
307
|
+
@uses_swift_for_spec_cache ||= {}
|
308
|
+
return @uses_swift_for_spec_cache[spec.name] if @uses_swift_for_spec_cache.key?(spec.name)
|
309
|
+
@uses_swift_for_spec_cache[spec.name] = begin
|
310
|
+
file_accessor = @native_pod_target.file_accessors.find { |fa| fa.spec == spec }
|
311
|
+
raise "[Bug] Unable to find file accessor for spec `#{spec.inspect}` in pod target `#{label}`" unless file_accessor
|
312
|
+
file_accessor.origin_source_files.any? { |sf| sf.extname == '.swift' }
|
313
|
+
end
|
314
|
+
end
|
315
|
+
|
258
316
|
def local_private_headers_path
|
259
317
|
@local_private_headers_path ||= begin
|
260
|
-
path =
|
318
|
+
path = KZ_POD_CONFIG_POD_TARGETS + @name + "Headers"
|
261
319
|
FileUtils.mkdir_p(path) unless File.exist?(path)
|
262
320
|
path
|
263
321
|
end
|
264
322
|
end
|
265
323
|
|
324
|
+
def configuration_build_dir(for_froce_load = false)
|
325
|
+
if for_froce_load
|
326
|
+
return @native_pod_target.configuration_build_dir + "/.force_load"
|
327
|
+
end
|
328
|
+
@native_pod_target.configuration_build_dir
|
329
|
+
end
|
330
|
+
|
266
331
|
end
|
267
332
|
end
|
@@ -27,6 +27,16 @@ module Pod
|
|
27
27
|
kz_pod_config[name][:repair_import] = repair_import
|
28
28
|
end
|
29
29
|
|
30
|
+
force_load = pod_attach.delete(:force_load)
|
31
|
+
if force_load
|
32
|
+
kz_pod_config[name][:force_load] = force_load
|
33
|
+
end
|
34
|
+
|
35
|
+
use_modulemap = pod_attach.delete(:use_modulemap)
|
36
|
+
if use_modulemap != nil
|
37
|
+
kz_pod_config[name][:use_modulemap] = use_modulemap
|
38
|
+
end
|
39
|
+
|
30
40
|
KZ::KZGlobalHelper.instance.kz_pod_config.merge!(kz_pod_config)
|
31
41
|
end
|
32
42
|
|
@@ -1,12 +1,21 @@
|
|
1
1
|
require 'cocoapods/installer'
|
2
|
+
require 'cocoapods-kz/helpers/kz_global_helper'
|
3
|
+
require 'cocoapods-kz/helpers/kz_generator'
|
2
4
|
|
3
5
|
module Pod
|
4
6
|
class Installer
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
7
|
+
|
8
|
+
alias_method :original_download_dependencies, :download_dependencies
|
9
|
+
def download_dependencies
|
10
|
+
original_download_dependencies
|
11
|
+
|
12
|
+
# 因为kz_pod_target提供不少方法,需要判断pod文件情况,所以依赖分析需要挪到download之后
|
13
|
+
if KZ::KZGlobalHelper.instance.generate_kz_pod_targets
|
14
|
+
main_project = aggregate_targets.first.user_project
|
15
|
+
kz_analyer = KZ::KZAnalyzer.new(pod_targets, self.sandbox.development_pods)
|
16
|
+
kz_analyer.analyer
|
17
|
+
KZ::KZGlobalHelper.instance.kz_analyzer = kz_analyer
|
18
|
+
KZ::KZGlobalHelper.instance.kz_generator = KZ::KZGenerator.new(main_project)
|
10
19
|
end
|
11
20
|
end
|
12
21
|
|
@@ -18,5 +27,19 @@ module Pod
|
|
18
27
|
end
|
19
28
|
original_integrate
|
20
29
|
end
|
30
|
+
|
31
|
+
# pod结束
|
32
|
+
alias_method :original_install!, :install!
|
33
|
+
def install!
|
34
|
+
original_install!
|
35
|
+
|
36
|
+
if KZ::KZGlobalHelper.instance.kz_pod_enable
|
37
|
+
KZ::KZGlobalHelper.instance.write_lock_file
|
38
|
+
|
39
|
+
current_pods_pbxproj_path = self.pods_project.path + 'project.pbxproj'
|
40
|
+
temp_pods_pbxproj_path = KZ::KZ_POD_CONFIG_POD_TEMPDIR + 'project.pbxproj'
|
41
|
+
system("(sleep 1 && ruby '#{KZ::KZ_FEFRESH_PODS_PBXPROJ}' '#{current_pods_pbxproj_path}' '#{temp_pods_pbxproj_path}') &")
|
42
|
+
end
|
43
|
+
end
|
21
44
|
end
|
22
45
|
end
|
@@ -13,5 +13,15 @@ module Pod
|
|
13
13
|
end
|
14
14
|
end
|
15
15
|
|
16
|
+
alias_method :origin_defines_module?, :defines_module?
|
17
|
+
def defines_module?
|
18
|
+
origin_result = origin_defines_module?
|
19
|
+
kz_pod_target = self.weakRef_kz_pod_target
|
20
|
+
if kz_pod_target && !kz_pod_target.use_modulemap
|
21
|
+
return false
|
22
|
+
end
|
23
|
+
return origin_result
|
24
|
+
end
|
25
|
+
|
16
26
|
end
|
17
27
|
end
|
@@ -10,16 +10,32 @@ module Pod
|
|
10
10
|
alias_method :origin_install!, :install!
|
11
11
|
def install!
|
12
12
|
target_installation_result = origin_install!
|
13
|
-
if KZ::KZGlobalHelper.instance.kz_pod_enable
|
14
|
-
|
15
|
-
|
13
|
+
if KZ::KZGlobalHelper.instance.kz_pod_enable
|
14
|
+
kz_pod_target = self.target.weakRef_kz_pod_target
|
15
|
+
|
16
|
+
if self.target.should_build?
|
17
|
+
unless self.target.name.start_with?('Pods-')
|
18
|
+
KZ::KZGlobalHelper.instance.kz_generator.add_framework_generator_build_phase(target_installation_result.native_target)
|
19
|
+
end
|
20
|
+
|
21
|
+
if kz_pod_target&.is_dev_pod
|
22
|
+
KZ::KZGlobalHelper.instance.kz_generator.add_flexlib_xml_build_rules(self.project, target_installation_result.native_target)
|
23
|
+
end
|
16
24
|
end
|
17
25
|
|
18
|
-
kz_pod_target
|
19
|
-
|
20
|
-
|
26
|
+
if kz_pod_target&.origin_should_build?
|
27
|
+
if kz_pod_target.force_load
|
28
|
+
KZ::KZGlobalHelper.instance.kz_generator.add_force_load_exe_path_build_phase(target_installation_result.native_target, kz_pod_target.force_load_info)
|
29
|
+
end
|
30
|
+
end
|
31
|
+
|
32
|
+
if kz_pod_target && !kz_pod_target.use_modulemap
|
33
|
+
target_installation_result.native_target.build_configurations.each do |c|
|
34
|
+
c.build_settings['DEFINES_MODULE'] = 'NO'
|
35
|
+
end
|
21
36
|
end
|
22
37
|
end
|
38
|
+
|
23
39
|
target_installation_result
|
24
40
|
end
|
25
41
|
|
@@ -0,0 +1,22 @@
|
|
1
|
+
|
2
|
+
module Pod
|
3
|
+
class Installer
|
4
|
+
class Xcode
|
5
|
+
class PodsProjectWriter
|
6
|
+
alias_method :origin_def_save_projects, :save_projects
|
7
|
+
def save_projects(projects)
|
8
|
+
origin_def_save_projects(projects)
|
9
|
+
|
10
|
+
if KZ::KZGlobalHelper.instance.kz_pod_enable
|
11
|
+
projects.each do |project|
|
12
|
+
if project.project_name == "Pods"
|
13
|
+
project_pbxproj_path = project.path + 'project.pbxproj'
|
14
|
+
FileUtils.cp_r(project_pbxproj_path, KZ::KZ_POD_CONFIG_POD_TEMPDIR)
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
@@ -28,29 +28,36 @@ module Pod
|
|
28
28
|
main_hamp_search_path += (' ' + KZ.deal_path_for_xcconfig(kz_pod_target.repair_header_search_path, true))
|
29
29
|
end
|
30
30
|
add_repair_modulemap(xcconfig, kz_pod_target.all_repair_modulemap_paths, self.target.uses_swift?)
|
31
|
+
add_repair_swift_include_path(xcconfig, kz_pod_target.all_repair_swift_include_paths, self.target.uses_swift?)
|
32
|
+
|
33
|
+
if kz_pod_target.force_load
|
34
|
+
kz_add_force_load_tag(xcconfig, kz_pod_target)
|
35
|
+
end
|
31
36
|
end
|
32
37
|
end
|
33
38
|
xcconfig.attributes['HEADER_SEARCH_PATHS'] = main_hamp_search_path
|
34
39
|
xcconfig.attributes['USE_HEADERMAP'] = 'NO'
|
35
|
-
|
36
|
-
if generator.configuration_name == 'Debug' && check_default_xcode_version_for_ld64
|
37
|
-
other_linker_flags = xcconfig.other_linker_flags[:simple]
|
38
|
-
other_linker_flags << '-ld64'
|
39
|
-
end
|
40
|
+
|
40
41
|
kz_update_xcconfig_file(xcconfig, path)
|
41
42
|
return
|
42
43
|
end
|
43
44
|
elsif generator.is_a?(Pod::Target::BuildSettings::PodTargetSettings)
|
44
45
|
kz_pod_target = self.target.weakRef_kz_pod_target
|
45
46
|
if kz_pod_target
|
47
|
+
pod_custom_header_search_paths = generator.pod_target_xcconfig_values_by_consumer_by_key["HEADER_SEARCH_PATHS"]
|
48
|
+
pod_custom_header_search_paths = pod_custom_header_search_paths.values if pod_custom_header_search_paths
|
49
|
+
|
46
50
|
xcconfig = generator.xcconfig
|
47
|
-
xcconfig.attributes['HEADER_SEARCH_PATHS'] = kz_pod_target.header_search_paths
|
51
|
+
xcconfig.attributes['HEADER_SEARCH_PATHS'] = kz_pod_target.header_search_paths(pod_custom_header_search_paths)
|
48
52
|
xcconfig.attributes['USE_HEADERMAP'] = 'NO'
|
49
53
|
framework_cache_path = KZ.deal_path_for_xcconfig(kz_pod_target.pod_config_cache_path(true))
|
50
54
|
xcconfig.attributes['KZ_FRAMEWORK_CACHE_PATH'] = framework_cache_path
|
51
|
-
|
55
|
+
if kz_pod_target.force_load
|
56
|
+
xcconfig.attributes['KZ_FIX_FORCE_LOAD_EXE_FOLDER'] = kz_pod_target.configuration_build_dir(true)
|
57
|
+
end
|
52
58
|
|
53
|
-
add_repair_modulemap(xcconfig, kz_pod_target.all_repair_modulemap_paths, kz_pod_target.
|
59
|
+
add_repair_modulemap(xcconfig, kz_pod_target.all_repair_modulemap_paths, kz_pod_target.current_uses_swift?)
|
60
|
+
add_repair_swift_include_path(xcconfig, kz_pod_target.all_repair_swift_include_paths, kz_pod_target.current_uses_swift?)
|
54
61
|
kz_update_xcconfig_file(xcconfig, path)
|
55
62
|
return
|
56
63
|
end
|
@@ -75,6 +82,18 @@ module Pod
|
|
75
82
|
end
|
76
83
|
end
|
77
84
|
|
85
|
+
def add_repair_swift_include_path(xcconfig, repair_swift_include_paths, uses_swift)
|
86
|
+
# 只有当前pod支持swift,才需要所依赖的pod提供的swiftmodule
|
87
|
+
if repair_swift_include_paths.count > 0 && uses_swift
|
88
|
+
repair_swift_include_paths.each do |repair_swift_include_path|
|
89
|
+
swift_include_path = ' ' + KZ.deal_path_for_xcconfig(repair_swift_include_path, true)
|
90
|
+
unless xcconfig.attributes['SWIFT_INCLUDE_PATHS'].include?(swift_include_path)
|
91
|
+
xcconfig.attributes['SWIFT_INCLUDE_PATHS'] += swift_include_path
|
92
|
+
end
|
93
|
+
end
|
94
|
+
end
|
95
|
+
end
|
96
|
+
|
78
97
|
def kz_update_xcconfig_file(xcconfig, path)
|
79
98
|
if path.exist?
|
80
99
|
contents = xcconfig.to_s
|
@@ -107,17 +126,13 @@ module Pod
|
|
107
126
|
xcconfig.attributes['OTHER_CFLAGS'] = new_flags.join(' ')
|
108
127
|
end
|
109
128
|
|
110
|
-
def
|
111
|
-
|
112
|
-
|
129
|
+
def kz_add_force_load_tag(xcconfig, kz_pod_target)
|
130
|
+
other_linker_flags = xcconfig.other_linker_flags
|
131
|
+
frameworks_flags = other_linker_flags[:frameworks]
|
132
|
+
force_flags = other_linker_flags[:force_load]
|
113
133
|
|
114
|
-
|
115
|
-
|
116
|
-
FileUtils.cp(xcode_info_plist, _xcode_info_plist)
|
117
|
-
system "plutil -convert xml1 #{_xcode_info_plist.to_s} #{_xcode_info_plist.to_s}"
|
118
|
-
plist_hash = Xcodeproj::Plist.read_from_path(_xcode_info_plist)
|
119
|
-
FileUtils.rm(_xcode_info_plist)
|
120
|
-
plist_hash['CFBundleShortVersionString'] == '15.0'
|
134
|
+
frameworks_flags.delete(kz_pod_target.product_basename)
|
135
|
+
force_flags.add(KZ.deal_path_for_xcconfig(kz_pod_target.force_load_info, true))
|
121
136
|
end
|
122
137
|
|
123
138
|
end
|
data/lib/cocoapods-kz/native.rb
CHANGED
@@ -5,11 +5,11 @@ if Pod.match_version?('~> 1.11')
|
|
5
5
|
require 'cocoapods-kz/native/dls'
|
6
6
|
require 'cocoapods-kz/native/installer'
|
7
7
|
require 'cocoapods-kz/native/acknowledgements'
|
8
|
-
require 'cocoapods-kz/native/analyzer'
|
9
8
|
require 'cocoapods-kz/native/file_accessor'
|
10
9
|
require 'cocoapods-kz/native/target'
|
11
10
|
require 'cocoapods-kz/native/target_installer_helper'
|
12
11
|
require 'cocoapods-kz/native/pod_target'
|
13
12
|
require 'cocoapods-kz/native/pod_target_installer'
|
14
13
|
require 'cocoapods-kz/native/specification'
|
14
|
+
require 'cocoapods-kz/native/pods_project_writer'
|
15
15
|
end
|
@@ -0,0 +1,12 @@
|
|
1
|
+
if [ "${MACH_O_TYPE}" != "staticlib" ]; then
|
2
|
+
exit 0
|
3
|
+
fi
|
4
|
+
|
5
|
+
CURRENT_PRODUCT_DIR=${PODS_CONFIGURATION_BUILD_DIR}/${TARGET_NAME}
|
6
|
+
|
7
|
+
if [ -d "${KZ_FIX_FORCE_LOAD_EXE_FOLDER}" ]; then
|
8
|
+
rm -r "${KZ_FIX_FORCE_LOAD_EXE_FOLDER}"
|
9
|
+
fi
|
10
|
+
mkdir -p "${KZ_FIX_FORCE_LOAD_EXE_FOLDER}"
|
11
|
+
|
12
|
+
ln -s ${CURRENT_PRODUCT_DIR}/${FULL_PRODUCT_NAME} ${KZ_FIX_FORCE_LOAD_EXE_FOLDER}/${FULL_PRODUCT_NAME}
|
@@ -0,0 +1,37 @@
|
|
1
|
+
if [ "${MACH_O_TYPE}" != "staticlib" ]; then
|
2
|
+
exit 0
|
3
|
+
fi
|
4
|
+
|
5
|
+
if [ -d "${KZ_FRAMEWORK_CACHE_PATH}" ]; then
|
6
|
+
rm -r "${KZ_FRAMEWORK_CACHE_PATH}"
|
7
|
+
fi
|
8
|
+
mkdir -p "${KZ_FRAMEWORK_CACHE_PATH}"
|
9
|
+
|
10
|
+
CURRENT_PRODUCT_DIR=${PODS_CONFIGURATION_BUILD_DIR}/${TARGET_NAME}
|
11
|
+
find "${CURRENT_PRODUCT_DIR}" -iname "*.bundle" | while read -r BUNDLE_FILE; do
|
12
|
+
BUNDLE_NAME=$(basename "${BUNDLE_FILE}")
|
13
|
+
if [ -d "${KZ_FRAMEWORK_CACHE_PATH}/${BUNDLE_NAME}" ]; then
|
14
|
+
rm -r "${KZ_FRAMEWORK_CACHE_PATH}/${BUNDLE_NAME}"
|
15
|
+
fi
|
16
|
+
cp -r "${BUNDLE_FILE}" "${KZ_FRAMEWORK_CACHE_PATH}"
|
17
|
+
done
|
18
|
+
|
19
|
+
OPPOSE_PLATFORM_NAME=''
|
20
|
+
if [ -n "${CORRESPONDING_SIMULATOR_PLATFORM_NAME+set}" ]; then
|
21
|
+
OPPOSE_PLATFORM_NAME=${CORRESPONDING_SIMULATOR_PLATFORM_NAME}
|
22
|
+
elif [ -n "${CORRESPONDING_DEVICE_PLATFORM_NAME+set}" ]; then
|
23
|
+
OPPOSE_PLATFORM_NAME=${CORRESPONDING_DEVICE_PLATFORM_NAME}
|
24
|
+
fi
|
25
|
+
|
26
|
+
if [ "${OPPOSE_PLATFORM_NAME}" = "" ]; then
|
27
|
+
exit 0
|
28
|
+
fi
|
29
|
+
|
30
|
+
OPPOSE_PRODUCT_FULL_DIR=${PODS_BUILD_DIR}/${CONFIGURATION}-${OPPOSE_PLATFORM_NAME}/${TARGET_NAME}/${FULL_PRODUCT_NAME}
|
31
|
+
if [ -d "${OPPOSE_PRODUCT_FULL_DIR}" ]; then
|
32
|
+
xcodebuild -create-xcframework -allow-internal-distribution -framework $(readlink -f "${CURRENT_PRODUCT_DIR}/${FULL_PRODUCT_NAME}") -framework $(readlink -f "${OPPOSE_PRODUCT_FULL_DIR}") \
|
33
|
+
-output "${KZ_FRAMEWORK_CACHE_PATH}/${PRODUCT_NAME}.xcframework"
|
34
|
+
else
|
35
|
+
xcodebuild -create-xcframework -allow-internal-distribution -framework $(readlink -f "${CURRENT_PRODUCT_DIR}/${FULL_PRODUCT_NAME}") \
|
36
|
+
-output "${KZ_FRAMEWORK_CACHE_PATH}/${PRODUCT_NAME}.xcframework"
|
37
|
+
fi
|
@@ -0,0 +1,15 @@
|
|
1
|
+
require 'fileutils'
|
2
|
+
require 'pathname'
|
3
|
+
|
4
|
+
current_pods_pbxproj_path = Pathname.new(ARGV[0])
|
5
|
+
temp_pods_pbxproj_path = Pathname.new(ARGV[1])
|
6
|
+
|
7
|
+
if !File.exist?(current_pods_pbxproj_path) || !FileUtils.compare_file(current_pods_pbxproj_path, temp_pods_pbxproj_path)
|
8
|
+
FileUtils.cp_r(temp_pods_pbxproj_path, current_pods_pbxproj_path)
|
9
|
+
end
|
10
|
+
|
11
|
+
xcode_running = system("ps aux | grep '[X]code' > /dev/null 2>&1")
|
12
|
+
if xcode_running
|
13
|
+
system("touch #{current_pods_pbxproj_path}")
|
14
|
+
end
|
15
|
+
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cocoapods-kz
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.10
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- yixiong
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2024-
|
11
|
+
date: 2024-08-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -48,6 +48,7 @@ files:
|
|
48
48
|
- lib/cocoapods-kz.rb
|
49
49
|
- lib/cocoapods-kz/command.rb
|
50
50
|
- lib/cocoapods-kz/command/clean.rb
|
51
|
+
- lib/cocoapods-kz/command/info.rb
|
51
52
|
- lib/cocoapods-kz/command/install.rb
|
52
53
|
- lib/cocoapods-kz/command/kz.rb
|
53
54
|
- lib/cocoapods-kz/command/repair.rb
|
@@ -63,18 +64,21 @@ files:
|
|
63
64
|
- lib/cocoapods-kz/helpers/repair_module_import.rb
|
64
65
|
- lib/cocoapods-kz/native.rb
|
65
66
|
- lib/cocoapods-kz/native/acknowledgements.rb
|
66
|
-
- lib/cocoapods-kz/native/analyzer.rb
|
67
67
|
- lib/cocoapods-kz/native/dls.rb
|
68
68
|
- lib/cocoapods-kz/native/file_accessor.rb
|
69
69
|
- lib/cocoapods-kz/native/installer.rb
|
70
70
|
- lib/cocoapods-kz/native/pod_target.rb
|
71
71
|
- lib/cocoapods-kz/native/pod_target_installer.rb
|
72
|
+
- lib/cocoapods-kz/native/pods_project_writer.rb
|
72
73
|
- lib/cocoapods-kz/native/specification.rb
|
73
74
|
- lib/cocoapods-kz/native/target.rb
|
74
75
|
- lib/cocoapods-kz/native/target_installer_helper.rb
|
75
76
|
- lib/cocoapods-kz/resources/FlexCompiler
|
76
77
|
- lib/cocoapods-kz/resources/hmap
|
77
|
-
- lib/cocoapods-kz/resources/
|
78
|
+
- lib/cocoapods-kz/resources/kz_fix_force_load_exe.sh
|
79
|
+
- lib/cocoapods-kz/resources/kz_generator_framework.sh
|
80
|
+
- lib/cocoapods-kz/resources/kz_refresh_pods_pbxproj.rb
|
81
|
+
- lib/cocoapods-kz/resources/kz_xml_build.sh
|
78
82
|
- lib/cocoapods_plugin.rb
|
79
83
|
homepage: https://github.com/EXAMPLE/cocoapods-kz
|
80
84
|
licenses:
|
@@ -1,23 +0,0 @@
|
|
1
|
-
require 'cocoapods-kz/helpers/kz_global_helper'
|
2
|
-
require 'cocoapods-kz/helpers/kz_generator'
|
3
|
-
|
4
|
-
module Pod
|
5
|
-
class Installer
|
6
|
-
class Analyzer
|
7
|
-
alias_method :original_generate_targets, :generate_targets
|
8
|
-
|
9
|
-
def generate_targets(resolver_specs_by_target, target_inspections)
|
10
|
-
aggregate_targets, pod_targets = original_generate_targets(resolver_specs_by_target, target_inspections)
|
11
|
-
if KZ::KZGlobalHelper.instance.generate_kz_pod_targets
|
12
|
-
main_project = aggregate_targets.first.user_project
|
13
|
-
kz_analyer = KZ::KZAnalyzer.new(pod_targets, self.sandbox.development_pods)
|
14
|
-
kz_analyer.analyer
|
15
|
-
KZ::KZGlobalHelper.instance.kz_analyzer = kz_analyer
|
16
|
-
KZ::KZGlobalHelper.instance.kz_generator = KZ::KZGenerator.new(main_project)
|
17
|
-
end
|
18
|
-
[aggregate_targets, pod_targets]
|
19
|
-
end
|
20
|
-
|
21
|
-
end
|
22
|
-
end
|
23
|
-
end
|
@@ -1,14 +0,0 @@
|
|
1
|
-
require 'fileutils'
|
2
|
-
require 'pathname'
|
3
|
-
|
4
|
-
product_swift_h_path = Pathname.new(ARGV[0])
|
5
|
-
product_simulator_swift_h_path = Pathname.new(ARGV[1])
|
6
|
-
target_swfit_h_path = Pathname.new(ARGV[2])
|
7
|
-
|
8
|
-
if File.exist?(product_swift_h_path) && File.exist?(product_simulator_swift_h_path)
|
9
|
-
FileUtils.cp_r(product_swift_h_path, target_swfit_h_path)
|
10
|
-
replacement = File.read(product_simulator_swift_h_path)
|
11
|
-
content_a = File.read(target_swfit_h_path)
|
12
|
-
content_a.gsub!("#error unsupported Swift architecture", replacement)
|
13
|
-
File.write(target_swfit_h_path, content_a)
|
14
|
-
end
|