diff options
| author | davilla <davilla@svn> | 2009-12-04 17:18:58 +0000 |
|---|---|---|
| committer | davilla <davilla@svn> | 2009-12-04 17:18:58 +0000 |
| commit | 8a99e716eb8aa147f2d154598891ccc60ecc7d49 (patch) | |
| tree | 0a64998c7bb22e7e35a9043f36ec00e0e089f14c | |
| parent | ad92f9530fdf4ebffc459adea702a28fd5c49314 (diff) | |
fixup svnversion, sed, grep games so both configure.in and xcode packager match
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@25279 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
| -rw-r--r-- | XBMC.xcodeproj/project.pbxproj | 4 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj index 959140c98f..e2092c79b5 100644 --- a/XBMC.xcodeproj/project.pbxproj +++ b/XBMC.xcodeproj/project.pbxproj @@ -7260,7 +7260,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Update version in Info.plist with SVN revision\nSVN_REVISION=\"Unknown\"\nBUNDLE_NAME=\"XBMC\"\n\nif test `which svnversion` ; then\n\tSVN_REVISION=\"SVN-\"$(echo -n `svnversion -c \"$TARGET_BUILD_DIR/../../\" | sed -e s/43\\://`)\nfi\nperl -p -i -e \"s/r####/$SVN_REVISION/\" \"$TARGET_BUILD_DIR/$BUNDLE_NAME.app/Contents/Info.plist\"\n"; + shellScript = "# Update version in Info.plist with SVN revision\nSVN_REVISION=\"Unknown\"\nBUNDLE_NAME=\"XBMC\"\n\nif test `which svnversion` ; then\n\tSVN_REVISION=\"SVN-\"$(echo -n `svnversion -c 2>&1 | grep -iv ^exported | sed -e 's/.*\\://'`)\nfi\nperl -p -i -e \"s/r####/$SVN_REVISION/\" \"$TARGET_BUILD_DIR/$BUNDLE_NAME.app/Contents/Info.plist\"\n"; }; F5A1CBDE0F6B0B4700A96ABD /* copy root files */ = { isa = PBXShellScriptBuildPhase; @@ -7303,7 +7303,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Update version in Info.plist with SVN revision\nSVN_REVISION=\"Unknown\"\nBUNDLE_NAME=\"XBMC\"\n\nif test `which svnversion` ; then\n\tSVN_REVISION=\"SVN-\"$(echo -n `svnversion -c \"$TARGET_BUILD_DIR/../../\" | sed -e s/43\\://`)\nfi\nperl -p -i -e \"s/r####/$SVN_REVISION/\" \"$TARGET_BUILD_DIR/$BUNDLE_NAME.app/Contents/Info.plist\"\n"; + shellScript = "# Update version in Info.plist with SVN revision\nSVN_REVISION=\"Unknown\"\nBUNDLE_NAME=\"XBMC\"\n\nif test `which svnversion` ; then\n\tSVN_REVISION=\"SVN-\"$(echo -n `svnversion -c 2>&1 | grep -iv ^exported | sed -e 's/.*\\://'`)\nfi\nperl -p -i -e \"s/r####/$SVN_REVISION/\" \"$TARGET_BUILD_DIR/$BUNDLE_NAME.app/Contents/Info.plist\"\n"; }; F5DEC3580E6DEBB2005A4E24 /* copy root files */ = { isa = PBXShellScriptBuildPhase; diff --git a/configure.in b/configure.in index f64acaf744..1943bcd6e2 100644 --- a/configure.in +++ b/configure.in @@ -893,7 +893,7 @@ fi if ! test -n "$SVN_REV" -a "$SVN_REV" != "" ; then if test "$HAVE_SVNVERSION" = "yes" ; then - SVN_REV=$(echo -n `svnversion -c | sed -e '/^export/Q;s/.*\:\([0-9]\+\)[^0-9]*$/\1/'`) + SVN_REV=$(echo -n `svnversion -c 2>&1 | grep -iv ^exported | sed -e 's/.*\://'`) fi if test "$SVN_REV" = ""; then if test "$HAVE_GIT" = "yes"; then |