Changeset 6283

Show
Ignore:
Timestamp:
10/30/08 23:23:01 (2 months ago)
Author:
morris
Message:

Upgrade to Xcode 2.1

Fix up scripts

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/WiredServer/WiredServer.xcconfig

    r6274 r6283  
    2323GCC_WARN_SIGN_COMPARE = YES 
    2424GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = YES 
    25 MACOSX_DEPLOYMENT_TARGET_i386 = 10.4 
    26 MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5 
    27 MACOSX_DEPLOYMENT_TARGET_ppc = 10.4 
    28 MACOSX_DEPLOYMENT_TARGET_ppc64 = 10.5 
    29 SDKROOT_i386 = $(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk 
    30 SDKROOT_x86_64 = $(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk 
    31 SDKROOT_ppc = $(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk 
    32 SDKROOT_ppc64 = $(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk 
    3325WARNING_CFLAGS =  

  • trunk/WiredServer/WiredServer.xcodeproj/project.pbxproj

    r6281 r6283  
    227227                A503353F0864C0DE00CE6911 /* English */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xml; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; }; 
    228228                A503354A0864C15D00CE6911 /* wired.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = wired.sh; sourceTree = "<group>"; }; 
    229                 A503354B0864C16700CE6911 /* makepkg.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = makepkg.sh; sourceTree = "<group>"; }; 
    230229                A50336990865AA5E00CE6911 /* postflight */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; name = postflight; path = Package/Resources/postflight; sourceTree = "<group>"; }; 
    231230                A503369A0865AA5E00CE6911 /* postupgrade */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; name = postupgrade; path = Package/Resources/postupgrade; sourceTree = "<group>"; }; 
    …… 
    263262                A5E4A9600794792600FA127F /* WCDashboardController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WCDashboardController.h; sourceTree = "<group>"; }; 
    264263                A5E4A9610794792600FA127F /* WCDashboardController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WCDashboardController.m; sourceTree = "<group>"; }; 
    265                 A5E4AAE30794812C00FA127F /* WiredAdditions.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WiredAdditions.framework; path = WiredAdditions/build/WiredAdditions.framework; sourceTree = SOURCE_ROOT; }; 
    266                 A5FEE2FF0B78787900199A37 /* package.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = package.sh; sourceTree = "<group>"; }; 
     264                A5FEE2FF0B78787900199A37 /* install.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = install.sh; sourceTree = "<group>"; }; 
    267265                F506C035013D953901CA16C8 /* PreferencePanes.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PreferencePanes.framework; path = /System/Library/Frameworks/PreferencePanes.framework; sourceTree = "<absolute>"; }; 
    268266/* End PBXFileReference section */ 
    …… 
    317315                                F506C035013D953901CA16C8 /* PreferencePanes.framework */, 
    318316                                A540687705CDC46100068FBB /* Security.framework */, 
    319                                 A5E4AAE30794812C00FA127F /* WiredAdditions.framework */, 
    320317                        ); 
    321318                        name = "Linked Frameworks"; 
    …… 
    467464                        isa = PBXGroup; 
    468465                        children = ( 
    469                                 A503354B0864C16700CE6911 /* makepkg.sh */, 
    470                                 A5FEE2FF0B78787900199A37 /* package.sh */, 
     466                                A5FEE2FF0B78787900199A37 /* install.sh */, 
    471467                                A503354A0864C15D00CE6911 /* wired.sh */, 
    472468                        ); 
    …… 
    678674                        runOnlyForDeploymentPostprocessing = 0; 
    679675                        shellPath = /bin/sh; 
    680                         shellScript = "# Create initial directory\nsudo rm -rf \"$PROJECT_TEMP_DIR/Package\"\nmkdir -p \"$PROJECT_TEMP_DIR/Package\"\n\n# Copy package files\ncp -Rp Package/* \"$PROJECT_TEMP_DIR/Package\" || exit 1\n\n# Install Wired Server into directory\nsh package.sh \"$PROJECT_TEMP_DIR/wired\" \"$PROJECT_TEMP_DIR/Package/Contents\" || exit 1\n\n# Create package from directory\nmkdir -p \"$BUILT_PRODUCTS_DIR\"\nsh makepkg.sh \"$PROJECT_TEMP_DIR/Package\" \"$BUILT_PRODUCTS_DIR/WiredServer.pkg\" || exit 1\n"; 
     676                        shellScript = "sudo rm -rf \"$PROJECT_TEMP_DIR/Package\"\nmkdir -p \"$PROJECT_TEMP_DIR/Package\"\n\ncp -Rp Package/* \"$PROJECT_TEMP_DIR/Package\" || exit 1\n\nsh install.sh || exit 1\n\nfind \"$PROJECT_TEMP_DIR/Package\" -name .svn -print0 | xargs -0 sudo rm -rf\n\nrm -rf \"$BUILT_PRODUCTS_DIR/WiredServer.pkg\"\n/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -v -ds -p \"$BUILT_PRODUCTS_DIR/WiredServer.pkg\" -f \"$PROJECT_TEMP_DIR/Package/Contents\" -r \"$PROJECT_TEMP_DIR/Package/Resources\" -i \"$PROJECT_TEMP_DIR/Package/Info.plist\" -d \"$PROJECT_TEMP_DIR/Package/Resources/English.lproj/Description.plist\" || exit 1\n"; 
    681677                }; 
    682678                A5992EB5072A77F900E67617 /* Run Script (Version) */ = { 
    …… 
    720716                        runOnlyForDeploymentPostprocessing = 0; 
    721717                        shellPath = /bin/sh; 
    722                         shellScript = "# Zip\ncd \"$BUILT_PRODUCTS_DIR\"\nrm -f \"$BUILD_DIR/WiredServer.zip\"\nzip -ry \"$BUILD_DIR/WiredServer.zip\" \"WiredServer.pkg\" || exit 1\n"; 
     718                        shellScript = "cd \"$BUILT_PRODUCTS_DIR\"\nrm -f \"$BUILD_DIR/WiredServer.zip\"\nzip -ry \"$BUILD_DIR/WiredServer.zip\" \"WiredServer.pkg\" || exit 1\n"; 
    723719                }; 
    724720                A5FEE2810B7870E000199A37 /* Run Script (wired) */ = { 
    …… 
    734730                        runOnlyForDeploymentPostprocessing = 0; 
    735731                        shellPath = /bin/sh; 
    736                         shellScript = "# Build wired\nsh wired.sh \"$PROJECT_TEMP_DIR/wired\" \"$PROJECT_TEMP_DIR/Package/Contents\" || exit 1\n"; 
     732                        shellScript = "# Build wired\nsh wired.sh exit 1\n"; 
    737733                }; 
    738734/* End PBXShellScriptBuildPhase section */ 

  • trunk/WiredServer/install.sh

    • Property svn:mergeinfo set
    r5175 r6283  
    11#!/bin/sh 
    22 
    3 BUILDDIR="$1" 
    4 INSTALLDIR="$2" 
     3mkdir -p "$PROJECT_TEMP_DIR/Package/Contents/Library/PreferencePanes" 
     4mkdir -p "$PROJECT_TEMP_DIR/Package/Contents/Library/StartupItems" 
     5mkdir -p "$PROJECT_TEMP_DIR/Package/Contents/Library/Wired" 
    56 
    6 # Create skeleton directories 
    7 mkdir -p "$INSTALLDIR/Library/PreferencePanes" 
    8 mkdir -p "$INSTALLDIR/Library/StartupItems" 
    9 mkdir -p "$INSTALLDIR/Library/Wired" 
    10  
    11 # Build a universal wired installation 
    127for i in $ARCHS; do 
    13         WIRED_BINARIES="$BUILDDIR/run/$i/wired/wired $WIRED_BINARIES" 
     8        WIRED_BINARIES="$PROJECT_TEMP_DIR/run/$i/wired/wired $WIRED_BINARIES" 
    149        MASTER="$i" 
    1510done 
    1611 
    17 cp "$BUILDDIR/run/$MASTER/wired/wired" "/tmp/wired.$MASTER" 
     12cp "$PROJECT_TEMP_DIR/run/$MASTER/wired/wired" "/tmp/wired.$MASTER" 
    1813lipo -create $WIRED_BINARIES -output "/tmp/wired.universal" || exit 1 
    19 cp "/tmp/wired.universal" "$BUILDDIR/run/$MASTER/wired/wired" 
     14cp "/tmp/wired.universal" "$PROJECT_TEMP_DIR/run/$MASTER/wired/wired" 
    2015 
    21 # Install wired into /Library/Wired 
    22 sudo make -f "$BUILDDIR/make/$MASTER/Makefile" install-only || exit 1 
     16sudo make -f "$PROJECT_TEMP_DIR/make/$MASTER/Makefile" install-only || exit 1 
    2317 
    24 # Restore thin binary 
    25 cp "/tmp/wired.$MASTER" "$BUILDDIR/run/$MASTER/wired/wired" 
     18cp "/tmp/wired.$MASTER" "$PROJECT_TEMP_DIR/run/$MASTER/wired/wired" 
    2619 
    27 # Install /Library/PreferencePanes and /Library/StartupItems 
    28 cd "$SRCROOT" 
    29 cp -Rp "$BUILT_PRODUCTS_DIR/Wired.prefPane" "$INSTALLDIR/Library/PreferencePanes/" 
    30 cp -Rp "StartupItems/Wired" "$INSTALLDIR/Library/StartupItems/" 
     20cp -Rp "$BUILT_PRODUCTS_DIR/Wired.prefPane" "$PROJECT_TEMP_DIR/Package/Contents/Library/PreferencePanes/" 
     21cp -Rp "StartupItems/Wired" "$PROJECT_TEMP_DIR/Package/Contents/Library/StartupItems/" 
    3122 
    32 # Fix permissions 
    33 sudo chmod 1775 "$INSTALLDIR" 
    34 sudo chown root:wheel "$INSTALLDIR" 
     23sudo chmod 1775 "$PROJECT_TEMP_DIR/Package/Contents" 
     24sudo chown root:wheel "$PROJECT_TEMP_DIR/Package/Contents" 
    3525 
    36 sudo chmod 775 "$INSTALLDIR/Library" 
    37 sudo chown root:admin "$INSTALLDIR/Library" 
     26sudo chmod 775 "$PROJECT_TEMP_DIR/Package/Contents/Library" 
     27sudo chown root:admin "$PROJECT_TEMP_DIR/Package/Contents/Library" 
    3828 
    39 find "$INSTALLDIR/Library/PreferencePanes" \( -type d -o -perm +111 \) -print0 | sudo xargs -0 chmod 775 
    40 find "$INSTALLDIR/Library/PreferencePanes" \( -type f -a ! -perm +111 \) -print0 | sudo xargs -0 chmod 664 
    41 sudo chmod 775 "$INSTALLDIR/Library/PreferencePanes" 
    42 sudo chown -R root:admin "$INSTALLDIR/Library/PreferencePanes" 
     29find "$PROJECT_TEMP_DIR/Package/Contents/Library/PreferencePanes" \( -type d -o -perm +111 \) -print0 | sudo xargs -0 chmod 775 
     30find "$PROJECT_TEMP_DIR/Package/Contents/Library/PreferencePanes" \( -type f -a ! -perm +111 \) -print0 | sudo xargs -0 chmod 664 
     31sudo chmod 775 "$PROJECT_TEMP_DIR/Package/Contents/Library/PreferencePanes" 
     32sudo chown -R root:admin "$PROJECT_TEMP_DIR/Package/Contents/Library/PreferencePanes" 
    4333 
    44 sudo chown -R root:wheel "$INSTALLDIR/Library/StartupItems" 
     34sudo chown -R root:wheel "$PROJECT_TEMP_DIR/Package/Contents/Library/StartupItems" 
    4535 
    46 sudo chmod 755 "$INSTALLDIR/usr" "$INSTALLDIR/usr/local" 
    47 sudo chown root:wheel "$INSTALLDIR/usr" "$INSTALLDIR/usr/local" 
    48  
    49 exit 0 
     36sudo chmod 755 "$PROJECT_TEMP_DIR/Package/Contents/usr" "$PROJECT_TEMP_DIR/Package/Contents/usr/local" 
     37sudo chown root:wheel "$PROJECT_TEMP_DIR/Package/Contents/usr" "$PROJECT_TEMP_DIR/Package/Contents/usr/local" 

  • trunk/WiredServer/wired.sh

    r5008 r6283  
    11#!/bin/sh 
    22 
    3 BUILDDIR="$1" 
    4 INSTALLDIR="$2" 
     3CFLAGS="-gdwarf-2" 
     4 
     5if echo $CONFIGURATION | grep -q Debug; then 
     6        CFLAGS="$CFLAGS -O0" 
     7else 
     8        CFLAGS="$CFLAGS -O2" 
     9fi 
     10 
     11cd wired 
     12 
     13BUILD=$(./config.guess) 
    514 
    615for i in $ARCHS; do 
    7         if [ ! -f "$BUILDDIR/make/$i/Makefile" ]; then 
     16        if [ ! -f "$PROJECT_TEMP_DIR/make/$i/Makefile" ]; then 
     17                HOST="$i-apple-darwin$RELEASE" 
     18                ARCH_CFLAGS="$CFLAGS" 
     19                ARCH_CPPFLAGS="$CPPFLAGS" 
     20 
     21                if [ "$i" = "i386" -o "$i" = "ppc" ]; then 
     22                        SDKROOT="$DEVELOPER_SDK_DIR/MacOSX10.4u.sdk" 
     23                        MACOSX_DEPLOYMENT_TARGET=10.4 
     24                elif [ "$i" = "x86_64" -o "$i" = "ppc64" ]; then 
     25                        SDKROOT="$DEVELOPER_SDK_DIR/MacOSX10.5.sdk" 
     26                        MACOSX_DEPLOYMENT_TARGET=10.5 
     27                fi 
     28 
     29                ARCH_CPPFLAGS="$ARCH_CPPFLAGS -isysroot $SDKROOT -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET" 
     30 
    831                SDKROOT=$(eval echo SDKROOT_$i); SDKROOT=$(eval echo \$$SDKROOT) 
    932                MACOSX_DEPLOYMENT_TARGET=$(eval echo MACOSX_DEPLOYMENT_TARGET_$i); MACOSX_DEPLOYMENT_TARGET=$(eval echo \$$MACOSX_DEPLOYMENT_TARGET) 
    1033                RELEASE=$(uname -r) 
    1134                BUILD=$("$SRCROOT/wired/config.guess") 
    12                 HOST="$i-apple-darwin$RELEASE" 
    1335                 
    14                 cd "$SRCROOT/wired" 
    15                 CFLAGS="-g -O2 -arch $i -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET" CPPFLAGS="-I$BUILDDIR/make/$i -isysroot $SDKROOT" ./configure --build="$BUILD" --host="$HOST" --enable-warnings --srcdir="$SRCROOT/wired" --with-objdir="$OBJECT_FILE_DIR/$i" --with-rundir="$BUILDDIR/run/$i/wired" --prefix="$INSTALLDIR/Library" --with-fake-prefix="/Library" --with-wireddir="Wired" --mandir="$INSTALLDIR/usr/local/man" --without-libwired || exit 1 
     36                CC="gcc -arch $i" CFLAGS="$ARCH_CFLAGS" CPPFLAGS="$ARCH_CPPFLAGS -I$PROJECT_TEMP_DIR/make/$i" ./configure --build="$BUILD" --host="$HOST" --enable-warnings --srcdir="$SRCROOT/wired" --with-objdir="$OBJECT_FILE_DIR/$i" --with-rundir="$PROJECT_TEMP_DIR/run/$i/wired" --prefix="$PROJECT_TEMP_DIR/Package/Contents/Library" --with-fake-prefix="/Library" --with-wireddir="Wired" --mandir="$PROJECT_TEMP_DIR/Package/Contents/usr/local/man" --without-libwired || exit 1 
    1637                 
    17                 cd "$SRCROOT/wired/libwired" 
    18                 CFLAGS="-g -O2 -arch $i -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET" CPPFLAGS="-I$BUILDDIR/make/$i/libwired -isysroot $SDKROOT" ./configure --build="$BUILD" --host="$HOST" --enable-warnings --enable-ssl --enable-pthreads --srcdir="$SRCROOT/wired/libwired" --with-objdir="$OBJECT_FILE_DIR/$i" --with-rundir="$BUILDDIR/run/$i/wired/libwired" || exit 1 
     38                mkdir -p "$PROJECT_TEMP_DIR/make/$i/libwired" "$PROJECT_TEMP_DIR/run/$i" "$BUILT_PRODUCTS_DIR" 
     39                mv config.h Makefile "$PROJECT_TEMP_DIR/make/$i/" 
     40                cp -r run "$PROJECT_TEMP_DIR/run/$i/wired" 
    1941 
    20                 mkdir -p "$BUILDDIR/make/$i/libwired" "$BUILDDIR/run/$i" "$BUILT_PRODUCTS_DIR" 
    21                 mv "$SRCROOT/wired/config.h" "$BUILDDIR/make/$i/config.h" 
    22                 mv "$SRCROOT/wired/libwired/config.h" "$BUILDDIR/make/$i/libwired/config.h" 
    23                 mv "$SRCROOT/wired/Makefile" "$BUILDDIR/make/$i/Makefile" 
    24                 mv "$SRCROOT/wired/libwired/Makefile" "$BUILDDIR/make/$i/libwired/Makefile" 
    25                 cp -r "$SRCROOT/wired/run" "$BUILDDIR/run/$i/wired" 
    26                 cp -r "$SRCROOT/wired/libwired/run" "$BUILDDIR/run/$i/wired/libwired" 
     42                cd libwired 
     43                CC="gcc -arch $i" CFLAGS="$ARCH_CFLAGS" CPPFLAGS="$ARCH_CPPFLAGS -I$PROJECT_TEMP_DIR/make/$i/libwired" ./configure --build="$BUILD" --host="$HOST" --enable-warnings --enable-ssl --enable-pthreads --srcdir="$SRCROOT/wired/libwired" --with-objdir="$OBJECT_FILE_DIR/$i" --with-rundir="$PROJECT_TEMP_DIR/run/$i/wired/libwired" || exit 1 
     44                mv config.h Makefile "$PROJECT_TEMP_DIR/make/$i/libwired" 
     45                cp -r run "$PROJECT_TEMP_DIR/run/$i/wired/libwired" 
     46                cd .. 
    2747        fi 
    2848         
    29         cd "$BUILDDIR/make/$i" 
    30         make -f "$BUILDDIR/make/$i/Makefile" || exit 1 
     49        cd "$PROJECT_TEMP_DIR/make/$i" 
     50        make -f "$PROJECT_TEMP_DIR/make/$i/Makefile" || exit 1 
    3151done 
    32  
    33 exit 0