Changeset 3004

Show
Ignore:
Timestamp:
06/22/05 22:58:12 (4 years ago)
Author:
morris
Message:

Restructure package layout, make files localized

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • WiredServer/trunk/Package/Info.plist

    r923 r3004  
    2222        <string>/</string> 
    2323        <key>IFPkgFlagFollowLinks</key> 
    24         <false/> 
     24        <true/> 
    2525        <key>IFPkgFlagInstallFat</key> 
    26         <false/> 
     26        <true/> 
    2727        <key>IFPkgFlagIsRequired</key> 
    2828        <false/> 
  • WiredServer/trunk/Package/Resources/postflight

    r2996 r3004  
    11#!/bin/sh 
    22 
    3 # set prefix 
     3# Set prefix 
    44defaults write com.apple.systempreferences WCPrefixPath /Library/Wired 
    55 
    6 # generate new key 
     6# Generate new key 
    77if [ ! -f /Library/Wired/etc/certificate.pem ]; then 
    88        /Library/Wired/wiredctl certificate 
    99fi 
    1010 
    11 # touch log file 
     11# Touch log file 
    1212touch /Library/Wired/wired.log 
    1313 
    14 # set owner to that in prefs 
     14# Set owner to that in prefs 
    1515OWNER=$(/Library/Wired/wiredctl config | grep "^user = " | cut -d "=" -f2) 
    1616 
     
    2727chown -R $OWNER:$GROUP /Library/Wired 
    2828 
    29 # open System Preferences 
     29# Open System Preferences 
    3030/usr/bin/osascript <<EOF 
    3131tell application "System Preferences" 
    3232        activate 
    33         set current pane to pane "com.zanka.WiredPanel
     33        set current pane to pane "com.zanka.WiredServer
    3434end tell 
    3535EOF 
  • WiredServer/trunk/Package/Resources/postupgrade

    r2986 r3004  
    11#!/bin/sh 
    22 
    3 # match these in preupgrade 
     3# Match these in preupgrade 
    44PRESERVE="etc/wired.conf etc/certificate.pem banlist groups news users" 
    55 
  • WiredServer/trunk/Package/Resources/preinstall

    r2986 r3004  
    11#!/bin/sh 
    22 
    3 # create user 
     3# Create user 
    44niutil -create . /users/wired 
    55niutil -createprop . /users/wired uid 120 
  • WiredServer/trunk/Package/Resources/preupgrade

    r2986 r3004  
    11#!/bin/sh 
    22 
    3 # match these in postupgrade 
     3# Match these in postupgrade 
    44PRESERVE="etc/wired.conf etc/certificate.pem banlist groups news users" 
    55 
  • WiredServer/trunk/PreferencePane/Info.plist

    r937 r3004  
    1010        <string>Wired</string> 
    1111        <key>CFBundleIdentifier</key> 
    12         <string>com.zanka.WiredPanel</string> 
     12        <string>com.zanka.WiredServer</string> 
    1313        <key>CFBundleInfoDictionaryVersion</key> 
    1414        <string>6.0</string> 
  • WiredServer/trunk/WiredServer.xcodeproj/project.pbxproj

    r2998 r3004  
    181181                        containerPortal = 089C1669FE841209C02AAC07 /* Project object */; 
    182182                        proxyType = 1; 
    183                         remoteGlobalIDString = 8D202CE80486D31800D8A456 /* Wired Preference Pane */
     183                        remoteGlobalIDString = 8D202CE80486D31800D8A456
    184184                        remoteInfo = "Wired Preference Pane"; 
    185185                }; 
     
    273273                778C04740730F89500F29BC7 /* WCStatusController.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = WCStatusController.m; sourceTree = "<group>"; }; 
    274274                778C04750730F89500F29BC7 /* WCStatusController.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = WCStatusController.h; sourceTree = "<group>"; }; 
     275                77A9DE7A08695F35006BF5B0 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = Package/Resources/English.lproj/ReadMe.rtf; sourceTree = "<group>"; }; 
     276                77A9DE7C08695F3F006BF5B0 /* English */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xml; name = English; path = Package/Resources/English.lproj/Description.plist; sourceTree = "<group>"; }; 
    275277                77C6D5B8072CF3BA008F6164 /* Group.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Group.tiff; path = PreferencePane/Group.tiff; sourceTree = "<group>"; }; 
    276278                77C6D5B9072CF3BA008F6164 /* User.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = User.tiff; path = PreferencePane/User.tiff; sourceTree = "<group>"; }; 
     
    281283                A503354B0864C16700CE6911 /* makepkg.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = makepkg.sh; sourceTree = "<group>"; }; 
    282284                A503354C0864C16700CE6911 /* localize.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = localize.sh; sourceTree = "<group>"; }; 
    283                 A503361B086509B600CE6911 /* ReadMe.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = ReadMe.rtf; path = Package/ReadMe.rtf; sourceTree = "<group>"; }; 
    284                 A50336990865AA5E00CE6911 /* postflight */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; name = postflight; path = Package/postflight; sourceTree = "<group>"; }; 
    285                 A503369A0865AA5E00CE6911 /* postupgrade */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; name = postupgrade; path = Package/postupgrade; sourceTree = "<group>"; }; 
    286                 A503369B0865AA5E00CE6911 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; name = postinstall; path = Package/postinstall; sourceTree = "<group>"; }; 
    287                 A503369C0865AA5E00CE6911 /* preinstall */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; name = preinstall; path = Package/preinstall; sourceTree = "<group>"; }; 
    288                 A503369D0865AA5E00CE6911 /* preupgrade */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; name = preupgrade; path = Package/preupgrade; sourceTree = "<group>"; }; 
     285                A50336990865AA5E00CE6911 /* postflight */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; name = postflight; path = Package/Resources/postflight; sourceTree = "<group>"; }; 
     286                A503369A0865AA5E00CE6911 /* postupgrade */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; name = postupgrade; path = Package/Resources/postupgrade; sourceTree = "<group>"; }; 
     287                A503369B0865AA5E00CE6911 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; name = postinstall; path = Package/Resources/postinstall; sourceTree = "<group>"; }; 
     288                A503369C0865AA5E00CE6911 /* preinstall */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; name = preinstall; path = Package/Resources/preinstall; sourceTree = "<group>"; }; 
     289                A503369D0865AA5E00CE6911 /* preupgrade */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; name = preupgrade; path = Package/Resources/preupgrade; sourceTree = "<group>"; }; 
    289290                A540687705CDC46100068FBB /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; 
    290291                A5992BEF0729917600E67617 /* WCConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WCConfig.h; sourceTree = "<group>"; }; 
     
    311312                A5BE6D1A0864B5FB00DA5C89 /* WiredServer.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = WiredServer.xcconfig; sourceTree = "<group>"; }; 
    312313                A5BE6D1C0864B62000DA5C89 /* ZankaAdditions.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ZankaAdditions.xcodeproj; path = ../ZankaAdditions/ZankaAdditions.xcodeproj; sourceTree = SOURCE_ROOT; }; 
    313                 A5D972E5078F017100CD982E /* Description.plist */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xml; name = Description.plist; path = Package/Description.plist; sourceTree = "<group>"; }; 
    314314                A5D972E6078F017100CD982E /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xml; name = Info.plist; path = Package/Info.plist; sourceTree = "<group>"; }; 
    315315                A5E4A9600794792600FA127F /* WCDashboardController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WCDashboardController.h; sourceTree = "<group>"; }; 
     
    384384                        ); 
    385385                        name = Products; 
     386                        sourceTree = "<group>"; 
     387                }; 
     388                77A9DE2908695DAD006BF5B0 /* Resources */ = { 
     389                        isa = PBXGroup; 
     390                        children = ( 
     391                                77A9DE7B08695F3F006BF5B0 /* Description.plist */, 
     392                                A50336990865AA5E00CE6911 /* postflight */, 
     393                                A503369B0865AA5E00CE6911 /* postinstall */, 
     394                                A503369A0865AA5E00CE6911 /* postupgrade */, 
     395                                A503369C0865AA5E00CE6911 /* preinstall */, 
     396                                A503369D0865AA5E00CE6911 /* preupgrade */, 
     397                                77A9DE7908695F35006BF5B0 /* ReadMe.rtf */, 
     398                        ); 
     399                        name = Resources; 
    386400                        sourceTree = "<group>"; 
    387401                }; 
     
    533547                        isa = PBXGroup; 
    534548                        children = ( 
    535                                 A5D972E5078F017100CD982E /* Description.plist */, 
    536549                                A5D972E6078F017100CD982E /* Info.plist */, 
    537                                 A50336990865AA5E00CE6911 /* postflight */, 
    538                                 A503369B0865AA5E00CE6911 /* postinstall */, 
    539                                 A503369A0865AA5E00CE6911 /* postupgrade */, 
    540                                 A503369C0865AA5E00CE6911 /* preinstall */, 
    541                                 A503369D0865AA5E00CE6911 /* preupgrade */, 
    542                                 A503361B086509B600CE6911 /* ReadMe.rtf */, 
     550                                77A9DE2908695DAD006BF5B0 /* Resources */, 
    543551                        ); 
    544552                        name = Package; 
     
    694702                        runOnlyForDeploymentPostprocessing = 0; 
    695703                        shellPath = /bin/sh; 
    696                         shellScript = "# Create initial directory\nROOT=\"$PROJECT_TEMP_DIR/Package\"\nsudo rm -rf \"$ROOT\"\nmkdir -p \"$ROOT/Contents\" \"$ROOT/Resources\"\ncp \"Package/Description.plist\" \"Package/Info.plist\" \"$ROOT\" || exit 1\ncp \"Package/ReadMe.rtf\" Package/post* Package/pre* \"$ROOT/Resources\" || exit 1\n\n# Install Wired Server into directory\nPATH=\"$PATH:/usr/local/bin/\" sh install.sh \"$ROOT/Contents\" || exit 1\n\n# Create package from directory\nsh makepkg.sh \"$ROOT\" \"$BUILT_PRODUCTS_DIR/Wired Server.pkg\" || exit 1"; 
     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\nfind \"$ROOT\" -name .svn -print0 | xargs -0 rm -rf\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/Wired Server.pkg\" || exit 1"; 
    697705                }; 
    698706                A5992EB5072A77F900E67617 /* Run Script (Version) */ = { 
     
    798806 
    799807/* Begin PBXVariantGroup section */ 
     808                77A9DE7908695F35006BF5B0 /* ReadMe.rtf */ = { 
     809                        isa = PBXVariantGroup; 
     810                        children = ( 
     811                                77A9DE7A08695F35006BF5B0 /* English */, 
     812                        ); 
     813                        name = ReadMe.rtf; 
     814                        sourceTree = "<group>"; 
     815                }; 
     816                77A9DE7B08695F3F006BF5B0 /* Description.plist */ = { 
     817                        isa = PBXVariantGroup; 
     818                        children = ( 
     819                                77A9DE7C08695F3F006BF5B0 /* English */, 
     820                        ); 
     821                        name = Description.plist; 
     822                        sourceTree = "<group>"; 
     823                }; 
    800824                A503353E0864C0DE00CE6911 /* Localizable.strings */ = { 
    801825                        isa = PBXVariantGroup; 
  • WiredServer/trunk/install.sh

    r2997 r3004  
    2828 
    2929# clean 
    30 find "$ROOT" -name .DS_Store -print0 | sudo xargs -0 rm -rf 
    3130sudo chmod 1775 "$ROOT" 
    3231sudo chown root:wheel "$ROOT" 
  • WiredServer/trunk/makepkg.sh

    r2997 r3004  
    55 
    66rm -rf "$PACKAGE" 
    7 /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -p "$PACKAGE" -f "$ROOT/Contents" -r "$ROOT/Resources" -i "$ROOT/Info.plist" -d "$ROOT/Description.plist" || exit 1 
     7/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -ds -p "$PACKAGE" -f "$ROOT/Contents" -r "$ROOT/Resources" -i "$ROOT/Info.plist" -d "$ROOT/Resources/English.lproj/Description.plist" || exit 1 
    88 
    99exit 0