Changeset 2997

Timestamp:

06/21/05 15:35:57 (4 years ago)

Author:

morris

Message:

Do not link againt ZankaAdditions?, dyld can't find it in System Preferences.app, use NSClassFromString in runtime instead

Files:

• WiredServer/trunk/Panel/WPWired.m (modified) (1 diff)
• WiredServer/trunk/WCAccountsController.m (modified) (1 diff)
• WiredServer/trunk/WCConfigController.m (modified) (2 diffs)
• WiredServer/trunk/WiredServer.xcodeproj/project.pbxproj (modified) (14 diffs)
• WiredServer/trunk/install.sh (modified) (2 diffs)
• WiredServer/trunk/makepkg.sh (modified) (1 diff)

WiredServer/trunk/Panel/WPWired.m

@@ -31 +31 @@
-#import "WCConfigController.h"
-#import "WCDashboardController.h"
+#import "WCLogController.h"
-#import "WCSettings.h"
-#import "WCStatusController.h"

WiredServer/trunk/WCAccountsController.m

@@ -550 +550 @@
-
-
-
-- (IBAction)selectGroup:(id)sender {
-        WCAccount   *account;

WiredServer/trunk/WCConfigController.m

@@ -1012 +1012 @@
-        
-        tracker = [[_config arrayForKey:@"tracker"] objectAtIndex:row];
-ZAURL
+NSClassFromString(@"ZAURL")
-        
-        if(url) {
@@ -1037 +1037 @@
-
-        tracker = [[_config arrayForKey:@"tracker"] objectAtIndex:row];
-ZAURL
+NSClassFromString(@"ZAURL")
-
-        if(tableColumn == _trackerTableColumn) {

WiredServer/trunk/WiredServer.xcodeproj/project.pbxproj

@@ -28 +28 @@
-                        };
-                        dependencies = (
+                                77B2B2D208680DEC005E1B8F /* PBXTargetDependency */,
-                        );
-                        name = "Wired Server";
@@ -113 +114 @@
-                778C04710730F7A300F29BC7 /* WCConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 778C046F0730F7A300F29BC7 /* WCConfigController.m */; };
-                778C04760730F89500F29BC7 /* WCStatusController.m in Sources */ = {isa = PBXBuildFile; fileRef = 778C04740730F89500F29BC7 /* WCStatusController.m */; };
+                77B2B1B708680D3B005E1B8F /* Wired.prefPane in CopyFiles */ = {isa = PBXBuildFile; fileRef = A5A348450729839E00A16E9A /* Wired.prefPane */; };
-                77C6D5BA072CF3BA008F6164 /* Group.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 77C6D5B8072CF3BA008F6164 /* Group.tiff */; };
-                77C6D5BB072CF3BA008F6164 /* User.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 77C6D5B9072CF3BA008F6164 /* User.tiff */; };
@@ -132 +134 @@
-                A5A3494A07298A2700A16E9A /* Wired.nib in Resources */ = {isa = PBXBuildFile; fileRef = A5A3494607298A2700A16E9A /* Wired.nib */; };
-                A5BE6D8B0864B6C800DA5C89 /* ZankaAdditions.framework in Copy Files (Frameworks) */ = {isa = PBXBuildFile; fileRef = A5BE6D250864B62000DA5C89 /* ZankaAdditions.framework */; };
-                A5BE6D8D0864B6CC00DA5C89 /* ZankaAdditions.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5BE6D250864B62000DA5C89 /* ZankaAdditions.framework */; };
-                A5E4A9640794799900FA127F /* WCDashboardController.m in Sources */ = {isa = PBXBuildFile; fileRef = A5E4A9610794792600FA127F /* WCDashboardController.m */; };
-/* End PBXBuildFile section */
@@ -176 +177 @@
-
-/* Begin PBXContainerItemProxy section */
+                77B2B2D108680DEC005E1B8F /* PBXContainerItemProxy */ = {
+                        isa = PBXContainerItemProxy;
+                        containerPortal = 089C1669FE841209C02AAC07 /* Project object */;
+                        proxyType = 1;
+                        remoteGlobalIDString = 8D202CE80486D31800D8A456 /* Wired Panel */;
+                        remoteInfo = "Wired Panel";
+                };
-                A50335570864C22200CE6911 /* PBXContainerItemProxy */ = {
-                        isa = PBXContainerItemProxy;
-                        containerPortal = 089C1669FE841209C02AAC07 /* Project object */;
-                        proxyType = 1;
- /* Zanka Additions */
+
-                        remoteInfo = "Zanka Additions";
-                };
@@ -187 +195 @@
-                        containerPortal = 089C1669FE841209C02AAC07 /* Project object */;
-                        proxyType = 1;
- /* Wired Server */
+
-                        remoteInfo = "Wired Server";
-                };
@@ -228 +236 @@
-
-/* Begin PBXCopyFilesBuildPhase section */
+                77B2B1B308680D31005E1B8F /* CopyFiles */ = {
+                        isa = PBXCopyFilesBuildPhase;
+                        buildActionMask = 2147483647;
+                        dstPath = /Library/PreferencePanes;
+                        dstSubfolderSpec = 0;
+                        files = (
+                                77B2B1B708680D3B005E1B8F /* Wired.prefPane in CopyFiles */,
+                        );
+                        runOnlyForDeploymentPostprocessing = 0;
+                };
-                A5D96D9F078DE16400CD982E /* Copy Files (Frameworks) */ = {
-                        isa = PBXCopyFilesBuildPhase;
@@ -309 +327 @@
-                                8D202CF40486D31800D8A456 /* PreferencePanes.framework in Frameworks */,
-                                A540687805CDC46100068FBB /* Security.framework in Frameworks */,
-                                A5BE6D8D0864B6CC00DA5C89 /* ZankaAdditions.framework in Frameworks */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -519 +536 @@
-                                A5D972E6078F017100CD982E /* Info.plist */,
-                                A50336990865AA5E00CE6911 /* postflight */,
+                                A503369B0865AA5E00CE6911 /* postinstall */,
-                                A503369A0865AA5E00CE6911 /* postupgrade */,
-                                A503369B0865AA5E00CE6911 /* postinstall */,
-                                A503369C0865AA5E00CE6911 /* preinstall */,
-                                A503369D0865AA5E00CE6911 /* preupgrade */,
@@ -540 +557 @@
-                                A5D96D9F078DE16400CD982E /* Copy Files (Frameworks) */,
-                                A5992EB5072A77F900E67617 /* Run Script (Version) */,
-A50334A10864BAC100CE6911 /* Run Script (Copy)
+77B2B1B308680D31005E1B8F /* CopyFiles
-                        );
-                        buildRules = (
@@ -665 +682 @@
-
-/* Begin PBXShellScriptBuildPhase section */
-                A50334A10864BAC100CE6911 /* Run Script (Copy) */ = {
-                        isa = PBXShellScriptBuildPhase;
-                        buildActionMask = 2147483647;
-                        files = (
-                        );
-                        inputPaths = (
-                        );
-                        name = "Run Script (Copy)";
-                        outputPaths = (
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
-                        shellPath = /bin/sh;
-                        shellScript = "rm -rf \"$HOME/Library/PreferencePanes/$WRAPPER_NAME\"\ncp -Rp \"$BUILT_PRODUCTS_DIR/$WRAPPER_NAME\" \"$HOME/Library/PreferencePanes/\"";
-                };
-                A50335AC0864C98900CE6911 /* Run Script (Wired Server) */ = {
-                        isa = PBXShellScriptBuildPhase;
@@ -772 +775 @@
-
-/* Begin PBXTargetDependency section */
+                77B2B2D208680DEC005E1B8F /* PBXTargetDependency */ = {
+                        isa = PBXTargetDependency;
+                        target = 8D202CE80486D31800D8A456 /* Wired Panel */;
+                        targetProxy = 77B2B2D108680DEC005E1B8F /* PBXContainerItemProxy */;
+                };
-                A50335580864C22200CE6911 /* PBXTargetDependency */ = {
-                        isa = PBXTargetDependency;
@@ -830 +838 @@
-                                COPY_PHASE_STRIP = NO;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-
+-O0
-                                OTHER_CFLAGS = "";
-                                OTHER_LDFLAGS = "";
@@ -847 +855 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-
+-O0
-                                OTHER_CFLAGS = "";
-                                OTHER_LDFLAGS = "";
@@ -866 +874 @@
-                                COPY_PHASE_STRIP = YES;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-
+-O0
-                                OTHER_CFLAGS = "";
-                                OTHER_LDFLAGS = "";

WiredServer/trunk/install.sh

@@ -13 +13 @@
-cd "$PROJECT_TEMP_DIR"
-rm -rf wired
-co
+export
-cd wired
-co
+export
-
-rm -rf "$ROOT/Library/Wired" "$ROOT/usr/local/man"
-C -
+
-make || exit 1
-sudo make install || exit 1
@@ -28 +28 @@
-
-# clean
-\( -name .DS_Store -o -name .svn -o -name CVS \)
+-name .DS_Store
-sudo chmod 1775 "$ROOT"
-sudo chown root:wheel "$ROOT"

WiredServer/trunk/makepkg.sh

@@ -5 +5 @@
-
-rm -rf "$PACKAGE"
-
+ || exit 1
-
-exit 0