From 1f53de877a83e25b6b634941bc3948962fe2f301 Mon Sep 17 00:00:00 2001 From: 3a4oT Date: Tue, 15 Dec 2020 00:03:46 +0200 Subject: [PATCH] fixed script --- scripts/generate_spm_sources_layout.sh | 57 +++++++++++-------- .../IGListDiffKit/IGListBatchUpdateData.mm | 1 + spm/Sources/IGListDiffKit/IGListDiff.mm | 1 + .../IGListKit/IGListCollectionViewLayout.mm | 1 + .../IGListKit/IGListWorkingRangeHandler.mm | 1 + 5 files changed, 36 insertions(+), 25 deletions(-) create mode 120000 spm/Sources/IGListDiffKit/IGListBatchUpdateData.mm create mode 120000 spm/Sources/IGListDiffKit/IGListDiff.mm create mode 120000 spm/Sources/IGListKit/IGListCollectionViewLayout.mm create mode 120000 spm/Sources/IGListKit/IGListWorkingRangeHandler.mm diff --git a/scripts/generate_spm_sources_layout.sh b/scripts/generate_spm_sources_layout.sh index 00a68e6cd..905fe9dc3 100755 --- a/scripts/generate_spm_sources_layout.sh +++ b/scripts/generate_spm_sources_layout.sh @@ -26,10 +26,11 @@ function generate_ig_list_diff_kit_spm_public_headers() { echo "Generated under ${SPM_IG_LIST_DIFF_KIT_PUBLIC_HEADERS_PATH}" public_headers_list=$( - find "Source/IGListDiffKit" -name "*.[h]" \ - -type f -not -path "spm/*" \ - -not -path "Source/IGListDiffKit/Internal/*" \ - -not -path "Examples/*" | sed "s| \([^/]\)|:\1|g" + find "Source/IGListDiffKit" \ + -type f -name "*.[h]" \ + -not -path "spm/*" \ + -not -path "Source/IGListDiffKit/Internal/*" \ + -not -path "Examples/*" | sed "s| \([^/]\)|:\1|g" ) SRC_ROOT=$(pwd) @@ -46,12 +47,13 @@ function generate_ig_list_diff_kit_spm_public_headers() { } function generate_ig_list_diff_kit_spm_private_headers() { - echo "Generate symbolic links for all private headers/implementations *.h && *.m" + echo "Generate symbolic links for all private headers *.h" echo "Generated under ${SPM_IG_LIST_DIFF_KIT_SOURCES_PATH}" - private_headers_list=$(find "Source/IGListDiffKit/Internal" \ - -name "*.h" \ - -type f -not -path "spm/*" | sed "s| \([^/]\)|:\1|g") + private_headers_list=$( + find "Source/IGListDiffKit/Internal" \ + -type f -name "*.h" \ + -not -path "spm/*" | sed "s| \([^/]\)|:\1|g") SRC_ROOT=$(pwd) cd $SPM_IG_LIST_DIFF_KIT_SOURCES_PATH @@ -70,12 +72,13 @@ function generate_ig_list_diff_kit_spm_private_headers() { } function generate_ig_list_diff_kit_spm_sources() { - echo "Generate symbolic links for all public implementtions. *.m" + echo "Generate symbolic links for all public implementtions. *.m & *.mm" echo "Generated under ${SPM_IG_LIST_DIFF_KIT_SOURCES_PATH}" - sources_list=$(find "Source/IGListDiffKit" \ - -name "*.m" \ - -type f -not -path "spm/*" | sed "s| \([^/]\)|:\1|g") + sources_list=$( + find "Source/IGListDiffKit" \ + -type f -name "*.[m]" -o -name "*.mm" \ + -not -path "spm/*" | sed "s| \([^/]\)|:\1|g") SRC_ROOT=$(pwd) cd $SPM_IG_LIST_DIFF_KIT_SOURCES_PATH @@ -110,8 +113,9 @@ function generate_ig_list_kit_spm_public_headers() { echo "Generated under ${SPM_IG_LIST_KIT_PUBLIC_HEADERS_PATH}" public_headers_list=$( - find "Source/IGListKit" -name "*.[h]" \ + find "Source/IGListKit" \ \! -name "IGListBindingSingleSectionController.[hm]" \ + -name "*.[h]" \ -type f -not -path "spm/*" \ -not -path "Source/IGListKit/Internal/*" \ -not -path "Examples/*" | sed "s| \([^/]\)|:\1|g" @@ -136,13 +140,14 @@ function generate_ig_list_kit_spm_private_headers() { echo "Generated under ${SPM_IG_LIST_KIT_SOURCES_PATH}" shared_ig_diff_kit_sorces_list=$(find "Source/IGListDiffKit/Internal" \ - -name "*.[hm]" \ - -type f -not -path "spm/*" | sed "s| \([^/]\)|:\1|g") + -name "*.[hm]" -o -name "*.mm" \ + -type f -not -path "spm/*" \ + -not -path "Examples/*" | sed "s| \([^/]\)|:\1|g") private_headers_list=$(find "Source/IGListKit/Internal" \ -name "*.h" \ - \! -name "IGListBindingSingleSectionController.[hm]" \ - -type f -not -path "spm/*" | sed "s| \([^/]\)|:\1|g") + -type f -not -path "spm/*" \ + -not -path "Examples/*" | sed "s| \([^/]\)|:\1|g") SRC_ROOT=$(pwd) cd $SPM_IG_LIST_KIT_SOURCES_PATH @@ -170,10 +175,12 @@ function generate_ig_list_kit_spm_sources() { echo "Generate symbolic links for all public implementtions. *.m" echo "Generated under ${SPM_IG_LIST_KIT_SOURCES_PATH}" - sources_list=$(find "Source/IGListKit" \ - -name "*.m" \ + sources_list=$( + find "Source/IGListKit" \ \! -name "IGListBindingSingleSectionController.[hm]" \ - -type f -not -path "spm/*" | sed "s| \([^/]\)|:\1|g") + -name "*.m" -o -name "*.mm" + -type f -not -path "spm/*" \ + -not -path "Examples/*" | sed "s| \([^/]\)|:\1|g") SRC_ROOT=$(pwd) cd $SPM_IG_LIST_KIT_SOURCES_PATH @@ -201,11 +208,11 @@ function generate_ig_list_kit() { # Delete all symbolik links from `spm` folder function cleanup() { - rm -rf $SPM_IG_LIST_DIFF_KIT_PUBLIC_HEADERS_PATH/*.[hm] - rm -rf $SPM_IG_LIST_DIFF_KIT_SOURCES_PATH/*.[hm] + rm -rf $SPM_IG_LIST_DIFF_KIT_PUBLIC_HEADERS_PATH/*.* + rm -rf $SPM_IG_LIST_DIFF_KIT_SOURCES_PATH/*.* #IGListKit - rm -rf $SPM_IG_LIST_KIT_PUBLIC_HEADERS_PATH/*.[hm] - rm -rf $SPM_IG_LIST_KIT_SOURCES_PATH/*.[hm] + rm -rf $SPM_IG_LIST_KIT_PUBLIC_HEADERS_PATH/*.* + rm -rf $SPM_IG_LIST_KIT_SOURCES_PATH/*.* } ########## SPM generator pipeline ############# @@ -213,5 +220,5 @@ function cleanup() { cleanup #2 generate_ig_list_diff_kit -#3 +# #3 generate_ig_list_kit diff --git a/spm/Sources/IGListDiffKit/IGListBatchUpdateData.mm b/spm/Sources/IGListDiffKit/IGListBatchUpdateData.mm new file mode 120000 index 000000000..efda9aea8 --- /dev/null +++ b/spm/Sources/IGListDiffKit/IGListBatchUpdateData.mm @@ -0,0 +1 @@ +../../../Source/IGListDiffKit/IGListBatchUpdateData.mm \ No newline at end of file diff --git a/spm/Sources/IGListDiffKit/IGListDiff.mm b/spm/Sources/IGListDiffKit/IGListDiff.mm new file mode 120000 index 000000000..1fdac4981 --- /dev/null +++ b/spm/Sources/IGListDiffKit/IGListDiff.mm @@ -0,0 +1 @@ +../../../Source/IGListDiffKit/IGListDiff.mm \ No newline at end of file diff --git a/spm/Sources/IGListKit/IGListCollectionViewLayout.mm b/spm/Sources/IGListKit/IGListCollectionViewLayout.mm new file mode 120000 index 000000000..616fd7a46 --- /dev/null +++ b/spm/Sources/IGListKit/IGListCollectionViewLayout.mm @@ -0,0 +1 @@ +../../../Source/IGListKit/IGListCollectionViewLayout.mm \ No newline at end of file diff --git a/spm/Sources/IGListKit/IGListWorkingRangeHandler.mm b/spm/Sources/IGListKit/IGListWorkingRangeHandler.mm new file mode 120000 index 000000000..d7fde5422 --- /dev/null +++ b/spm/Sources/IGListKit/IGListWorkingRangeHandler.mm @@ -0,0 +1 @@ +../../../Source/IGListKit/Internal/IGListWorkingRangeHandler.mm \ No newline at end of file