Changeset 2975

Show
Ignore:
Timestamp:
06/19/05 04:09:46 (3 years ago)
Author:
morris
Message:

Upgrade to Xcode 2.1

Integrate into new build system

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • WiredServer/trunk/Panel/WPWired.h

    r942 r2975  
    1 /* $Id: WPWired.h,v 1.3 2005/01/15 17:21:25 morris Exp $ */ 
     1/* $Id$ */ 
    22 
    33/* 
    …… 
    2727 */ 
    2828 
     29@class WCAccountsController, WCConfigController, WCDashboardController; 
     30@class WCLogController, WCStatusController; 
     31 
    2932@interface WPWired : NSPreferencePane { 
    3033        IBOutlet WCAccountsController   *_accountsController; 

  • WiredServer/trunk/Panel/WPWired.m

    r1639 r2975  
    2727 */ 
    2828 
     29#import "WCAccountsController.h" 
     30#import "WCAuthorization.h" 
     31#import "WCConfigController.h" 
     32#import "WCDashboardController.h" 
     33#import "WCSettings.h" 
     34#import "WCStatusController.h" 
    2935#import "WPWired.h" 
    30  
    31 NSBundle                                *zankaAdditionsBundle; 
    32  
    3336 
    3437@interface WPWired(Private) 
    …… 
    4346 
    4447+ (void)load { 
     48        NSBundle        *bundle; 
    4549        NSString        *path; 
    4650         
    …… 
    4852                stringByAppendingPathComponent:@"ZankaAdditions.framework"]; 
    4953         
    50         zankaAdditionsBundle = [[NSBundle bundleWithPath:path] retain]; 
     54        bundle = [NSBundle bundleWithPath:path]; 
    5155         
    52         if(![zankaAdditionsBundle load]) 
    53                 NSLog(@"Failed to load %@", zankaAdditionsBundle); 
     56        if(!bundle) 
     57                NSLog(@"Failed to load ZankaAdditions.framework from %@", path); 
     58         
     59        if(![bundle load]) 
     60                NSLog(@"Failed to load %@", bundle); 
    5461} 
    5562 

  • WiredServer/trunk/Panel/prefix.pch

    r923 r2975  
    1 /* $Id: prefix.pch,v 1.1 2005/01/07 23:14:20 morris Exp $ */ 
     1/* $Id$ */ 
    22 
    33/* 
    …… 
    4747#import <openssl/pem.h> 
    4848#import <openssl/rsa.h> 
    49  
    50 // --- Wired common classes 
    51 #import "WiredCommon.h" 

  • WiredServer/trunk/WCAccounts.m

    r923 r2975  
    1 /* $Id: WCAccounts.m,v 1.1 2005/01/07 23:14:19 morris Exp $ */ 
     1/* $Id$ */ 
    22 
    33/* 
    …… 
    2727 */ 
    2828 
     29#import "WCAccounts.h" 
     30 
    2931@implementation WCAccount 
    3032 

  • WiredServer/trunk/WCAccountsController.h

    r938 r2975  
    1 /* $Id: WCAccountsController.h,v 1.2 2005/01/14 16:09:22 morris Exp $ */ 
     1/* $Id$ */ 
    22 
    33/* 
    …… 
    2727 */ 
    2828 
    29 @class WCConfigController; 
     29@class WCConfigController, WCAccounts; 
    3030 
    3131@interface WCAccountsController : NSObject { 

  • WiredServer/trunk/WCAccountsController.m

    r938 r2975  
    1 /* $Id: WCAccountsController.m,v 1.3 2005/01/14 16:09:22 morris Exp $ */ 
     1/* $Id$ */ 
    22 
    33/* 
    …… 
    2727 */ 
    2828 
     29#import "WCAccounts.h" 
     30#import "WCAccountsController.h" 
     31#import "WCAuthorization.h" 
     32#import "WCConfig.h" 
     33#import "WCConfigController.h" 
     34#import "WCSettings.h" 
     35 
    2936@interface WCAccountsController(Private) 
    3037 
    …… 
    6774        _accounts = [[NSMutableArray alloc] init]; 
    6875 
    69         cell = [[[zankaAdditionsBundle classNamed:@"ZAIconCell"] alloc] init]; 
     76        cell = [[ZAIconCell alloc] init]; 
    7077        [cell setImageWidth:16.0]; 
    7178        [cell setDrawsWhitespace:YES]; 

  • WiredServer/trunk/WCAuthorization.m

    r938 r2975  
    1 /* $Id: WCAuthorization.m,v 1.2 2005/01/14 16:09:22 morris Exp $ */ 
     1/* $Id$ */ 
    22 
    33/* 
    …… 
    2727 */ 
    2828 
     29#import "WCAuthorization.h" 
     30#import "WCLogController.h" 
     31 
    2932@implementation WCAuthorization 
    3033 

  • WiredServer/trunk/WCConfig.m

    r1750 r2975  
    2020 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
    2121 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
    22        * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
     22 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
    2323 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
    2424 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
    …… 
    2626 * POSSIBILITY OF SUCH DAMAGE. 
    2727 */ 
     28 
     29#import "WCConfig.h" 
     30#import "WCSettings.h" 
    2831 
    2932@implementation WCConfig 

  • WiredServer/trunk/WCConfigController.h

    r938 r2975  
    1 /* $Id: WCConfigController.h,v 1.2 2005/01/14 16:09:22 morris Exp $ */ 
     1/* $Id$ */ 
    22 
    33/* 
    …… 
    2727 */ 
    2828 
    29 @class WCDashboardController; 
     29@class WCDashboardController, WCConfig; 
    3030 
    3131@interface WCConfigController : NSObject { 
    …… 
    100100 
    101101 
     102#define WCControlPort                           2000 
     103#define WCTransferPort                          2001 
     104#define WCTrackerPort                           2002 
     105 
    102106#define WCConfigDidChange                       @"WCConfigDidChange" 
    103107#define WCLogConfigDidChange            @"WCLogConfigDidChange" 

  • WiredServer/trunk/WCConfigController.m

    r1644 r2975  
    3030#import <syslog.h> 
    3131#undef SYSLOG_NAMES 
     32 
     33#import "WCAuthorization.h" 
     34#import "WCConfig.h" 
     35#import "WCConfigController.h" 
     36#import "WCSettings.h" 
     37#import "WCStatusController.h" 
    3238 
    3339@interface WCConfigController(Private) 
    …… 
    10331039         
    10341040        tracker = [[_config arrayForKey:@"tracker"] objectAtIndex:row]; 
    1035         url = [[zankaAdditionsBundle classNamed:@"ZAURL"] URLWithString:tracker]; 
     1041        url = [ZAURL URLWithString:tracker]; 
    10361042         
    10371043        if(url) { 
    …… 
    10581064 
    10591065        tracker = [[_config arrayForKey:@"tracker"] objectAtIndex:row]; 
    1060         url = [[zankaAdditionsBundle classNamed:@"ZAURL"] URLWithString:tracker]; 
     1066        url = [ZAURL URLWithString:tracker]; 
    10611067 
    10621068        if(tableColumn == _trackerTableColumn) { 

  • WiredServer/trunk/WCDashboardController.m

    r934 r2975  
    1 /* $Id: WCDashboardController.m,v 1.1 2005/01/14 15:25:34 morris Exp $ */ 
     1/* $Id$ */ 
    22 
    33/* 
    …… 
    2727 */ 
    2828 
     29#import "WCAuthorization.h" 
     30#import "WCConfigController.h" 
     31#import "WCDashboardController.h" 
     32#import "WCSettings.h" 
     33#import "WCStatusController.h" 
     34 
    2935@interface WCDashboardController(Private) 
    3036 

  • WiredServer/trunk/WCLogController.m

    r1644 r2975  
    2727 */ 
    2828 
     29#import "WCLogController.h" 
    2930#import "WCConfigController.h" 
     31#import "WCSettings.h" 
    3032 
    3133@interface WCLogController(Private) 

  • WiredServer/trunk/WCSettings.m

    r938 r2975  
    1 /* $Id: WCSettings.m,v 1.3 2005/01/14 16:09:22 morris Exp $ */ 
     1/* $Id$ */ 
    22 
    33/* 
    …… 
    2727 */ 
    2828 
     29#import "WCSettings.h" 
     30 
    2931@interface WCSettings(Private) 
    3032 
    …… 
    5961+ (NSDictionary *)defaults { 
    6062        return [NSDictionary dictionaryWithObjectsAndKeys: 
    61                 @"/usr/local/wired", 
     63                @"/Library/Wired", 
    6264                        WCPrefixPath, 
    6365                 

  • WiredServer/trunk/WCStatusController.m

    r940 r2975  
    1 /* $Id: WCStatusController.m,v 1.3 2005/01/15 15:56:39 morris Exp $ */ 
     1/* $Id$ */ 
    22 
    33/* 
    …… 
    2727 */ 
    2828 
     29#import "WCSettings.h" 
     30#import "WCStatusController.h" 
     31 
    2932@interface WCStatusController(Private) 
    3033 

  • WiredServer/trunk/WiredCommon.h

    r938 r2975  
    1 /* $Id: WiredCommon.h,v 1.3 2005/01/14 16:09:22 morris Exp $ */ 
     1/* $Id$ */ 
    22 
    33/* 
    …… 
    4242#define WCTransferPort          2001 
    4343#define WCTrackerPort           2002 
    44  
    45 // --- Globals 
    46 extern NSBundle                         *zankaAdditionsBundle; 

  • WiredServer/trunk/install.sh

    r1777 r2975  
    22 
    33ROOT="$1" 
    4 SVNURL="svn+ssh://anonsvn@svn.zankasoftware.com/svn" 
     4SVNURL="svn://svn.zankasoftware.com" 
    55 
    6 mkdir -p "$BUILT_PRODUCTS_DIR/Wired Server" 
     6# create skeleton directories 
    77mkdir -p "$ROOT/Library/PreferencePanes" 
    88mkdir -p "$ROOT/Library/StartupItems" 
     9mkdir -p "$ROOT/Library/Wired" 
    910mkdir -p "$ROOT/usr/local" 
    1011 
    11 # /usr/local/wired 
    12 cd "$BUILT_PRODUCTS_DIR" 
     12# /Library/Wired 
     13cd "$PROJECT_TEMP_DIR" 
    1314rm -rf wired 
    1415svn co "$SVNURL/wired/trunk" wired || exit 1 
    …… 
    1617svn co "$SVNURL/libzanka/trunk" libzanka || exit 1 
    1718 
    18 rm -rf "$ROOT/usr/local/wired" "$ROOT/usr/local/man" 
    19 ./configure -C --prefix="$ROOT/usr/local" --with-fake-prefix="/usr/local" --enable-warnings 
     19rm -rf "$ROOT/Library/Wired" "$ROOT/usr/local/man" 
     20./configure -C --prefix="$ROOT/Library" --with-fake-prefix="/Library" --with-wireddir="Wired" --mandir="$ROOT/usr/local/man" --enable-warnings 
    2021make || exit 1 
    2122sudo make install || exit 1 
    2223 
    23 cd "$BUILT_PRODUCTS_DIR" 
    24 rm -rf wired 
    25  
    2624# /Library 
    2725cd "$SRCROOT" 
    28 rm -rf "$ROOT/Library/PreferencePanes/Wired.prefPane" 
    2926cp -rp "$BUILT_PRODUCTS_DIR/Wired.prefPane" "$ROOT/Library/PreferencePanes/" 
    30 rm -rf "$ROOT/Library/StartupItems/Wired" 
    3127cp -rp "StartupItems/Wired" "$ROOT/Library/StartupItems/" 
    3228 
    33  
    3429# clean 
    35 find "$ROOT" -name .DS_Store -print0 | xargs -0 rm -f 
    36 chmod 1775 "$ROOT" 
     30find "$ROOT" -name .DS_Store -print0 | sudo xargs -0 rm -f 
     31sudo chmod 1775 "$ROOT" 
    3732sudo chown root:wheel "$ROOT" 
    3833 
    39 find "$ROOT/Library" -type d -o -perm +111 -print0 | xargs -0 chmod 775 
    40 find "$ROOT/Library" -type f -a ! -perm +111 -print0 | xargs -0 chmod 664 
     34find "$ROOT/Library" -type d -o -perm +111 -print0 | sudo xargs -0 chmod 775 
     35find "$ROOT/Library" -type f -a ! -perm +111 -print0 | sudo xargs -0 chmod 664 
    4136sudo chown -R root:admin "$ROOT/Library" 
    4237 
    43 chmod 775 "$ROOT/usr" "$ROOT/usr/local" 
     38sudo chmod 775 "$ROOT/usr" "$ROOT/usr/local" 
    4439sudo chown root:wheel "$ROOT/usr" "$ROOT/usr/local" 
    4540 

  • WiredServer/trunk/version.pl

    r1652 r2975  
    2020print FH $info; 
    2121close(FH); 
    22  
    23 system("rm -rf '$ENV{BUILT_PRODUCTS_DIR}/$ENV{EXECUTABLE_NAME} build $prevversion.$ENV{WRAPPER_EXTENSION}'"); 
    24 system("ln -sf '$ENV{BUILT_PRODUCTS_DIR}/$ENV{WRAPPER_NAME}' '$ENV{BUILD_DIR}/$ENV{EXECUTABLE_NAME} build $version.$ENV{WRAPPER_EXTENSION}'");