Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make autorevision output a uri in more cases. 

This does not change the form of the uri.
master
dak180 2011-12-28 10:14:12 -05:00
parent cb9504c9ab
commit 0945972f1a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_tools/autorevision.sh
View File

@ -29,7 +29,7 @@ function gitRepo {
VCS_SHORT_HASH="$(echo ${VCS_FULL_HASH} | cut -b 1-7)"
# Current branch
VCS_URI="$(git symbolic-ref HEAD)"
VCS_URI=`git rev-parse --symbolic-full-name --verify $(git name-rev --name-only --no-undefined HEAD)`
# Current tag (or uri if there is no tag)
VCS_TAG="$(git describe --exact-match --tags 2>/dev/null)"

2
macosx/Warzone.xcodeproj/project.pbxproj
View File

@ -4326,7 +4326,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Config\nexport PATH=$PATH:/sw/bin:/opt/local/bin\nfunction hfilter {\n\tsed -e 's:refs/heads/:branch/:' -e 's:master:Master:' -e 's:\tv:\t:' -e 's:v/::' src/autorevision.h | sed -e 's:_beta: Beta :' -e 's:_rc: RC :' > \"${OBJROOT}/autorevision.h\"\n}\nsauto=\"src/autorevision.h\"\ntauto=\"${OBJROOT}/autorev/autorevision.h\"\nfunction bauto {\n\tif ! build_tools/autorevision.sh \"${tauto}\"; then\n\t\techo \"error: Could not run Autorevision\"\n\t\texit 1\n\tfi\n}\n\ncd ..\n\nif [[ ! -d \".git\" ]] && [[ ! -d \".hg\" ]] && [[ -f \"${sauto}\" ]]; then\n\t# Do not run if we will not get useful information\n\techo \"Not a repo.\"\n\thfilter\n\texit 0\nelif [[ -f \"${sauto}\" ]] && [[ -f \"${tauto}\" ]]; then\n\tbauto\n\tmdck1=`md5 -q \"${sauto}\"`\n\tmdck2=`md5 -q \"${tauto}\"`\n\tif [ \"${mdck1}\" = \"${mdck2}\" ]; then\n\t\texit 0\n\telse\n\t\tcp -a \"${tauto}\" \"${sauto}\"\n\tfi\nelse\n\t# Only update autorevision.h if something has changed\n\tmkdir \"${OBJROOT}/autorev/\"\n\tbauto\n\tcp -a \"${tauto}\" \"${sauto}\"\nfi\n\nhfilter\nexit 0\n";
shellScript = "# Config\nexport PATH=$PATH:/sw/bin:/opt/local/bin\nsauto=\"src/autorevision.h\"\ntauto=\"${OBJROOT}/autorev/autorevision.h\"\nfunction hfilter {\n\trm -f \"${OBJROOT}/autorevision.h\"\n\tsed -e 's:refs/heads/:branch/:' -e 's:refs/remotes/:remote/:' -e 's:branch/master:Master:' -e 's:\tv:\t:' -e 's:v/::' \"${tauto}\" | sed -e 's:_beta: Beta :' -e 's:_rc: RC :' > \"${OBJROOT}/autorevision.h\"\n}\nfunction bauto {\n\tif ! ./build_tools/autorevision.sh \"${tauto}\"; then\n\t\techo \"error: Could not run Autorevision\"\n\t\texit 1\n\tfi\n}\n\ncd ..\n\nif [[ ! -d \".git\" ]] && [[ ! -d \".hg\" ]] && [[ -f \"${sauto}\" ]]; then\n\t# Do not run if we will not get useful information\n\techo \"Not a repo.\"\n\thfilter\n\texit 0\nelif [ -d \"${OBJROOT}/autorev/\" ]; then\n\t# Only update src/autorevision.h if something has changed\n\tbauto\n\tmdck1=`md5 -q \"${sauto}\"`\n\tmdck2=`md5 -q \"${tauto}\"`\n\tif [ \"${mdck1}\" = \"${mdck2}\" ]; then\n\t\texit 0\n\tfi\nelse\n\tmkdir \"${OBJROOT}/autorev/\"\n\tbauto\nfi\n\ncp -a \"${tauto}\" \"${sauto}\"\nhfilter\nexit 0\n";
};
43D4669013FBF5AC00E5C499 /* Patch */ = {
isa = PBXShellScriptBuildPhase;