Changeset 2998
- Timestamp:
- 06/21/05 15:44:55 (3 years ago)
- Files:
-
- WiredServer/trunk/PreferencePane (moved) (moved from WiredServer/trunk/Panel)
- WiredServer/trunk/PreferencePane/WPWired.m (copied) (copied from WiredServer/trunk/Panel/WPWired.m)
- WiredServer/trunk/StartupItems/Wired/Wired (modified) (2 diffs)
- WiredServer/trunk/WiredServer.xcodeproj/project.pbxproj (modified) (22 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
WiredServer/trunk/StartupItems/Wired/Wired
r2983 r2998 9 9 StartService () 10 10 { 11 if [ -f / usr/local/wired/etc/wired.startup ]; then11 if [ -f /Library/Wired/etc/wired.startup ]; then 12 12 ConsoleMessage "Starting Wired" 13 rm -f / usr/local/wired/wired.pid14 / usr/local/wired/wiredctl start $(cat /usr/local/wired/etc/wired.startup)13 rm -f /Library/Wired/wired.pid 14 /Library/Wired/wiredctl start $(cat /Library/Wired/etc/wired.startup) 15 15 fi 16 16 } … … 19 19 { 20 20 ConsoleMessage "Stopping Wired" 21 / usr/local/wired/wiredctl stop21 /Library/Wired/wiredctl stop 22 22 } 23 23 24 24 RestartService () 25 25 { 26 if [ -f / usr/local/wired/etc/wired.startup ]; then26 if [ -f /Library/Wired/etc/wired.startup ]; then 27 27 ConsoleMessage "Restarting Wired" 28 / usr/local/wired/wiredctl restart $(cat /usr/local/wired/etc/wired.startup)28 /Library/Wired/wiredctl restart $(cat /Library/Wired/etc/wired.startup) 29 29 fi 30 30 } WiredServer/trunk/WiredServer.xcodeproj/project.pbxproj
r2997 r2998 181 181 containerPortal = 089C1669FE841209C02AAC07 /* Project object */; 182 182 proxyType = 1; 183 remoteGlobalIDString = 8D202CE80486D31800D8A456 /* Wired P anel*/;184 remoteInfo = "Wired P anel";183 remoteGlobalIDString = 8D202CE80486D31800D8A456 /* Wired Preference Pane */; 184 remoteInfo = "Wired Preference Pane"; 185 185 }; 186 186 A50335570864C22200CE6911 /* PBXContainerItemProxy */ = { … … 203 203 proxyType = 1; 204 204 remoteGlobalIDString = 8D202CE80486D31800D8A456; 205 remoteInfo = "Wired P anel";205 remoteInfo = "Wired Preference Pane"; 206 206 }; 207 207 A5BE6D240864B62000DA5C89 /* PBXContainerItemProxy */ = { … … 263 263 089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; }; 264 264 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; 265 778C0235072F900E00F29BC7 /* Plus.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Plus.tiff; path = P anel/Plus.tiff; sourceTree = "<group>"; };266 778C0236072F900E00F29BC7 /* Minus.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Minus.tiff; path = P anel/Minus.tiff; sourceTree = "<group>"; };265 778C0235072F900E00F29BC7 /* Plus.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Plus.tiff; path = PreferencePane/Plus.tiff; sourceTree = "<group>"; }; 266 778C0236072F900E00F29BC7 /* Minus.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Minus.tiff; path = PreferencePane/Minus.tiff; sourceTree = "<group>"; }; 267 267 778C04390730DC8200F29BC7 /* WCLogController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WCLogController.h; sourceTree = "<group>"; }; 268 268 778C043A0730DC8200F29BC7 /* WCLogController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WCLogController.m; sourceTree = "<group>"; }; … … 273 273 778C04740730F89500F29BC7 /* WCStatusController.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = WCStatusController.m; sourceTree = "<group>"; }; 274 274 778C04750730F89500F29BC7 /* WCStatusController.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = WCStatusController.h; sourceTree = "<group>"; }; 275 77C6D5B8072CF3BA008F6164 /* Group.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Group.tiff; path = P anel/Group.tiff; sourceTree = "<group>"; };276 77C6D5B9072CF3BA008F6164 /* User.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = User.tiff; path = P anel/User.tiff; sourceTree = "<group>"; };275 77C6D5B8072CF3BA008F6164 /* Group.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Group.tiff; path = PreferencePane/Group.tiff; sourceTree = "<group>"; }; 276 77C6D5B9072CF3BA008F6164 /* User.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = User.tiff; path = PreferencePane/User.tiff; sourceTree = "<group>"; }; 277 277 A503353B0864C0DE00CE6911 /* Wired */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; name = Wired; path = StartupItems/Wired/Wired; sourceTree = "<group>"; }; 278 278 A503353C0864C0DE00CE6911 /* StartupParameters.plist */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.plist; name = StartupParameters.plist; path = StartupItems/Wired/StartupParameters.plist; sourceTree = "<group>"; }; … … 292 292 A5992C560729980600E67617 /* WCAuthorization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WCAuthorization.h; sourceTree = "<group>"; }; 293 293 A5992C570729980600E67617 /* WCAuthorization.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WCAuthorization.m; sourceTree = "<group>"; }; 294 A5992ED0072A795D00E67617 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = P anel/English.lproj/Localizable.strings; sourceTree = "<group>"; };295 A5992EE4072A7A0C00E67617 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = P anel/English.lproj/InfoPlist.strings; sourceTree = "<group>"; };294 A5992ED0072A795D00E67617 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = PreferencePane/English.lproj/Localizable.strings; sourceTree = "<group>"; }; 295 A5992EE4072A7A0C00E67617 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = PreferencePane/English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 296 296 A5993092072AAF1300E67617 /* WCAccounts.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = WCAccounts.h; sourceTree = "<group>"; }; 297 297 A5993093072AAF1300E67617 /* WCAccounts.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = WCAccounts.m; sourceTree = "<group>"; }; 298 298 A5A348450729839E00A16E9A /* Wired.prefPane */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Wired.prefPane; sourceTree = BUILT_PRODUCTS_DIR; }; 299 A5A348A2072984E000A16E9A /* prefix.pch */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = prefix.pch; path = P anel/prefix.pch; sourceTree = "<group>"; };299 A5A348A2072984E000A16E9A /* prefix.pch */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = prefix.pch; path = PreferencePane/prefix.pch; sourceTree = "<group>"; }; 300 300 A5A348FA0729868F00A16E9A /* WCSettings.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = WCSettings.h; sourceTree = "<group>"; }; 301 301 A5A348FB0729868F00A16E9A /* WCSettings.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = WCSettings.m; sourceTree = "<group>"; }; 302 A5A3492C07298A0800A16E9A /* WPWired.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; name = WPWired.m; path = P anel/WPWired.m; sourceTree = "<group>"; };303 A5A3492D07298A0800A16E9A /* WPWired.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = WPWired.h; path = P anel/WPWired.h; sourceTree = "<group>"; };304 A5A3493707298A1600A16E9A /* Locked.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Locked.tiff; path = P anel/Locked.tiff; sourceTree = "<group>"; };305 A5A3493807298A1600A16E9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xml; name = Info.plist; path = P anel/Info.plist; sourceTree = "<group>"; };306 A5A3493907298A1600A16E9A /* Error.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Error.tiff; path = P anel/Error.tiff; sourceTree = "<group>"; };307 A5A3493A07298A1600A16E9A /* Wired.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Wired.tiff; path = P anel/Wired.tiff; sourceTree = "<group>"; };308 A5A3493B07298A1600A16E9A /* Unlocked.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Unlocked.tiff; path = P anel/Unlocked.tiff; sourceTree = "<group>"; };309 A5A3493C07298A1600A16E9A /* OK.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = OK.tiff; path = P anel/OK.tiff; sourceTree = "<group>"; };310 A5A3494707298A2700A16E9A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = P anel/English.lproj/Wired.nib; sourceTree = "<group>"; };302 A5A3492C07298A0800A16E9A /* WPWired.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; name = WPWired.m; path = PreferencePane/WPWired.m; sourceTree = "<group>"; }; 303 A5A3492D07298A0800A16E9A /* WPWired.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = WPWired.h; path = PreferencePane/WPWired.h; sourceTree = "<group>"; }; 304 A5A3493707298A1600A16E9A /* Locked.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Locked.tiff; path = PreferencePane/Locked.tiff; sourceTree = "<group>"; }; 305 A5A3493807298A1600A16E9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xml; name = Info.plist; path = PreferencePane/Info.plist; sourceTree = "<group>"; }; 306 A5A3493907298A1600A16E9A /* Error.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Error.tiff; path = PreferencePane/Error.tiff; sourceTree = "<group>"; }; 307 A5A3493A07298A1600A16E9A /* Wired.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Wired.tiff; path = PreferencePane/Wired.tiff; sourceTree = "<group>"; }; 308 A5A3493B07298A1600A16E9A /* Unlocked.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Unlocked.tiff; path = PreferencePane/Unlocked.tiff; sourceTree = "<group>"; }; 309 A5A3493C07298A1600A16E9A /* OK.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = OK.tiff; path = PreferencePane/OK.tiff; sourceTree = "<group>"; }; 310 A5A3494707298A2700A16E9A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = PreferencePane/English.lproj/Wired.nib; sourceTree = "<group>"; }; 311 311 A5BE6D1A0864B5FB00DA5C89 /* WiredServer.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = WiredServer.xcconfig; sourceTree = "<group>"; }; 312 312 A5BE6D1C0864B62000DA5C89 /* ZankaAdditions.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ZankaAdditions.xcodeproj; path = ../ZankaAdditions/ZankaAdditions.xcodeproj; sourceTree = SOURCE_ROOT; }; … … 336 336 isa = PBXGroup; 337 337 children = ( 338 A5A3485D072983EC00A16E9A /* Wired P anel*/,338 A5A3485D072983EC00A16E9A /* Wired Preference Pane */, 339 339 A5A3485F072983FC00A16E9A /* Wired Common */, 340 340 A50335320864C0C600CE6911 /* Wired Startup Item */, … … 413 413 sourceTree = "<group>"; 414 414 }; 415 A5A3485D072983EC00A16E9A /* Wired P anel*/ = {415 A5A3485D072983EC00A16E9A /* Wired Preference Pane */ = { 416 416 isa = PBXGroup; 417 417 children = ( … … 420 420 A5992E90072A75A300E67617 /* Other Sources */, 421 421 ); 422 name = "Wired P anel";422 name = "Wired Preference Pane"; 423 423 sourceTree = "<group>"; 424 424 }; … … 548 548 549 549 /* Begin PBXNativeTarget section */ 550 8D202CE80486D31800D8A456 /* Wired P anel*/ = {550 8D202CE80486D31800D8A456 /* Wired Preference Pane */ = { 551 551 isa = PBXNativeTarget; 552 buildConfigurationList = A5BE6CEB0864B5A000DA5C89 /* Build configuration list for PBXNativeTarget "Wired P anel" */;552 buildConfigurationList = A5BE6CEB0864B5A000DA5C89 /* Build configuration list for PBXNativeTarget "Wired Preference Pane" */; 553 553 buildPhases = ( 554 554 8D202CF00486D31800D8A456 /* Sources */, … … 564 564 FRAMEWORK_SEARCH_PATHS = ../ZankaAdditions/build; 565 565 GCC_PRECOMPILE_PREFIX_HEADER = YES; 566 GCC_PREFIX_HEADER = P anel/prefix.pch;566 GCC_PREFIX_HEADER = PreferencePane/prefix.pch; 567 567 GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; 568 568 GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; … … 576 576 GCC_WARN_UNUSED_VALUE = YES; 577 577 GCC_WARN_UNUSED_VARIABLE = YES; 578 INFOPLIST_FILE = P anel/Info.plist;578 INFOPLIST_FILE = PreferencePane/Info.plist; 579 579 MACOSX_DEPLOYMENT_TARGET = 10.2; 580 580 OTHER_LDFLAGS = ( … … 588 588 A50335580864C22200CE6911 /* PBXTargetDependency */, 589 589 ); 590 name = "Wired P anel";590 name = "Wired Preference Pane"; 591 591 productInstallPath = "$(HOME)/Library/PreferencePanes"; 592 592 productName = "Wired Preferences"; … … 619 619 ); 620 620 targets = ( 621 8D202CE80486D31800D8A456 /* Wired P anel*/,621 8D202CE80486D31800D8A456 /* Wired Preference Pane */, 622 622 A50335AD0864C98900CE6911 /* Wired Server */, 623 623 A5BE6D2D0864B63000DA5C89 /* Zanka Additions */, … … 736 736 runOnlyForDeploymentPostprocessing = 0; 737 737 shellPath = /bin/sh; 738 shellScript = "sh localize.sh P anel|| exit 1";738 shellScript = "sh localize.sh PreferencePane || exit 1"; 739 739 }; 740 740 A5D97283078E387200CD982E /* Run Script (Zip) */ = { … … 777 777 77B2B2D208680DEC005E1B8F /* PBXTargetDependency */ = { 778 778 isa = PBXTargetDependency; 779 target = 8D202CE80486D31800D8A456 /* Wired P anel*/;779 target = 8D202CE80486D31800D8A456 /* Wired Preference Pane */; 780 780 targetProxy = 77B2B2D108680DEC005E1B8F /* PBXContainerItemProxy */; 781 781 }; … … 792 792 A5841A1307AA40E400C31480 /* PBXTargetDependency */ = { 793 793 isa = PBXTargetDependency; 794 target = 8D202CE80486D31800D8A456 /* Wired P anel*/;794 target = 8D202CE80486D31800D8A456 /* Wired Preference Pane */; 795 795 targetProxy = A5841A1207AA40E400C31480 /* PBXContainerItemProxy */; 796 796 }; … … 892 892 buildSettings = { 893 893 GCC_PRECOMPILE_PREFIX_HEADER = YES; 894 GCC_PREFIX_HEADER = P anel/prefix.pch;895 INFOPLIST_FILE = P anel/Info.plist;894 GCC_PREFIX_HEADER = PreferencePane/prefix.pch; 895 INFOPLIST_FILE = PreferencePane/Info.plist; 896 896 OTHER_LDFLAGS = "-lcrypto"; 897 897 PRODUCT_NAME = Wired; … … 909 909 GCC_OPTIMIZATION_LEVEL = 0; 910 910 GCC_PRECOMPILE_PREFIX_HEADER = YES; 911 GCC_PREFIX_HEADER = P anel/prefix.pch;911 GCC_PREFIX_HEADER = PreferencePane/prefix.pch; 912 912 GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; 913 913 GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; … … 921 921 GCC_WARN_UNUSED_VALUE = YES; 922 922 GCC_WARN_UNUSED_VARIABLE = YES; 923 INFOPLIST_FILE = P anel/Info.plist;923 INFOPLIST_FILE = PreferencePane/Info.plist; 924 924 MACOSX_DEPLOYMENT_TARGET = 10.2; 925 925 OTHER_CFLAGS = "-DTESTING"; … … 939 939 GCC_GENERATE_DEBUGGING_SYMBOLS = NO; 940 940 GCC_PRECOMPILE_PREFIX_HEADER = YES; 941 GCC_PREFIX_HEADER = P anel/prefix.pch;941 GCC_PREFIX_HEADER = PreferencePane/prefix.pch; 942 942 GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; 943 943 GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; … … 952 952 GCC_WARN_UNUSED_VALUE = YES; 953 953 GCC_WARN_UNUSED_VARIABLE = YES; 954 INFOPLIST_FILE = P anel/Info.plist;954 INFOPLIST_FILE = PreferencePane/Info.plist; 955 955 MACOSX_DEPLOYMENT_TARGET = 10.2; 956 956 OTHER_CFLAGS = "-DDEPLOYMENT"; … … 1192 1192 defaultConfigurationIsVisible = 0; 1193 1193 }; 1194 A5BE6CEB0864B5A000DA5C89 /* Build configuration list for PBXNativeTarget "Wired P anel" */ = {1194 A5BE6CEB0864B5A000DA5C89 /* Build configuration list for PBXNativeTarget "Wired Preference Pane" */ = { 1195 1195 isa = XCConfigurationList; 1196 1196 buildConfigurations = (
