Changeset 1028

Show
Ignore:
Timestamp:
02/19/09 09:49:26 (1 year ago)
Author:
gbooker
Message:

Removed the overly complex svn script in favor of just running the info.plist through the preprocessor

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Perian.xcodeproj

    • Property svn:ignore changed from
      *.mode1
      *.mode2
      *.pbxuser
      *.perspective
       to
      *.mode1
      *.mode1v3
      *.mode2
      *.pbxuser
      *.perspective

  • trunk/Perian.xcodeproj/project.pbxproj

    r1027 r1028  
    13651365                                83D1D6C60B4C794700E09EC9 /* Frameworks */, 
    13661366                                F535FCD50B4D605900F00D14 /* ShellScript */, 
    1367                                 3D0B9E090EB37E8300C4F556 /* ShellScript */, 
    13681367                        ); 
    13691368                        buildRules = ( 
    …… 
    15491548                        shellPath = /bin/sh; 
    15501549                        shellScript = "source $SRCROOT/createStaticLibs.sh"; 
    1551                 }; 
    1552                 3D0B9E090EB37E8300C4F556 /* ShellScript */ = { 
    1553                         isa = PBXShellScriptBuildPhase; 
    1554                         buildActionMask = 2147483647; 
    1555                         files = ( 
    1556                         ); 
    1557                         inputPaths = ( 
    1558                         ); 
    1559                         outputPaths = ( 
    1560                         ); 
    1561                         runOnlyForDeploymentPostprocessing = 0; 
    1562                         shellPath = /bin/sh; 
    1563                         shellScript = "# Xcode auto-versioning script for Subversion\n# by Axel Andersson, modified by Daniel Jalkut to add\n# \"--revision HEAD\" to the svn info line, which allows\n# the latest revision to always be used.\n\n# further modified by Augie Fackler to be gross and sh-based in places\n# so that you can have svn installed anywhere\nPATH=/sw/bin:/opt/local/bin:/usr/local/bin:/usr/bin:$PATH\nffmpeg_rev=`cat \"$SYMROOT/Universal/buildid\"`\nREV=`svnversion -n ./`\necho $REV\n\necho | perl <<EOF\nuse strict;\ndie \"\\$0: Must be run from Xcode\" unless \\$ENV{\"BUILT_PRODUCTS_DIR\"};\n\nmy \\$INFO = \"\\$ENV{BUILT_PRODUCTS_DIR}/\\$ENV{WRAPPER_NAME}/Contents/Info.plist\";\n\nmy \\$version = \"$REV\";\n\n# (Match the last group of digits and optional letter M/S):\n\n# ugly yet functional (barely) regex by Daniel Jalkut:\n#$version =~ s/([\\d]*:)(\\d+[M|S]*).*/$2/;\n\n# better yet still functional regex via Kevin \"Regex Nerd\" Ballard\n(\\$version =~ m/\\d+[MS]*\\$/) && (\\$version = \\$&);\n\nopen(FH, \"\\$INFO\") or die \"\\$0: \\$INFO: $!\";\nmy \\$info = join(\"\", <FH>);\nclose(FH);\n\n#\\$info =~ s/([\\t ]+<key>CFBundleVersion<\\/key>\\n[\\t ]+<string>).*?(<\\/string>)/\\$1\\$version\\$2/;\n\\$info =~ s/SVNREVISION/\\$version/;\n\\$info =~ s/FFMPEGREVISION/$ffmpeg_rev/;\n\nopen(FH, \">\\$INFO\") or die \"\\$0: \\$INFO: \\$!\";\nprint FH \\$info;\nclose(FH);\nEOF\n"; 
    15641550                }; 
    15651551                F5121EB60EB3A54A0048EF67 /* ShellScript */ = { 
    …… 
    22002186                                GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; 
    22012187                                INFOPLIST_FILE = "Plists/PerianPaneReal-Info.plist"; 
     2188                                INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C"; 
     2189                                INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/include/SVNRevision.h"; 
     2190                                INFOPLIST_PREPROCESS = YES; 
    22022191                                INSTALL_PATH = "$(HOME)/Library/Bundles"; 
    22032192                                OTHER_LDFLAGS = ( 
    …… 
    23512340                                GCC_WARN_UNUSED_VARIABLE = YES; 
    23522341                                INFOPLIST_FILE = "Plists/PerianPaneReal-Info.plist"; 
     2342                                INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C"; 
     2343                                INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/include/SVNRevision.h"; 
     2344                                INFOPLIST_PREPROCESS = YES; 
    23532345                                INSTALL_PATH = "$(HOME)/Library/Bundles"; 
    23542346                                OTHER_LDFLAGS = ( 
    …… 
    23752367                                GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; 
    23762368                                INFOPLIST_FILE = "Plists/PerianPaneReal-Info.plist"; 
     2369                                INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C"; 
     2370                                INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/include/SVNRevision.h"; 
     2371                                INFOPLIST_PREPROCESS = YES; 
    23772372                                INSTALL_PATH = "$(HOME)/Library/Bundles"; 
    23782373                                OTHER_LDFLAGS = (