Skip to content

Convert and copy all translations at build time #14

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

Merged
merged 6 commits into from
Mar 30, 2017
Merged

Convert and copy all translations at build time #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
adbec59
Merged test scheme into framework scheme
1ec5 Mar 23, 2017
3bef7e3
Move plist generation to own script file
freenerd Nov 11, 2016
7f2eadc
Convert and copy instructions plists on the fly
1ec5 Mar 23, 2017
acea632
Updated to Project-OSRM/osrm-text-instructions@b4c5187b6635a83bcd0b41…
1ec5 Mar 24, 2017
ef3fdec
Put plists in source directory in absence of build directory
1ec5 Mar 24, 2017
e9d2b0e
No need to skip skipped languages
1ec5 Mar 29, 2017
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
4 changes: 2 additions & 2 deletions OSRMTextInstructions.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ Pod::Spec.new do |s|

s.dependency "MapboxDirections.swift"

s.prepare_command = "./json2plist.sh"

s.xcconfig = {
"SWIFT_VERSION" => "3.0"
}

end


44 changes: 25 additions & 19 deletions OSRMTextInstructions.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
358D145A1E5E355600ADE590 /* osrm-text-instructions.h in Headers */ = {isa = PBXBuildFile; fileRef = 358D14571E5E355600ADE590 /* osrm-text-instructions.h */; settings = {ATTRIBUTES = (Public, ); }; };
358D145B1E5E355600ADE590 /* OSRMTextInstructions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 358D14581E5E355600ADE590 /* OSRMTextInstructions.swift */; };
C51B63E91E65FA04002F4634 /* TokenType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C51B63E81E65FA04002F4634 /* TokenType.swift */; };
DAEACB551E788D4300E481C6 /* Instructions.plist in Resources */ = {isa = PBXBuildFile; fileRef = DAEACB571E788D4300E481C6 /* Instructions.plist */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -42,8 +41,7 @@
358D14581E5E355600ADE590 /* OSRMTextInstructions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OSRMTextInstructions.swift; sourceTree = "<group>"; };
35EBDB5D1E5E1572006EB3CD /* OSRMTextInstructions.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OSRMTextInstructions.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C51B63E81E65FA04002F4634 /* TokenType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokenType.swift; sourceTree = "<group>"; };
DAEACB561E788D4300E481C6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = en; path = en.lproj/Instructions.plist; sourceTree = "<group>"; };
DAEACB581E788D5100E481C6 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "zh-Hans"; path = "zh-Hans.lproj/Instructions.plist"; sourceTree = "<group>"; };
DA2DFB3B1E8373AF00CEEBE9 /* json2plist.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = json2plist.sh; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -93,6 +91,7 @@
352BBC381E5E5AB400703DF1 /* osrm-text-instructions */,
35EBDB5F1E5E1572006EB3CD /* OSRMTextInstructions */,
352BBC2A1E5E4D4200703DF1 /* OSRMTextInstructionsTests */,
DA2DFB3A1E8373A100CEEBE9 /* Scripts */,
35EBDB5E1E5E1572006EB3CD /* Products */,
35228C511E5E17040082B14F /* Frameworks */,
);
Expand Down Expand Up @@ -122,11 +121,18 @@
DA0584D21E5E561D006F138F /* Resources */ = {
isa = PBXGroup;
children = (
DAEACB571E788D4300E481C6 /* Instructions.plist */,
);
name = Resources;
sourceTree = "<group>";
};
DA2DFB3A1E8373A100CEEBE9 /* Scripts */ = {
isa = PBXGroup;
children = (
DA2DFB3B1E8373AF00CEEBE9 /* json2plist.sh */,
);
name = Scripts;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand Down Expand Up @@ -168,6 +174,7 @@
35EBDB591E5E1572006EB3CD /* Frameworks */,
35EBDB5A1E5E1572006EB3CD /* Headers */,
35EBDB5B1E5E1572006EB3CD /* Resources */,
DA2DFB411E84521100CEEBE9 /* Copy Instructions Property Lists */,
);
buildRules = (
);
Expand Down Expand Up @@ -205,8 +212,6 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
en,
"zh-Hans",
);
mainGroup = 35EBDB531E5E1572006EB3CD;
productRefGroup = 35EBDB5E1E5E1572006EB3CD /* Products */;
Expand All @@ -232,7 +237,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
DAEACB551E788D4300E481C6 /* Instructions.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -254,6 +258,20 @@
shellPath = /bin/sh;
shellScript = "/usr/local/bin/carthage copy-frameworks";
};
DA2DFB411E84521100CEEBE9 /* Copy Instructions Property Lists */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Instructions Property Lists";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = ./json2plist.sh;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down Expand Up @@ -284,18 +302,6 @@
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
DAEACB571E788D4300E481C6 /* Instructions.plist */ = {
isa = PBXVariantGroup;
children = (
DAEACB561E788D4300E481C6 /* en */,
DAEACB581E788D5100E481C6 /* zh-Hans */,
);
name = Instructions.plist;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
352BBC311E5E4D4200703DF1 /* Debug */ = {
isa = XCBuildConfiguration;
Expand Down
19 changes: 19 additions & 0 deletions OSRMTextInstructions.xcodeproj/xcshareddata/xcschemes/OSRMTextInstructions.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,26 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "352BBC281E5E4D4200703DF1"
BuildableName = "OSRMTextInstructionsTests.xctest"
BlueprintName = "OSRMTextInstructionsTests"
ReferencedContainer = "container:OSRMTextInstructions.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "35EBDB5C1E5E1572006EB3CD"
BuildableName = "OSRMTextInstructions.framework"
BlueprintName = "OSRMTextInstructions"
ReferencedContainer = "container:OSRMTextInstructions.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
Expand Down
56 changes: 0 additions & 56 deletions OSRMTextInstructions.xcodeproj/xcshareddata/xcschemes/OSRMTextInstructionsTests.xcscheme
View file
Open in desktop

This file was deleted.

Loading