Skip to content

Don’t define values in header file to avoid duplicate symbols #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Don’t define values in header file to avoid duplicate symbols #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25ac112
Don’t define values in header file to avoid duplicate symbols
bvirlet Feb 24, 2021
d4a65ca
Remove Mac Catalyst to be able to integrate dependency with Tuist: ht…
bvirlet Mar 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion [email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ let package = Package(
name: "libPhoneNumber",
platforms: [
.macOS(.v10_10),
.macCatalyst(.v13),
.iOS(.v9),
.tvOS(.v9),
.watchOS(.v2)
Expand Down
28 changes: 14 additions & 14 deletions libPhoneNumber/GeneratePhoneNumberHeader.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ gzip -c "../generatedJSON/PhoneNumberMetaDataForTesting.json" > "$TEMPDIR/PhoneN
gzip -c "../generatedJSON/PhoneNumberMetaData.json" > "$TEMPDIR/PhoneNumberMetaData.zip"
gzip -c "../generatedJSON/ShortNumberMetaData.json" > "$TEMPDIR/ShortNumberMetaData.zip"

cat > "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
cat > "NBGeneratedPhoneNumberMetaData.m" <<'EOF'
/*****
* Data Generated from GeneratePhoneNumberHeader.sh
* Off of PhoneNumberMetaDataForTesting.json, PhoneNumberMetaData.json, and ShortNumberMetaData.json
Expand All @@ -45,49 +45,49 @@ cat > "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
z_const Bytef kPhoneNumberMetaData[] = {
EOF

cat "$TEMPDIR/PhoneNumberMetaDataForTesting.zip" | xxd -i >> "NBGeneratedPhoneNumberMetaData.h"
cat "$TEMPDIR/PhoneNumberMetaDataForTesting.zip" | xxd -i >> "NBGeneratedPhoneNumberMetaData.m"

cat >> "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
cat >> "NBGeneratedPhoneNumberMetaData.m" <<'EOF'
};
z_const size_t kPhoneNumberMetaDataCompressedLength = sizeof(kPhoneNumberMetaData);
EOF
LIB_SIZE=$(stat -f%z "../generatedJSON/PhoneNumberMetaDataForTesting.json")
echo "z_const size_t kPhoneNumberMetaDataExpandedLength = $LIB_SIZE;" >> "NBGeneratedPhoneNumberMetaData.h"
echo "z_const size_t kPhoneNumberMetaDataExpandedLength = $LIB_SIZE;" >> "NBGeneratedPhoneNumberMetaData.m"

cat >> "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
cat >> "NBGeneratedPhoneNumberMetaData.m" <<'EOF'

#else // TESTING == 1

z_const Bytef kPhoneNumberMetaData[] = {
EOF

cat "$TEMPDIR/PhoneNumberMetaData.zip" | xxd -i >> "NBGeneratedPhoneNumberMetaData.h"
cat "$TEMPDIR/PhoneNumberMetaData.zip" | xxd -i >> "NBGeneratedPhoneNumberMetaData.m"

cat >> "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
cat >> "NBGeneratedPhoneNumberMetaData.m" <<'EOF'
};
z_const size_t kPhoneNumberMetaDataCompressedLength = sizeof(kPhoneNumberMetaData);
EOF
LIB_SIZE=$(stat -f%z "../generatedJSON/PhoneNumberMetaData.json")
echo "z_const size_t kPhoneNumberMetaDataExpandedLength = $LIB_SIZE;" >> "NBGeneratedPhoneNumberMetaData.h"
echo "#endif // TESTING" >> "NBGeneratedPhoneNumberMetaData.h"
echo "z_const size_t kPhoneNumberMetaDataExpandedLength = $LIB_SIZE;" >> "NBGeneratedPhoneNumberMetaData.m"
echo "#endif // TESTING" >> "NBGeneratedPhoneNumberMetaData.m"

# ShortNumberMetadata
cat >> "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
cat >> "NBGeneratedPhoneNumberMetaData.m" <<'EOF'

#if SHORT_NUMBER_SUPPORT

z_const Bytef kShortNumberMetaData[] = {
EOF

cat "$TEMPDIR/ShortNumberMetaData.zip" | xxd -i >> "NBGeneratedPhoneNumberMetaData.h"
cat "$TEMPDIR/ShortNumberMetaData.zip" | xxd -i >> "NBGeneratedPhoneNumberMetaData.m"

cat >> "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
cat >> "NBGeneratedPhoneNumberMetaData.m" <<'EOF'
};
z_const size_t kShortNumberMetaDataCompressedLength = sizeof(kShortNumberMetaData);
EOF
LIB_SIZE=$(stat -f%z "../generatedJSON/ShortNumberMetaData.json")
echo "z_const size_t kShortNumberMetaDataExpandedLength = $LIB_SIZE;" >> "NBGeneratedPhoneNumberMetaData.h"
echo "#endif // SHORT_NUMBER_SUPPORT" >> "NBGeneratedPhoneNumberMetaData.h"
echo "z_const size_t kShortNumberMetaDataExpandedLength = $LIB_SIZE;" >> "NBGeneratedPhoneNumberMetaData.m"
echo "#endif // SHORT_NUMBER_SUPPORT" >> "NBGeneratedPhoneNumberMetaData.m"

rm "$TEMPDIR/PhoneNumberMetaDataForTesting.zip"
rm "$TEMPDIR/PhoneNumberMetaData.zip"
Expand Down
Loading