diff options
| author | Sam Lantinga <slouken@libsdl.org> | 2011-01-24 17:47:18 -0800 |
|---|---|---|
| committer | Sam Lantinga <slouken@libsdl.org> | 2011-01-24 17:47:18 -0800 |
| commit | 1775cf40fd4f8861421af69c872d83321e40b8ce (patch) | |
| tree | d971a820a31673ecdd426a89858f35fe027c572f /Xcode | |
| parent | 065e4e3f9d298421d588d315f2f9a3fc353dc478 (diff) | |
Fixed bug #1102
Check /usr/local/bin for hg before sourcing the user's bash settings
Diffstat (limited to 'Xcode')
| -rwxr-xr-x | Xcode/SDL/SDL.xcodeproj/project.pbxproj | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj index 11df392d..76f5c413 100755 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj @@ -2292,7 +2292,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# The underlying scripts require calling hg to get revision info.\n# Since hg may not be in the standard Xcode path, I am sourcing .bashrc\n# But I don't know what to do if people are using other shells.\nif test -f ~/.bash_profile; then source ~/.bash_profile; fi\nif test -f ~/.bashrc; then source ~/.bashrc; fi\nsh ../../build-scripts/updaterev.sh\n"; + shellScript = "# The official HG installer puts the binary in /usr/local/bin, so add that\n# to Xcode's path and see if the hg executable is found. Otherwise, source\n# the user's bash settings file as a last resort.\nPATH=$PATH:/usr/local/bin\nif ! which -s hg ; then\n if test -f ~/.bash_profile; then source ~/.bash_profile; fi\nfi\nsh ../../build-scripts/updaterev.sh\n"; }; 0083103E1072EA5700A531F1 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; |