Changeset 3484
- Timestamp:
- 01/10/06 22:43:38 (3 years ago)
- Files:
-
- WiredServer/trunk/WiredServer.xcodeproj/project.pbxproj (modified) (16 diffs)
- WiredServer/trunk/install.sh (deleted)
- WiredServer/trunk/version.pl (modified) (2 diffs)
- WiredServer/trunk/wired.sh (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
WiredServer/trunk/WiredServer.xcodeproj/project.pbxproj
r3403 r3484 8 8 9 9 /* Begin PBXAggregateTarget section */ 10 A50335AD0864C98900CE6911 /* Wired Server*/ = {10 A50335AD0864C98900CE6911 /* wired */ = { 11 11 isa = PBXAggregateTarget; 12 buildConfigurationList = A50335B40864C9AC00CE6911 /* Build configuration list for PBXAggregateTarget " Wired Server" */;12 buildConfigurationList = A50335B40864C9AC00CE6911 /* Build configuration list for PBXAggregateTarget "wired" */; 13 13 buildPhases = ( 14 A50335AC0864C98900CE6911 /* Run Script ( Wired Server) */,14 A50335AC0864C98900CE6911 /* Run Script (wired) */, 15 15 ); 16 16 buildSettings = { … … 28 28 }; 29 29 dependencies = ( 30 77B 2B2D208680DEC005E1B8F/* PBXTargetDependency */,31 ); 32 name = "Wired Server";30 77B7C33F0973FBF0009367B0 /* PBXTargetDependency */, 31 ); 32 name = wired; 33 33 productName = "Wired Server"; 34 34 }; … … 177 177 178 178 /* Begin PBXContainerItemProxy section */ 179 77B 2B2D108680DEC005E1B8F/* PBXContainerItemProxy */ = {179 77B7C33E0973FBF0009367B0 /* PBXContainerItemProxy */ = { 180 180 isa = PBXContainerItemProxy; 181 181 containerPortal = 089C1669FE841209C02AAC07 /* Project object */; … … 275 275 77A9DE7A08695F35006BF5B0 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = Package/Resources/English.lproj/ReadMe.rtf; sourceTree = "<group>"; }; 276 276 77A9DE7C08695F3F006BF5B0 /* English */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xml; name = English; path = Package/Resources/English.lproj/Description.plist; sourceTree = "<group>"; }; 277 77B7C2780973EB34009367B0 /* version.pl */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.perl; path = version.pl; sourceTree = "<group>"; }; 277 278 77C6D5B8072CF3BA008F6164 /* Group.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Group.tiff; path = PreferencePane/Group.tiff; sourceTree = "<group>"; }; 278 279 77C6D5B9072CF3BA008F6164 /* User.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = User.tiff; path = PreferencePane/User.tiff; sourceTree = "<group>"; }; … … 280 281 A503353C0864C0DE00CE6911 /* StartupParameters.plist */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.plist; name = StartupParameters.plist; path = StartupItems/Wired/StartupParameters.plist; sourceTree = "<group>"; }; 281 282 A503353F0864C0DE00CE6911 /* English */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xml; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; }; 282 A503354A0864C15D00CE6911 /* install.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = install.sh; sourceTree = "<group>"; };283 A503354A0864C15D00CE6911 /* wired.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = wired.sh; sourceTree = "<group>"; }; 283 284 A503354B0864C16700CE6911 /* makepkg.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = makepkg.sh; sourceTree = "<group>"; }; 284 285 A503354C0864C16700CE6911 /* localize.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = localize.sh; sourceTree = "<group>"; }; … … 510 511 isa = PBXGroup; 511 512 children = ( 512 A503354A0864C15D00CE6911 /* install.sh */,513 513 A503354C0864C16700CE6911 /* localize.sh */, 514 514 A503354B0864C16700CE6911 /* makepkg.sh */, 515 77B7C2780973EB34009367B0 /* version.pl */, 516 A503354A0864C15D00CE6911 /* wired.sh */, 515 517 ); 516 518 name = Scripts; … … 628 630 targets = ( 629 631 8D202CE80486D31800D8A456 /* Wired Preference Pane */, 630 A50335AD0864C98900CE6911 /* Wired Server*/,632 A50335AD0864C98900CE6911 /* wired */, 631 633 A5BE6D2D0864B63000DA5C89 /* Wired Additions */, 632 634 A5D97273078E375B00CD982E /* Localization */, … … 690 692 691 693 /* Begin PBXShellScriptBuildPhase section */ 692 A50335AC0864C98900CE6911 /* Run Script ( Wired Server) */ = {694 A50335AC0864C98900CE6911 /* Run Script (wired) */ = { 693 695 isa = PBXShellScriptBuildPhase; 694 696 buildActionMask = 2147483647; … … 697 699 inputPaths = ( 698 700 ); 699 name = "Run Script ( Wired Server)";701 name = "Run Script (wired)"; 700 702 outputPaths = ( 701 703 ); 702 704 runOnlyForDeploymentPostprocessing = 0; 703 705 shellPath = /bin/sh; 704 shellScript = "# Create initial directory\nROOT=\"$PROJECT_TEMP_DIR/Package\"\nsudo rm -rf \"$ROOT\"\nmkdir -p \"$ROOT\"\n\n# Copy package files\ncp -Rp Package/* \"$ROOT\" || exit 1\n\n# Install Wired Server into directory\n PATH=\"$PATH:/usr/local/bin/\" sh install.sh \"$ROOT/Contents\" || exit 1\n\n# Create package from directory\nsh makepkg.sh \"$ROOT\" \"$BUILT_PRODUCTS_DIR/WiredServer.pkg\" || exit 1";706 shellScript = "# Create initial directory\nROOT=\"$PROJECT_TEMP_DIR/Package\"\nsudo rm -rf \"$ROOT\"\nmkdir -p \"$ROOT\"\n\n# Copy package files\ncp -Rp Package/* \"$ROOT\" || exit 1\n\n# Install Wired Server into directory\nsh wired.sh \"$ROOT/Contents\" || exit 1\n\n# Create package from directory\nsh makepkg.sh \"$ROOT\" \"$BUILT_PRODUCTS_DIR/WiredServer.pkg\" || exit 1\n"; 705 707 }; 706 708 A5992EB5072A77F900E67617 /* Run Script (Version) */ = { … … 716 718 runOnlyForDeploymentPostprocessing = 0; 717 719 shellPath = /bin/sh; 718 shellScript = "PATH=\"$PATH:/usr/local/bin/\" perl version.pl || exit 1";720 shellScript = "PATH=\"$PATH:/usr/local/bin/\" perl version.pl || exit 0"; 719 721 }; 720 722 A5BE6D2C0864B63000DA5C89 /* Run Script (Wired Additions) */ = { … … 730 732 runOnlyForDeploymentPostprocessing = 0; 731 733 shellPath = /bin/sh; 732 shellScript = " cd ../WiredAdditions/\n/usr/bin/xcodebuild -target \"Wired Additions\" -configuration \"$BUILD_STYLE\" SYMROOT=\"$SYMROOT\" OBJROOT=\"$OBJROOT\" $ACTION || exit 1";734 shellScript = "# Build WiredAdditions\ncd ../WiredAdditions/\n/usr/bin/xcodebuild -target \"Wired Additions\" -configuration \"$BUILD_STYLE\" SYMROOT=\"$SYMROOT\" OBJROOT=\"$OBJROOT\" $ACTION || exit 1"; 733 735 }; 734 736 A5D97272078E375B00CD982E /* Run Script (Localize) */ = { … … 744 746 runOnlyForDeploymentPostprocessing = 0; 745 747 shellPath = /bin/sh; 746 shellScript = " sh localize.sh PreferencePane || exit 1";748 shellScript = "# Localize\nsh localize.sh PreferencePane || exit 1"; 747 749 }; 748 750 A5D97283078E387200CD982E /* Run Script (Zip) */ = { … … 758 760 runOnlyForDeploymentPostprocessing = 0; 759 761 shellPath = /bin/sh; 760 shellScript = " cd \"$BUILT_PRODUCTS_DIR\"\nrm -f \"../WiredServer.zip\"\nzip -ry \"../WiredServer.zip\" \"WiredServer.pkg\" || exit 1";762 shellScript = "# Zip\ncd \"$BUILT_PRODUCTS_DIR\"\nrm -f \"../WiredServer.zip\"\nzip -ry \"../WiredServer.zip\" \"WiredServer.pkg\" || exit 1"; 761 763 }; 762 764 /* End PBXShellScriptBuildPhase section */ … … 783 785 784 786 /* Begin PBXTargetDependency section */ 785 77B 2B2D208680DEC005E1B8F/* PBXTargetDependency */ = {787 77B7C33F0973FBF0009367B0 /* PBXTargetDependency */ = { 786 788 isa = PBXTargetDependency; 787 789 target = 8D202CE80486D31800D8A456 /* Wired Preference Pane */; 788 targetProxy = 77B 2B2D108680DEC005E1B8F/* PBXContainerItemProxy */;790 targetProxy = 77B7C33E0973FBF0009367B0 /* PBXContainerItemProxy */; 789 791 }; 790 792 A50335580864C22200CE6911 /* PBXTargetDependency */ = { … … 795 797 A50335E50864CC6600CE6911 /* PBXTargetDependency */ = { 796 798 isa = PBXTargetDependency; 797 target = A50335AD0864C98900CE6911 /* Wired Server*/;799 target = A50335AD0864C98900CE6911 /* wired */; 798 800 targetProxy = A50335E40864CC6600CE6911 /* PBXContainerItemProxy */; 799 801 }; … … 1182 1184 1183 1185 /* Begin XCConfigurationList section */ 1184 A50335B40864C9AC00CE6911 /* Build configuration list for PBXAggregateTarget " Wired Server" */ = {1186 A50335B40864C9AC00CE6911 /* Build configuration list for PBXAggregateTarget "wired" */ = { 1185 1187 isa = XCConfigurationList; 1186 1188 buildConfigurations = ( WiredServer/trunk/version.pl
r2975 r3484 3 3 use strict; 4 4 5 my $REV = `svn info | grep "^Revision:"`; 5 die "$0: Must be run from Xcode" unless $ENV{"BUILT_PRODUCTS_DIR"}; 6 7 my $REV = `svn info 2>&1 | grep "^Revision:"`; 6 8 my $INFO = "$ENV{BUILT_PRODUCTS_DIR}/$ENV{WRAPPER_NAME}/Contents/Info.plist"; 7 9 … … 15 17 close(FH); 16 18 17 $info =~ s/([\t ]+<key>CFBundleVersion<\/key>\n[\t ]+<string>). +?(<\/string>)/$1$version$2/;19 $info =~ s/([\t ]+<key>CFBundleVersion<\/key>\n[\t ]+<string>).*?(<\/string>)/$1$version$2/; 18 20 19 21 open(FH, ">$INFO") or die "$0: $INFO: $!";
