Move metadataGenerator to scripts/metadataGenerator.swift

Ava8 · Jul 29, 2020 · 449bc39 · 449bc39
1 parent 7f45d50
commit 449bc39
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/libPhoneNumber/GeneratePhoneNumberHeader.sh b/libPhoneNumber/GeneratePhoneNumberHeader.sh
@@ -20,9 +20,9 @@ set -eu
 cd "${BASH_SOURCE%/*}" || exit
 
 TEMPDIR=$(mktemp -d)
-gzip -c "../libPhoneNumberTests/generatedJSON/PhoneNumberMetaDataForTesting.json" > "$TEMPDIR/PhoneNumberMetaDataForTesting.zip"
-gzip -c "../libPhoneNumberTests/generatedJSON/PhoneNumberMetaData.json" > "$TEMPDIR/PhoneNumberMetaData.zip"
-gzip -c "../libPhoneNumberTests/generatedJSON/ShortNumberMetaData.json" > "$TEMPDIR/ShortNumberMetaData.zip"
+gzip -c "../generatedJSON/PhoneNumberMetaDataForTesting.json" > "$TEMPDIR/PhoneNumberMetaDataForTesting.zip"
+gzip -c "../generatedJSON/PhoneNumberMetaData.json" > "$TEMPDIR/PhoneNumberMetaData.zip"
+gzip -c "../generatedJSON/ShortNumberMetaData.json" > "$TEMPDIR/ShortNumberMetaData.zip"
 
 cat > "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
 /*****
@@ -51,7 +51,7 @@ cat >> "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
 };
 z_const size_t kPhoneNumberMetaDataCompressedLength = sizeof(kPhoneNumberMetaData);
 EOF
-LIB_SIZE=$(stat -f%z "../libPhoneNumberTests/generatedJSON/PhoneNumberMetaDataForTesting.json")
+LIB_SIZE=$(stat -f%z "../generatedJSON/PhoneNumberMetaDataForTesting.json")
 echo "z_const size_t kPhoneNumberMetaDataExpandedLength = $LIB_SIZE;" >> "NBGeneratedPhoneNumberMetaData.h"
 
 cat >> "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
@@ -67,7 +67,7 @@ cat >> "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
 };
 z_const size_t kPhoneNumberMetaDataCompressedLength = sizeof(kPhoneNumberMetaData);
 EOF
-LIB_SIZE=$(stat -f%z "../libPhoneNumberTests/generatedJSON/PhoneNumberMetaData.json")
+LIB_SIZE=$(stat -f%z "../generatedJSON/PhoneNumberMetaData.json")
 echo "z_const size_t kPhoneNumberMetaDataExpandedLength = $LIB_SIZE;" >> "NBGeneratedPhoneNumberMetaData.h"
 echo "#endif  // TESTING" >> "NBGeneratedPhoneNumberMetaData.h"
 
@@ -85,7 +85,7 @@ cat >> "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
 };
 z_const size_t kShortNumberMetaDataCompressedLength = sizeof(kShortNumberMetaData);
 EOF
-LIB_SIZE=$(stat -f%z "../libPhoneNumberTests/generatedJSON/ShortNumberMetaData.json")
+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"
 

diff --git a/libPhoneNumberTests/metadataGenerator → scripts/metadataGenerator.swift b/libPhoneNumberTests/metadataGenerator → scripts/metadataGenerator.swift
@@ -90,6 +90,7 @@ let shortNumberMetadata = URL(string: "https://raw.githubusercontent.com/googlei
 
 let currentDir = FileManager.default.currentDirectoryPath
 let baseURL = URL(fileURLWithPath: currentDir).appendingPathComponent("generatedJSON")
+try? FileManager.default.createDirectory(at: baseURL, withIntermediateDirectories: true)
 
 // Phone metadata.
 do {