From ef1f48581681b72bc532f7ee84dc7c454fbd1c8d Mon Sep 17 00:00:00 2001 From: kristianduske Date: Sat, 18 Sep 2010 09:01:16 +0000 Subject: [PATCH] Disabled automatic updates through Sparkle for now due to signing problems. git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@325 af15c1b1-3010-417e-b628-4374ebc0bcbd --- .../English.lproj/Launcher.nib/designable.nib | 218 ++++-- .../Launcher.nib/keyedobjects.nib | Bin 26887 -> 26608 bytes MacOSX/Info.plist | 2 + MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser | 684 ++++++++++++------ .../kristian.perspectivev3 | 156 ++-- MacOSX/QuakeSpasm.xcodeproj/project.pbxproj | 94 ++- MacOSX/appcast.xml | 29 +- MacOSX/dsa_pub.pem | 36 +- MacOSX/sign_update.rb | 7 + 9 files changed, 864 insertions(+), 362 deletions(-) create mode 100755 MacOSX/sign_update.rb diff --git a/MacOSX/English.lproj/Launcher.nib/designable.nib b/MacOSX/English.lproj/Launcher.nib/designable.nib index 8ce061c0..4118711c 100644 --- a/MacOSX/English.lproj/Launcher.nib/designable.nib +++ b/MacOSX/English.lproj/Launcher.nib/designable.nib @@ -3,17 +3,17 @@ 1040 10F569 - 762 + 788 1038.29 461.00 com.apple.InterfaceBuilder.CocoaPlugin - 762 + 788 YES - + YES @@ -64,15 +64,8 @@ YES - About NewApplication - - 2147483647 - - - - - - Check for Updates... + YES + About QuakeSpasm 2147483647 @@ -1463,14 +1456,6 @@ 464 - - - checkForUpdates: - - - - 467 - @@ -1842,7 +1827,6 @@ - @@ -2242,11 +2226,6 @@ - - 465 - - - 466 @@ -2421,8 +2400,6 @@ 419.IBPluginDependency 450.IBPluginDependency 451.IBPluginDependency - 465.IBPluginDependency - 466.IBPluginDependency 5.IBPluginDependency 5.ImportedFromIB2 56.IBPluginDependency @@ -2568,7 +2545,7 @@ com.apple.InterfaceBuilder.CocoaPlugin {{525, 802}, {197, 73}} - {{329, 975}, {478, 20}} + {{329, 836}, {478, 20}} com.apple.InterfaceBuilder.CocoaPlugin {74, 862} @@ -2627,12 +2604,10 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{341, 772}, {242, 203}} + {{341, 653}, {232, 183}} com.apple.InterfaceBuilder.CocoaPlugin {{23, 794}, {245, 183}} @@ -2681,7 +2656,7 @@ - 496 + 497 @@ -2696,14 +2671,36 @@ cancel: changeScreenMode: launchQuake: - performUpdate: YES id id id - id + + + + YES + + YES + cancel: + changeScreenMode: + launchQuake: + + + YES + + cancel: + id + + + changeScreenMode: + id + + + launchQuake: + id + @@ -2714,9 +2711,6 @@ launcherWindow paramTextField screenModePopUp - updateButton - updateProgressIndicator - updateTabView YES @@ -2724,9 +2718,35 @@ NSWindow NSTextField NSPopUpButton - NSButton - NSProgressIndicator - NSTabView + + + + YES + + YES + fullscreenCheckBox + launcherWindow + paramTextField + screenModePopUp + + + YES + + fullscreenCheckBox + NSButton + + + launcherWindow + NSWindow + + + paramTextField + NSTextField + + + screenModePopUp + NSPopUpButton + @@ -2774,10 +2794,24 @@ checkForUpdates: id + + checkForUpdates: + + checkForUpdates: + id + + delegate id + + delegate + + delegate + id + + @@ -2914,6 +2948,45 @@ id + + YES + + YES + printDocument: + revertDocumentToSaved: + runPageLayout: + saveDocument: + saveDocumentAs: + saveDocumentTo: + + + YES + + printDocument: + id + + + revertDocumentToSaved: + id + + + runPageLayout: + id + + + saveDocument: + id + + + saveDocumentAs: + id + + + saveDocumentTo: + id + + + IBFrameworkSource AppKit.framework/Headers/NSDocument.h @@ -2946,6 +3019,35 @@ id + + YES + + YES + clearRecentDocuments: + newDocument: + openDocument: + saveAllDocuments: + + + YES + + clearRecentDocuments: + id + + + newDocument: + id + + + openDocument: + id + + + saveAllDocuments: + id + + + IBFrameworkSource AppKit.framework/Headers/NSDocumentController.h @@ -3273,14 +3375,6 @@ AppKit.framework/Headers/NSPopUpButtonCell.h - - NSProgressIndicator - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSProgressIndicator.h - - NSResponder @@ -3296,14 +3390,6 @@ AppKit.framework/Headers/NSResponder.h - - NSTabView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSTabView.h - - NSTableView NSControl @@ -3393,10 +3479,24 @@ checkForUpdates: id + + checkForUpdates: + + checkForUpdates: + id + + delegate id + + delegate + + delegate + id + + @@ -3407,6 +3507,10 @@ com.apple.InterfaceBuilder.CocoaPlugin.macosx + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 diff --git a/MacOSX/English.lproj/Launcher.nib/keyedobjects.nib b/MacOSX/English.lproj/Launcher.nib/keyedobjects.nib index 966611f58b8767d796b8f7f362f6e29e2ffadae5..8d91cbc2ca9da0c1f5ce3777d3eac3f4cd4061e5 100644 GIT binary patch delta 17689 zcma)j2S8KT7x%kwWH7=DdlNE%0A@i*z!1WgCWJ&lR1`%-MOgywk(au)&gZJuT34;s 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 literal 26887 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 diff --git a/MacOSX/Info.plist b/MacOSX/Info.plist index 6d9f4146..caeaa230 100644 --- a/MacOSX/Info.plist +++ b/MacOSX/Info.plist @@ -2,6 +2,8 @@ + SUEnableAutomaticChecks + CFBundleDevelopmentRegion English CFBundleExecutable diff --git a/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser b/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser index c4b188ff..9565bf46 100644 --- a/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser +++ b/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser @@ -2,9 +2,10 @@ { 089C165DFE840E0CC02AAC07 /* English */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1287, 643}}"; - sepNavSelRange = "{294, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {1309, 822}}"; + sepNavSelRange = "{182, 0}"; sepNavVisRange = "{0, 294}"; + sepNavWindowFrame = "{{15, 103}, {1368, 950}}"; }; }; 29B97313FDCFA39411CA2CEA /* Project object */ = { @@ -17,6 +18,8 @@ 8D1107260486CEB800E47090 /* QuakeSpasm */, ); breakpoints = ( + 48ADA3991244932E008DB120 /* SUDebugUpdateDriver.m:15 */, + 48ADA3B412449571008DB120 /* SUUpdateDriver.m:25 */, ); codeSenseManager = 4847CD5412057F2A000B560F /* Code sense */; executables = ( @@ -42,7 +45,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 483, + 964, 20, 48, 43, @@ -64,10 +67,10 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 1069, + 1125, 60, 20, - 48.16259765625, + 48, 43, 43, ); @@ -81,41 +84,49 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 306419644; - PBXWorkspaceStateSaveDate = 306419644; + PBXPerProjectTemplateStateSaveDate = 306480785; + PBXWorkspaceStateSaveDate = 306480785; }; perUserProjectItems = { - 48028D3E12156C670018F743 = 48028D3E12156C670018F743 /* PBXTextBookmark */; - 480BB3A212174CA900939117 = 480BB3A212174CA900939117 /* PBXTextBookmark */; - 480BB3A312174CA900939117 = 480BB3A312174CA900939117 /* PBXTextBookmark */; - 480BB3A412174CA900939117 = 480BB3A412174CA900939117 /* PBXBookmark */; - 480BB3B4121750BB00939117 = 480BB3B4121750BB00939117 /* PBXTextBookmark */; - 48134A1C12102F680015BF15 = 48134A1C12102F680015BF15 /* PBXTextBookmark */; - 48134A1D12102F680015BF15 = 48134A1D12102F680015BF15 /* PBXTextBookmark */; - 48134A1E12102F680015BF15 = 48134A1E12102F680015BF15 /* PBXTextBookmark */; - 4861FA9012144B5300BBDEF1 = 4861FA9012144B5300BBDEF1 /* PBXTextBookmark */; - 4861FA9112144B5300BBDEF1 = 4861FA9112144B5300BBDEF1 /* PBXTextBookmark */; - 4861FA9212144B5300BBDEF1 = 4861FA9212144B5300BBDEF1 /* PBXTextBookmark */; - 4861FA9312144B5300BBDEF1 = 4861FA9312144B5300BBDEF1 /* PBXTextBookmark */; - 487EA7431217260D00315F97 = 487EA7431217260D00315F97 /* PBXTextBookmark */; - 48821E15120DF1150008EE50 = 48821E15120DF1150008EE50 /* PBXTextBookmark */; - 48821E16120DF1150008EE50 = 48821E16120DF1150008EE50 /* PBXTextBookmark */; - 4890A5541205C1FF00452753 = 4890A5541205C1FF00452753 /* PBXTextBookmark */; - 4890A5751205D04300452753 = 4890A5751205D04300452753 /* PBXTextBookmark */; - 4890A5761205D04300452753 = 4890A5761205D04300452753 /* PBXTextBookmark */; - 4890A5D41205D58300452753 = 4890A5D41205D58300452753 /* PBXTextBookmark */; - 4890A5D51205D58300452753 = 4890A5D51205D58300452753 /* PBXTextBookmark */; - 4890A5DC1205D59F00452753 = 4890A5DC1205D59F00452753 /* PBXTextBookmark */; - 4890A5FD1205EA8A00452753 = 4890A5FD1205EA8A00452753 /* PlistBookmark */; - 48A31026124397BF008F2B35 /* PlistBookmark */ = 48A31026124397BF008F2B35 /* PlistBookmark */; - 48A31027124397BF008F2B35 /* PlistBookmark */ = 48A31027124397BF008F2B35 /* PlistBookmark */; + 48028D3E12156C670018F743 /* PBXTextBookmark */ = 48028D3E12156C670018F743 /* PBXTextBookmark */; + 480BB3A212174CA900939117 /* PBXTextBookmark */ = 480BB3A212174CA900939117 /* PBXTextBookmark */; + 480BB3A312174CA900939117 /* PBXTextBookmark */ = 480BB3A312174CA900939117 /* PBXTextBookmark */; + 48134A1C12102F680015BF15 /* PBXTextBookmark */ = 48134A1C12102F680015BF15 /* PBXTextBookmark */; + 48134A1D12102F680015BF15 /* PBXTextBookmark */ = 48134A1D12102F680015BF15 /* PBXTextBookmark */; + 48134A1E12102F680015BF15 /* PBXTextBookmark */ = 48134A1E12102F680015BF15 /* PBXTextBookmark */; + 4861FA9012144B5300BBDEF1 /* PBXTextBookmark */ = 4861FA9012144B5300BBDEF1 /* PBXTextBookmark */; + 4861FA9212144B5300BBDEF1 /* PBXTextBookmark */ = 4861FA9212144B5300BBDEF1 /* PBXTextBookmark */; + 4861FA9312144B5300BBDEF1 /* PBXTextBookmark */ = 4861FA9312144B5300BBDEF1 /* PBXTextBookmark */; + 48821E16120DF1150008EE50 /* PBXTextBookmark */ = 48821E16120DF1150008EE50 /* PBXTextBookmark */; + 4890A5541205C1FF00452753 /* PBXTextBookmark */ = 4890A5541205C1FF00452753 /* PBXTextBookmark */; + 4890A5751205D04300452753 /* PBXTextBookmark */ = 4890A5751205D04300452753 /* PBXTextBookmark */; + 4890A5D51205D58300452753 /* PBXTextBookmark */ = 4890A5D51205D58300452753 /* PBXTextBookmark */; 48A3103112439B10008F2B35 /* PBXTextBookmark */ = 48A3103112439B10008F2B35 /* PBXTextBookmark */; - 48A3103212439B10008F2B35 /* PBXTextBookmark */ = 48A3103212439B10008F2B35 /* PBXTextBookmark */; - 48A3103312439B10008F2B35 /* PlistBookmark */ = 48A3103312439B10008F2B35 /* PlistBookmark */; - 48A3103412439B10008F2B35 /* PlistBookmark */ = 48A3103412439B10008F2B35 /* PlistBookmark */; - 48FA259F12437B9B00667668 = 48FA259F12437B9B00667668 /* PBXTextBookmark */; - 48FA25A012437B9B00667668 = 48FA25A012437B9B00667668 /* PlistBookmark */; - 48FA25A112437B9B00667668 = 48FA25A112437B9B00667668 /* PlistBookmark */; + 48A3105612439F29008F2B35 /* PBXTextBookmark */ = 48A3105612439F29008F2B35 /* PBXTextBookmark */; + 48ADA34D12448DC4008DB120 /* PBXTextBookmark */ = 48ADA34D12448DC4008DB120 /* PBXTextBookmark */; + 48ADA38012448FF7008DB120 /* PBXTextBookmark */ = 48ADA38012448FF7008DB120 /* PBXTextBookmark */; + 48ADA38A124490B6008DB120 /* PBXTextBookmark */ = 48ADA38A124490B6008DB120 /* PBXTextBookmark */; + 48ADA38F12449225008DB120 /* PBXTextBookmark */ = 48ADA38F12449225008DB120 /* PBXTextBookmark */; + 48ADA39012449225008DB120 /* PBXTextBookmark */ = 48ADA39012449225008DB120 /* PBXTextBookmark */; + 48ADA3A512449534008DB120 /* PBXTextBookmark */ = 48ADA3A512449534008DB120 /* PBXTextBookmark */; + 48ADA3A612449534008DB120 /* PBXTextBookmark */ = 48ADA3A612449534008DB120 /* PBXTextBookmark */; + 48ADA3A712449534008DB120 /* PBXTextBookmark */ = 48ADA3A712449534008DB120 /* PBXTextBookmark */; + 48ADA3A812449534008DB120 /* PBXTextBookmark */ = 48ADA3A812449534008DB120 /* PBXTextBookmark */; + 48ADA3A912449534008DB120 /* PBXTextBookmark */ = 48ADA3A912449534008DB120 /* PBXTextBookmark */; + 48ADA3C612449625008DB120 /* PBXTextBookmark */ = 48ADA3C612449625008DB120 /* PBXTextBookmark */; + 48ADA3CC12449638008DB120 /* PBXTextBookmark */ = 48ADA3CC12449638008DB120 /* PBXTextBookmark */; + 48ADA3D512449A40008DB120 /* PBXTextBookmark */ = 48ADA3D512449A40008DB120 /* PBXTextBookmark */; + 48ADA3DA12449A40008DB120 /* PBXTextBookmark */ = 48ADA3DA12449A40008DB120 /* PBXTextBookmark */; + 48ADA3EB12449C30008DB120 /* PBXTextBookmark */ = 48ADA3EB12449C30008DB120 /* PBXTextBookmark */; + 48ADA3EC12449C30008DB120 /* PBXTextBookmark */ = 48ADA3EC12449C30008DB120 /* PBXTextBookmark */; + 48ADA3ED12449C30008DB120 /* PBXTextBookmark */ = 48ADA3ED12449C30008DB120 /* PBXTextBookmark */; + 48ADA3F812449CA0008DB120 /* PBXTextBookmark */ = 48ADA3F812449CA0008DB120 /* PBXTextBookmark */; + 48ADA40112449D39008DB120 /* PBXTextBookmark */ = 48ADA40112449D39008DB120 /* PBXTextBookmark */; + 48ADA40C12449DAE008DB120 /* PlistBookmark */ = 48ADA40C12449DAE008DB120 /* PlistBookmark */; + 48ADA40D12449DAE008DB120 /* PlistBookmark */ = 48ADA40D12449DAE008DB120 /* PlistBookmark */; + 48ADECCB1243E81B000AF19C /* PBXTextBookmark */ = 48ADECCB1243E81B000AF19C /* PBXTextBookmark */; + 48F89F411243A3BA00EB68FB /* PBXTextBookmark */ = 48F89F411243A3BA00EB68FB /* PBXTextBookmark */; + 48F89F611243AD1E00EB68FB /* PBXTextBookmark */ = 48F89F611243AD1E00EB68FB /* PBXTextBookmark */; }; sourceControlManager = 4847CD5312057F2A000B560F /* Source Control */; userBuildSettings = { @@ -158,20 +169,6 @@ vrLen = 1405; vrLoc = 2734; }; - 480BB3A412174CA900939117 /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 48B9E7A60D340BEA0001CACF /* AppController.m */; - }; - 480BB3B4121750BB00939117 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 48B9E7A60D340BEA0001CACF /* AppController.m */; - name = "AppController.m: 133"; - rLen = 0; - rLoc = 4329; - rType = 0; - vrLen = 1646; - vrLoc = 3495; - }; 48134A1412102F400015BF15 /* net_bsd.c */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1408, 1157}}"; @@ -230,12 +227,26 @@ sepNavVisRange = "{1109, 1050}"; }; }; + 4830B79E0D464CAE00EF4498 /* Todo.txt */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1335, 364}}"; + sepNavSelRange = "{980, 0}"; + sepNavVisRange = "{0, 980}"; + }; + }; 4834895F120598A7004184BC /* appcast.xml */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1648, 661}}"; - sepNavSelRange = "{899, 0}"; - sepNavVisRange = "{0, 899}"; - sepNavWindowFrame = "{{15, 465}, {750, 558}}"; + sepNavIntBoundsRect = "{{0, 0}, {1142, 364}}"; + sepNavSelRange = "{801, 0}"; + sepNavVisRange = "{0, 970}"; + sepNavWindowFrame = "{{9, 298}, {750, 558}}"; + }; + }; + 483A78130D2EEA5400CB2E4C /* console.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1343, 16809}}"; + sepNavSelRange = "{14231, 0}"; + sepNavVisRange = "{13841, 810}"; }; }; 483A781D0D2EEA5400CB2E4C /* sbar.c */ = { @@ -326,16 +337,6 @@ vrLen = 805; vrLoc = 0; }; - 4861FA9112144B5300BBDEF1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 48B9E7A50D340BEA0001CACF /* AppController.h */; - name = "AppController.h: 39"; - rLen = 0; - rLoc = 1200; - rType = 0; - vrLen = 818; - vrLoc = 518; - }; 4861FA9212144B5300BBDEF1 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 48FE58590D3A82C8006BB491 /* QuakeArguments.h */; @@ -370,34 +371,6 @@ sepNavVisRange = "{283, 1137}"; }; }; - 487C0A5B0DA94A0700A49FF5 /* net_sdlnet.c */ = { - isa = PBXFileReference; - fileEncoding = 4; - lastKnownFileType = sourcecode.c.c; - name = net_sdlnet.c; - path = /Users/kristian/Documents/Code/XCode/QuakeSpasm/Quake/net_sdlnet.c; - sourceTree = ""; - }; - 487EA7431217260D00315F97 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4834895F120598A7004184BC /* appcast.xml */; - name = "appcast.xml: 17"; - rLen = 0; - rLoc = 899; - rType = 0; - vrLen = 919; - vrLoc = 0; - }; - 48821E15120DF1150008EE50 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 487C0A5B0DA94A0700A49FF5 /* net_sdlnet.c */; - name = "net_sdlnet.c: 363"; - rLen = 0; - rLoc = 7706; - rType = 0; - vrLen = 789; - vrLoc = 7487; - }; 48821E16120DF1150008EE50 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 48728D280D3004A70004D61B /* net_dgrm.c */; @@ -410,16 +383,16 @@ }; 4890A4601205A27B00452753 /* SUUpdaterDelegate.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1374, 570}}"; - sepNavSelRange = "{1051, 0}"; - sepNavVisRange = "{0, 1195}"; + sepNavIntBoundsRect = "{{0, 0}, {1142, 455}}"; + sepNavSelRange = "{767, 28}"; + sepNavVisRange = "{289, 906}"; }; }; 4890A4611205A27B00452753 /* SUUpdaterDelegate.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1619, 858}}"; - sepNavSelRange = "{2035, 0}"; - sepNavVisRange = "{270, 480}"; + sepNavIntBoundsRect = "{{0, 0}, {1142, 884}}"; + sepNavSelRange = "{1546, 0}"; + sepNavVisRange = "{1271, 851}"; }; }; 4890A5541205C1FF00452753 /* PBXTextBookmark */ = { @@ -442,19 +415,9 @@ vrLen = 1132; vrLoc = 0; }; - 4890A5761205D04300452753 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4890A4601205A27B00452753 /* SUUpdaterDelegate.h */; - name = "SUUpdaterDelegate.h: 29"; - rLen = 0; - rLoc = 1051; - rType = 0; - vrLen = 1195; - vrLoc = 0; - }; 4890A5D01205D55700452753 /* UpdateButton.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1374, 547}}"; + sepNavIntBoundsRect = "{{0, 0}, {1142, 364}}"; sepNavSelRange = "{210, 0}"; sepNavVisRange = "{0, 218}"; }; @@ -466,16 +429,6 @@ sepNavVisRange = "{0, 312}"; }; }; - 4890A5D41205D58300452753 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4890A4611205A27B00452753 /* SUUpdaterDelegate.m */; - name = "SUUpdaterDelegate.m: 44"; - rLen = 0; - rLoc = 1546; - rType = 0; - vrLen = 1313; - vrLoc = 809; - }; 4890A5D51205D58300452753 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 4890A5D11205D55700452753 /* UpdateButton.m */; @@ -486,16 +439,6 @@ vrLen = 312; vrLoc = 0; }; - 4890A5DC1205D59F00452753 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4890A5D01205D55700452753 /* UpdateButton.h */; - name = "UpdateButton.h: 14"; - rLen = 0; - rLoc = 210; - rType = 0; - vrLen = 218; - vrLoc = 0; - }; 4890A5E61205D6D400452753 /* rnotes.css */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1648, 2821}}"; @@ -505,44 +448,12 @@ }; 4890A5E71205D6D400452753 /* rnotes.html */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {908, 642}}"; + sepNavIntBoundsRect = "{{0, 0}, {1617, 655}}"; sepNavSelRange = "{1183, 0}"; sepNavVisRange = "{0, 1260}"; + sepNavWindowFrame = "{{15, 103}, {1368, 950}}"; }; }; - 4890A5FD1205EA8A00452753 /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 8D1107310486CEB800E47090 /* Info.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - ); - name = /Users/kristian/Documents/Code/XCode/QuakeSpasm/MacOSX/Info.plist; - rLen = 0; - rLoc = 9223372036854775808; - }; - 48A31026124397BF008F2B35 /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 8D1107310486CEB800E47090 /* Info.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - ); - name = /Users/kristian/Dropbox/Dokumente/Code/XCode/QuakeSpasm/MacOSX/Info.plist; - rLen = 0; - rLoc = 9223372036854775807; - }; - 48A31027124397BF008F2B35 /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 8D1107310486CEB800E47090 /* Info.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - ); - name = /Users/kristian/Dropbox/Dokumente/Code/XCode/QuakeSpasm/MacOSX/Info.plist; - rLen = 0; - rLoc = 9223372036854775807; - }; 48A3103112439B10008F2B35 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 4890A5E61205D6D400452753 /* rnotes.css */; @@ -553,7 +464,7 @@ vrLen = 687; vrLoc = 2660; }; - 48A3103212439B10008F2B35 /* PBXTextBookmark */ = { + 48A3105612439F29008F2B35 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 4890A5E71205D6D400452753 /* rnotes.html */; name = "rnotes.html: 30"; @@ -563,41 +474,405 @@ vrLen = 1260; vrLoc = 0; }; - 48A3103312439B10008F2B35 /* PlistBookmark */ = { + 48ADA34D12448DC4008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 48ADA34E12448DC4008DB120 /* SUAppcast.h */; + name = "SUAppcast.h: 20"; + rLen = 0; + rLoc = 342; + rType = 0; + vrLen = 536; + vrLoc = 132; + }; + 48ADA34E12448DC4008DB120 /* SUAppcast.h */ = { + isa = PBXFileReference; + name = SUAppcast.h; + path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/build/Debug/Sparkle.framework/Headers/SUAppcast.h"; + sourceTree = ""; + }; + 48ADA35112448DC4008DB120 /* SUUpdater.h */ = { + isa = PBXFileReference; + name = SUUpdater.h; + path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/build/Debug/Sparkle.framework/Headers/SUUpdater.h"; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1608, 1690}}"; + sepNavSelRange = "{1227, 0}"; + sepNavVisRange = "{0, 561}"; + }; + }; + 48ADA38012448FF7008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 48ADA38112448FF7008DB120 /* SUUpdateDriver.m */; + name = "SUUpdateDriver.m: 16"; + rLen = 0; + rLoc = 317; + rType = 0; + vrLen = 387; + vrLoc = 168; + }; + 48ADA38112448FF7008DB120 /* SUUpdateDriver.m */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + name = SUUpdateDriver.m; + path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/SUUpdateDriver.m"; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1379, 546}}"; + sepNavSelRange = "{557, 0}"; + sepNavVisRange = "{0, 628}"; + }; + }; + 48ADA38312448FF7008DB120 /* SUUpdater.m */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + name = SUUpdater.m; + path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/SUUpdater.m"; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1475, 5252}}"; + sepNavSelRange = "{6323, 0}"; + sepNavVisRange = "{5744, 1198}"; + }; + }; + 48ADA38612448FF7008DB120 /* SUUserInitiatedUpdateDriver.m */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + name = SUUserInitiatedUpdateDriver.m; + path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/SUUserInitiatedUpdateDriver.m"; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1142, 1014}}"; + sepNavSelRange = "{388, 0}"; + sepNavVisRange = "{194, 997}"; + }; + }; + 48ADA38A124490B6008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 48ADA38B124490B6008DB120 /* SUStatusController.m */; + name = "SUStatusController.m: 55"; + rLen = 0; + rLoc = 1115; + rType = 0; + vrLen = 798; + vrLoc = 764; + }; + 48ADA38B124490B6008DB120 /* SUStatusController.m */ = { + isa = PBXFileReference; + name = SUStatusController.m; + path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/SUStatusController.m"; + sourceTree = ""; + }; + 48ADA38F12449225008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 48ADA38612448FF7008DB120 /* SUUserInitiatedUpdateDriver.m */; + name = "SUUserInitiatedUpdateDriver.m: 18"; + rLen = 0; + rLoc = 388; + rType = 0; + vrLen = 997; + vrLoc = 194; + }; + 48ADA39012449225008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 48ADA38312448FF7008DB120 /* SUUpdater.m */; + name = "SUUpdater.m: 197"; + rLen = 0; + rLoc = 7012; + rType = 0; + vrLen = 1514; + vrLoc = 6433; + }; + 48ADA397124492A8008DB120 /* SUDebugUpdateDriver.m */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.objc; + name = SUDebugUpdateDriver.m; + path = /Users/kristian/Dropbox/Dokumente/Code/XCode/QuakeSpasm/MacOSX/SUDebugUpdateDriver.m; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1142, 364}}"; + sepNavSelRange = "{298, 0}"; + sepNavVisRange = "{0, 306}"; + }; + }; + 48ADA3991244932E008DB120 /* SUDebugUpdateDriver.m:15 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + countType = 0; + delayBeforeContinue = 0; + fileReference = 48ADA397124492A8008DB120 /* SUDebugUpdateDriver.m */; + functionName = "-downloadDidFinish:"; + hitCount = 0; + ignoreCount = 0; + lineNumber = 15; + modificationTime = 306486552.016536; + originalNumberOfMultipleMatches = 0; + state = 1; + }; + 48ADA3A512449534008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4890A4611205A27B00452753 /* SUUpdaterDelegate.m */; + name = "SUUpdaterDelegate.m: 44"; + rLen = 0; + rLoc = 1546; + rType = 0; + vrLen = 851; + vrLoc = 1271; + }; + 48ADA3A612449534008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4890A5D01205D55700452753 /* UpdateButton.h */; + name = "UpdateButton.h: 14"; + rLen = 0; + rLoc = 210; + rType = 0; + vrLen = 218; + vrLoc = 0; + }; + 48ADA3A712449534008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4890A4601205A27B00452753 /* SUUpdaterDelegate.h */; + name = "SUUpdaterDelegate.h: 21"; + rLen = 28; + rLoc = 767; + rType = 0; + vrLen = 906; + vrLoc = 289; + }; + 48ADA3A812449534008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 48ADA35112448DC4008DB120 /* SUUpdater.h */; + name = "SUUpdater.h: 47"; + rLen = 0; + rLoc = 1227; + rType = 0; + vrLen = 561; + vrLoc = 0; + }; + 48ADA3A912449534008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 48ADA3AA12449534008DB120 /* Sparkle.h */; + name = "Sparkle.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 536; + vrLoc = 0; + }; + 48ADA3AA12449534008DB120 /* Sparkle.h */ = { + isa = PBXFileReference; + name = Sparkle.h; + path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/build/Debug/Sparkle.framework/Headers/Sparkle.h"; + sourceTree = ""; + }; + 48ADA3B412449571008DB120 /* SUUpdateDriver.m:25 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + countType = 0; + delayBeforeContinue = 0; + fileReference = 48ADA38112448FF7008DB120 /* SUUpdateDriver.m */; + functionName = "-checkForUpdatesAtURL:host:"; + hitCount = 0; + ignoreCount = 0; + lineNumber = 25; + location = Sparkle; + modificationTime = 306486552.017102; + originalNumberOfMultipleMatches = 1; + state = 0; + }; + 48ADA3C612449625008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 48ADA3C712449625008DB120 /* SUBasicUpdateDriver.m */; + name = "SUBasicUpdateDriver.m: 162"; + rLen = 0; + rLoc = 6948; + rType = 0; + vrLen = 1607; + vrLoc = 5995; + }; + 48ADA3C712449625008DB120 /* SUBasicUpdateDriver.m */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + name = SUBasicUpdateDriver.m; + path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/SUBasicUpdateDriver.m"; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {3120, 4043}}"; + sepNavSelRange = "{6948, 0}"; + sepNavVisRange = "{6297, 1967}"; + }; + }; + 48ADA3CA12449625008DB120 /* SUHost.m */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + name = SUHost.m; + path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/SUHost.m"; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1379, 3081}}"; + sepNavSelRange = "{3067, 0}"; + sepNavVisRange = "{2482, 999}"; + }; + }; + 48ADA3CC12449638008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 48ADA3CA12449625008DB120 /* SUHost.m */; + name = "SUHost.m: 108"; + rLen = 0; + rLoc = 3130; + rType = 0; + vrLen = 969; + vrLoc = 2482; + }; + 48ADA3D512449A40008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 48ADA3D612449A40008DB120 /* SUDSAVerifier.h */; + name = "SUDSAVerifier.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 400; + vrLoc = 0; + }; + 48ADA3D612449A40008DB120 /* SUDSAVerifier.h */ = { + isa = PBXFileReference; + name = SUDSAVerifier.h; + path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/SUDSAVerifier.h"; + sourceTree = ""; + }; + 48ADA3DA12449A40008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 48ADA3DB12449A40008DB120 /* SUAppcastItem.m */; + name = "SUAppcastItem.m: 56"; + rLen = 0; + rLoc = 1135; + rType = 0; + vrLen = 784; + vrLoc = 735; + }; + 48ADA3DB12449A40008DB120 /* SUAppcastItem.m */ = { + isa = PBXFileReference; + name = SUAppcastItem.m; + path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/SUAppcastItem.m"; + sourceTree = ""; + }; + 48ADA3DE12449A40008DB120 /* SUDSAVerifier.m */ = { + isa = PBXFileReference; + name = SUDSAVerifier.m; + path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/SUDSAVerifier.m"; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1379, 2015}}"; + sepNavSelRange = "{4376, 15}"; + sepNavVisRange = "{3536, 959}"; + }; + }; + 48ADA3EB12449C30008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 48ADA3DE12449A40008DB120 /* SUDSAVerifier.m */; + name = "SUDSAVerifier.m: 143"; + rLen = 15; + rLoc = 4376; + rType = 0; + vrLen = 954; + vrLoc = 3536; + }; + 48ADA3EC12449C30008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4830B79E0D464CAE00EF4498 /* Todo.txt */; + name = "Todo.txt: 15"; + rLen = 0; + rLoc = 980; + rType = 0; + vrLen = 980; + vrLoc = 0; + }; + 48ADA3ED12449C30008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4834895F120598A7004184BC /* appcast.xml */; + name = "appcast.xml: 16"; + rLen = 0; + rLoc = 801; + rType = 0; + vrLen = 970; + vrLoc = 0; + }; + 48ADA3F812449CA0008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 48B9E7A50D340BEA0001CACF /* AppController.h */; + name = "AppController.h: 42"; + rLen = 0; + rLoc = 1308; + rType = 0; + vrLen = 620; + vrLoc = 721; + }; + 48ADA40112449D39008DB120 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 48B9E7A60D340BEA0001CACF /* AppController.m */; + name = "AppController.m: 118"; + rLen = 0; + rLoc = 3648; + rType = 0; + vrLen = 1011; + vrLoc = 2487; + }; + 48ADA40C12449DAE008DB120 /* PlistBookmark */ = { isa = PlistBookmark; fRef = 8D1107310486CEB800E47090 /* Info.plist */; fallbackIsa = PBXBookmark; isK = 0; kPath = ( + NSMainNibFile, + ); + name = /Users/kristian/Dropbox/Dokumente/Code/XCode/QuakeSpasm/MacOSX/Info.plist; + rLen = 8; + rLoc = 0; + }; + 48ADA40D12449DAE008DB120 /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 8D1107310486CEB800E47090 /* Info.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + NSMainNibFile, ); name = /Users/kristian/Dropbox/Dokumente/Code/XCode/QuakeSpasm/MacOSX/Info.plist; rLen = 0; rLoc = 9223372036854775807; }; - 48A3103412439B10008F2B35 /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 8D1107310486CEB800E47090 /* Info.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - CFBundleVersion, - ); - name = /Users/kristian/Dropbox/Dokumente/Code/XCode/QuakeSpasm/MacOSX/Info.plist; + 48ADEC8E1243D946000AF19C /* Distribution */ = { + activeExec = 0; + }; + 48ADECCB1243E81B000AF19C /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 483A78130D2EEA5400CB2E4C /* console.c */; + name = "console.c: 685"; rLen = 0; - rLoc = 9223372036854775807; + rLoc = 14231; + rType = 0; + vrLen = 810; + vrLoc = 13841; }; 48B9E7A50D340BEA0001CACF /* AppController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1408, 598}}"; - sepNavSelRange = "{1200, 0}"; - sepNavVisRange = "{518, 818}"; + sepNavIntBoundsRect = "{{0, 0}, {1142, 598}}"; + sepNavSelRange = "{1308, 0}"; + sepNavVisRange = "{721, 620}"; }; }; 48B9E7A60D340BEA0001CACF /* AppController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1648, 2288}}"; - sepNavSelRange = "{4329, 0}"; - sepNavVisRange = "{3498, 1874}"; + sepNavIntBoundsRect = "{{0, 0}, {1142, 2353}}"; + sepNavSelRange = "{3648, 0}"; + sepNavVisRange = "{2487, 1011}"; }; }; 48B9E7BE0D340EA80001CACF /* SDLApplication.h */ = { @@ -614,37 +889,32 @@ sepNavVisRange = "{0, 1132}"; }; }; - 48FA259F12437B9B00667668 /* PBXTextBookmark */ = { + 48F89F411243A3BA00EB68FB /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 48B9E7A60D340BEA0001CACF /* AppController.m */; - name = "AppController.m: 133"; + fRef = 089C165DFE840E0CC02AAC07 /* English */; + name = "InfoPlist.strings: 5"; rLen = 0; - rLoc = 4329; + rLoc = 182; rType = 0; - vrLen = 1874; - vrLoc = 3498; + vrLen = 294; + vrLoc = 0; }; - 48FA25A012437B9B00667668 /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 8D1107310486CEB800E47090 /* Info.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - ); - name = /Users/kristian/Dropbox/Dokumente/Code/XCode/QuakeSpasm/MacOSX/Info.plist; + 48F89F611243AD1E00EB68FB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 48FA25B612437EAB00667668 /* dsa_pub.pem */; + name = "dsa_pub.pem: 1"; rLen = 0; - rLoc = 9223372036854775808; + rLoc = 0; + rType = 0; + vrLen = 1194; + vrLoc = 0; }; - 48FA25A112437B9B00667668 /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 8D1107310486CEB800E47090 /* Info.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - ); - name = /Users/kristian/Dropbox/Dokumente/Code/XCode/QuakeSpasm/MacOSX/Info.plist; - rLen = 0; - rLoc = 9223372036854775808; + 48FA25B612437EAB00667668 /* dsa_pub.pem */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1617, 650}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1194}"; + }; }; 48FE58590D3A82C8006BB491 /* QuakeArguments.h */ = { uiCtxt = { diff --git a/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3 b/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3 index 45489258..d94e5b92 100644 --- a/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3 +++ b/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3 @@ -200,8 +200,8 @@ PerspectiveWidths - 1680 - 1680 + 1440 + 1440 Perspectives @@ -214,7 +214,7 @@ action NSToolbarFlexibleSpaceItem debugger-enable-breakpoints - build + buildOrClean go com.apple.ide.PBXToolbarStopButton get-info @@ -256,7 +256,7 @@ PBXSmartGroupTreeModuleColumnWidthsKey - 220 + 215 PBXSmartGroupTreeModuleColumnsKey_v4 @@ -273,19 +273,25 @@ 483A77DC0D2EE8ED00CB2E4C 29B97317FDCFA39411CA2CEA 4890A5EA1205D6ED00452753 + 29B97323FDCFA39411CA2CEA + 1058C7A0FEA54F0111CA2CBB + 48348942120595B1004184BC 19C28FACFE9D520D11CA2CBB + 1C37FBAC04509CD000000102 1C37FAAC04509CD000000102 + 1CC0EA4004350EF90041110B PBXSmartGroupTreeModuleOutlineStateSelectionKey - 39 - 31 + 43 + 42 + 41 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {220, 869}} + {{0, 305}, {215, 697}} PBXTopSmartGroupGIDs @@ -295,19 +301,19 @@ GeometryConfiguration Frame - {{0, 0}, {237, 887}} + {{0, 0}, {232, 715}} GroupTreeTableConfiguration MainColumn - 220 + 215 RubberWindowFrame - 0 130 964 928 0 0 1920 1058 + 0 122 1440 756 0 0 1440 878 Module PBXSmartGroupTreeModule Proportion - 237pt + 232pt Dock @@ -330,31 +336,47 @@ _historyCapacity 0 bookmark - 48A3103412439B10008F2B35 + 48ADA40D12449DAE008DB120 history 4890A5541205C1FF00452753 4890A5751205D04300452753 - 4890A5761205D04300452753 - 4890A5D41205D58300452753 4890A5D51205D58300452753 - 4890A5DC1205D59F00452753 48821E16120DF1150008EE50 48134A1C12102F680015BF15 48134A1D12102F680015BF15 48134A1E12102F680015BF15 4861FA9012144B5300BBDEF1 - 4861FA9112144B5300BBDEF1 4861FA9212144B5300BBDEF1 4861FA9312144B5300BBDEF1 48028D3E12156C670018F743 - 487EA7431217260D00315F97 480BB3A212174CA900939117 480BB3A312174CA900939117 - 48FA259F12437B9B00667668 48A3103112439B10008F2B35 - 48A3103212439B10008F2B35 - 48A3103312439B10008F2B35 + 48A3105612439F29008F2B35 + 48F89F411243A3BA00EB68FB + 48F89F611243AD1E00EB68FB + 48ADECCB1243E81B000AF19C + 48ADA34D12448DC4008DB120 + 48ADA38012448FF7008DB120 + 48ADA38A124490B6008DB120 + 48ADA38F12449225008DB120 + 48ADA39012449225008DB120 + 48ADA3A512449534008DB120 + 48ADA3A612449534008DB120 + 48ADA3A712449534008DB120 + 48ADA3A812449534008DB120 + 48ADA3A912449534008DB120 + 48ADA3C612449625008DB120 + 48ADA3CC12449638008DB120 + 48ADA3D512449A40008DB120 + 48ADA3DA12449A40008DB120 + 48ADA3EB12449C30008DB120 + 48ADA3EC12449C30008DB120 + 48ADA3ED12449C30008DB120 + 48ADA3F812449CA0008DB120 + 48ADA40112449D39008DB120 + 48ADA40C12449DAE008DB120 SplitCount @@ -368,18 +390,18 @@ GeometryConfiguration Frame - {{0, 0}, {722, 674}} + {{0, 0}, {1203, 396}} RubberWindowFrame - 0 130 964 928 0 0 1920 1058 + 0 122 1440 756 0 0 1440 878 Module PBXNavigatorGroup Proportion - 674pt + 396pt Proportion - 208pt + 314pt Tabs @@ -393,7 +415,7 @@ GeometryConfiguration Frame - {{10, 27}, {722, 181}} + {{10, 27}, {1203, 287}} Module XCDetailModule @@ -447,9 +469,9 @@ GeometryConfiguration Frame - {{10, 27}, {722, 181}} + {{10, 27}, {1203, 287}} RubberWindowFrame - 0 130 964 928 0 0 1920 1058 + 0 122 1440 756 0 0 1440 878 Module PBXBuildResultsModule @@ -458,7 +480,7 @@ Proportion - 722pt + 1203pt Name @@ -477,11 +499,11 @@ TableOfContents - 48A31028124397BF008F2B35 + 48ADA2E612448697008DB120 1CA23ED40692098700951B8B - 48A31029124397BF008F2B35 + 48ADA2E712448697008DB120 4890A4C11205A7AE00452753 - 48A3102A124397BF008F2B35 + 48ADA2E812448697008DB120 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -500,7 +522,7 @@ active-combo-popup NSToolbarFlexibleSpaceItem debugger-enable-breakpoints - build + build-and-go go com.apple.ide.PBXToolbarStopButton debugger-restart-executable @@ -533,12 +555,12 @@ GeometryConfiguration Frame - {{0, 0}, {1680, 417}} + {{0, 0}, {1440, 116}} Module PBXDebugCLIModule Proportion - 417pt + 116pt ContentConfiguration @@ -557,8 +579,8 @@ yes sizes - {{0, 0}, {819, 215}} - {{819, 0}, {861, 215}} + {{0, 0}, {718, 180}} + {{718, 0}, {722, 180}} VerticalSplitView @@ -573,8 +595,8 @@ yes sizes - {{0, 0}, {1680, 215}} - {{0, 215}, {1680, 228}} + {{0, 0}, {1440, 180}} + {{0, 180}, {1440, 414}} @@ -594,7 +616,7 @@ DebugSTDIOWindowFrame {{200, 200}, {500, 300}} Frame - {{0, 422}, {1680, 443}} + {{0, 121}, {1440, 594}} PBXDebugSessionStackFrameViewKey DebugVariablesTableConfiguration @@ -604,16 +626,16 @@ Value 85 Summary - 631 + 492 Frame - {{819, 0}, {861, 215}} + {{718, 0}, {722, 180}} Module PBXDebugSessionModule Proportion - 443pt + 594pt Name @@ -631,14 +653,14 @@ TableOfContents - 48A3103512439B10008F2B35 + 48ADA37212448F36008DB120 1CCC7628064C1048000F2A68 1CCC7629064C1048000F2A68 - 48A3103612439B10008F2B35 - 48A3103712439B10008F2B35 - 48A3103812439B10008F2B35 - 48A3103912439B10008F2B35 - 48A3103A12439B10008F2B35 + 48ADA37312448F36008DB120 + 48ADA37412448F36008DB120 + 48ADA37512448F36008DB120 + 48ADA37612448F36008DB120 + 4890A4C11205A7AE00452753 ToolbarConfigUserDefaultsMinorVersion 2 @@ -672,10 +694,13 @@ 5 WindowOrderList + 48ADA3AF12449534008DB120 + 48ADA37812448F36008DB120 + 48ADA37912448F36008DB120 /Users/kristian/Dropbox/Dokumente/Code/XCode/QuakeSpasm/MacOSX/QuakeSpasm.xcodeproj WindowString - 0 130 964 928 0 0 1920 1058 + 0 122 1440 756 0 0 1440 878 WindowToolsV3 @@ -1460,33 +1485,40 @@ 597 125 616 374 0 0 1280 1002 + FirstTimeWindowDisplayed + Identifier windowTool.refactoring IncludeInToolsMenu 0 + IsVertical + Layout Dock - BecomeActive - 1 + ContentConfiguration + + PBXProjectModuleGUID + 48ADA3AE12449534008DB120 + GeometryConfiguration Frame - {0, 0}, {500, 335} + {{0, 0}, {500, 315}} RubberWindowFrame - {0, 0}, {500, 335} + 21 499 500 356 0 0 1440 878 Module XCRefactoringModule Proportion - 100% + 315pt Proportion - 100% + 315pt Name @@ -1495,8 +1527,20 @@ XCRefactoringModule + StatusbarIsVisible + + TableOfContents + + 48ADA3AF12449534008DB120 + 48ADA3B012449534008DB120 + 48ADA3AE12449534008DB120 + WindowString - 200 200 500 356 0 0 1920 1200 + 21 499 500 356 0 0 1440 878 + WindowToolGUID + 48ADA3AF12449534008DB120 + WindowToolIsVisible + diff --git a/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj b/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj index 7cfffff3..41dcbf12 100644 --- a/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj +++ b/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj @@ -6,6 +6,21 @@ objectVersion = 42; objects = { +/* Begin PBXAggregateTarget section */ + 48ADEC8E1243D946000AF19C /* Distribution */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 48ADEC921243D94A000AF19C /* Build configuration list for PBXAggregateTarget "Distribution" */; + buildPhases = ( + 48ADEC8D1243D946000AF19C /* ShellScript */, + ); + dependencies = ( + 48ADECD61243E933000AF19C /* PBXTargetDependency */, + ); + name = Distribution; + productName = Distribution; + }; +/* End PBXAggregateTarget section */ + /* Begin PBXBuildFile section */ 002F39FA09D0881F00EBEB88 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F39F909D0881F00EBEB88 /* SDL.framework */; }; 002F3A0009D0884600EBEB88 /* SDL.framework in Copy Frameworks into .app bundle */ = {isa = PBXBuildFile; fileRef = 002F39F909D0881F00EBEB88 /* SDL.framework */; }; @@ -15,12 +30,8 @@ 48134A1812102F400015BF15 /* net_bsd.c in Sources */ = {isa = PBXBuildFile; fileRef = 48134A1412102F400015BF15 /* net_bsd.c */; }; 48134A1912102F400015BF15 /* net_udp.c in Sources */ = {isa = PBXBuildFile; fileRef = 48134A1612102F400015BF15 /* net_udp.c */; }; 48243B140D33F01A00C29F8F /* main_sdl.c in Sources */ = {isa = PBXBuildFile; fileRef = 48243B130D33F01A00C29F8F /* main_sdl.c */; }; - 4830B79F0D464CAE00EF4498 /* Changelog.txt in Resources */ = {isa = PBXBuildFile; fileRef = 4830B79D0D464CAE00EF4498 /* Changelog.txt */; }; - 4830B7A00D464CAE00EF4498 /* Todo.txt in Resources */ = {isa = PBXBuildFile; fileRef = 4830B79E0D464CAE00EF4498 /* Todo.txt */; }; 48348943120595B1004184BC /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48348942120595B1004184BC /* Sparkle.framework */; }; 4834894F120595E9004184BC /* Sparkle.framework in Copy Frameworks into .app bundle */ = {isa = PBXBuildFile; fileRef = 48348942120595B1004184BC /* Sparkle.framework */; }; - 48348960120598A7004184BC /* appcast.xml in Resources */ = {isa = PBXBuildFile; fileRef = 4834895F120598A7004184BC /* appcast.xml */; }; - 483A780F0D2EEA0F00CB2E4C /* progdefs.q1 in Resources */ = {isa = PBXBuildFile; fileRef = 483A780E0D2EEA0F00CB2E4C /* progdefs.q1 */; }; 483A78230D2EEA5400CB2E4C /* chase.c in Sources */ = {isa = PBXBuildFile; fileRef = 483A78100D2EEA5400CB2E4C /* chase.c */; }; 483A78240D2EEA5400CB2E4C /* cmd.c in Sources */ = {isa = PBXBuildFile; fileRef = 483A78110D2EEA5400CB2E4C /* cmd.c */; }; 483A78250D2EEA5400CB2E4C /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 483A78120D2EEA5400CB2E4C /* common.c */; }; @@ -83,8 +94,6 @@ 48895DB90D4914A000849ABF /* pl_osx.m in Sources */ = {isa = PBXBuildFile; fileRef = 48895DB80D4914A000849ABF /* pl_osx.m */; }; 4890A4621205A27B00452753 /* SUUpdaterDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4890A4611205A27B00452753 /* SUUpdaterDelegate.m */; }; 4890A5D21205D55700452753 /* UpdateButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 4890A5D11205D55700452753 /* UpdateButton.m */; }; - 4890A5E81205D6D400452753 /* rnotes.css in Resources */ = {isa = PBXBuildFile; fileRef = 4890A5E61205D6D400452753 /* rnotes.css */; }; - 4890A5E91205D6D400452753 /* rnotes.html in Resources */ = {isa = PBXBuildFile; fileRef = 4890A5E71205D6D400452753 /* rnotes.html */; }; 489D8D2F0D3A630D00AA4471 /* ScreenInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 489D8D2E0D3A630D00AA4471 /* ScreenInfo.m */; }; 48B9E7880D340B1E0001CACF /* Launcher.nib in Resources */ = {isa = PBXBuildFile; fileRef = 48B9E7860D340B1E0001CACF /* Launcher.nib */; }; 48B9E7A70D340BEA0001CACF /* AppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 48B9E7A60D340BEA0001CACF /* AppController.m */; }; @@ -96,6 +105,16 @@ 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 48ADECD51243E933000AF19C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 8D1107260486CEB800E47090; + remoteInfo = QuakeSpasm; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ 002F39FD09D0883400EBEB88 /* Copy Frameworks into .app bundle */ = { isa = PBXCopyFilesBuildPhase; @@ -309,6 +328,7 @@ 48243B060D33ED0A00C29F8F /* MacOSX */, 483A77D80D2EE8C500CB2E4C /* Quake */, 29B97317FDCFA39411CA2CEA /* Resources */, + 4890A5EA1205D6ED00452753 /* Sparkle */, 29B97323FDCFA39411CA2CEA /* Frameworks */, 19C28FACFE9D520D11CA2CBB /* Products */, 4830B79D0D464CAE00EF4498 /* Changelog.txt */, @@ -321,7 +341,6 @@ isa = PBXGroup; children = ( 48FA25B612437EAB00667668 /* dsa_pub.pem */, - 4890A5EA1205D6ED00452753 /* Sparkle */, 484AA4B30D3FF6C0005D917A /* QuakeSpasm.icns */, 48B9E7860D340B1E0001CACF /* Launcher.nib */, 8D1107310486CEB800E47090 /* Info.plist */, @@ -604,6 +623,7 @@ projectRoot = ""; targets = ( 8D1107260486CEB800E47090 /* QuakeSpasm */, + 48ADEC8E1243D946000AF19C /* Distribution */, ); }; /* End PBXProject section */ @@ -614,20 +634,30 @@ buildActionMask = 2147483647; files = ( 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */, - 483A780F0D2EEA0F00CB2E4C /* progdefs.q1 in Resources */, 48B9E7880D340B1E0001CACF /* Launcher.nib in Resources */, 484AA4B40D3FF6C0005D917A /* QuakeSpasm.icns in Resources */, - 4830B79F0D464CAE00EF4498 /* Changelog.txt in Resources */, - 4830B7A00D464CAE00EF4498 /* Todo.txt in Resources */, - 48348960120598A7004184BC /* appcast.xml in Resources */, - 4890A5E81205D6D400452753 /* rnotes.css in Resources */, - 4890A5E91205D6D400452753 /* rnotes.html in Resources */, 48FA25B712437EAB00667668 /* dsa_pub.pem in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 48ADEC8D1243D946000AF19C /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/bash; + shellScript = "set -o errexit\n\n[ $BUILD_STYLE = Release ] || { echo Distribution target requires \"'Release'\" build style; false; }\n\nVERSION=$(defaults read \"$BUILT_PRODUCTS_DIR/$PROJECT_NAME.app/Contents/Info\" CFBundleVersion)\nDOWNLOAD_BASE_URL=\"http://quakespasm.sourceforge.net/sparkle/\"\nRELEASENOTES_URL=\"http://quakespasm.sourceforge.net/sparkle/rnotes.html#version-$VERSION\"\n\nARCHIVE_FILENAME=\"$PROJECT_NAME $VERSION.zip\"\nDOWNLOAD_URL=\"$DOWNLOAD_BASE_URL/$ARCHIVE_FILENAME\"\nKEYCHAIN_PRIVKEY_NAME=\"QuakeSpasm Sparkle Private Key\"\n\nWD=$PWD\ncd \"$BUILT_PRODUCTS_DIR\"\nrm -f \"$PROJECT_NAME\"*.zip\nditto -ck --keepParent \"$PROJECT_NAME.app\" \"$ARCHIVE_FILENAME\"\n\nSIZE=$(stat -f %z \"$ARCHIVE_FILENAME\")\nPUBDATE=$(LC_TIME=en_US date +\"%a, %d %b %G %T %z\")\nSIGNATURE=$(\n\topenssl dgst -sha1 -binary < \"$ARCHIVE_FILENAME\" \\\n\t| openssl dgst -dss1 -sign <(security find-generic-password -g -s \"$KEYCHAIN_PRIVKEY_NAME\" 2>&1 1>/dev/null | perl -pe '($_) = /\"(.+)\"/; s/\\\\012/\\n/g' | perl -MXML::LibXML -e 'print XML::LibXML->new()->parse_file(\"-\")->findvalue(q(//string[preceding-sibling::key[1] = \"NOTE\"]))') \\\n\t| openssl enc -base64 -A\n)\n[ $SIGNATURE ] || { echo Unable to load signing private key with name \"'$KEYCHAIN_PRIVKEY_NAME'\" from keychain; false; }\n\ncat <\n\t\t\tVersion $VERSION\n\t\t\t$RELEASENOTES_URL\n\t\t\t$PUBDATE\n\t\t\t\n\t\t\nEOF\n\necho scp \"'$HOME/svn/my-cool-app/build/Release/$ARCHIVE_FILENAME'\" www.example.com:download/\necho scp \"'$WD/appcast.xml'\" www.example.com:web/software/my-cool-app/appcast.xml"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 8D11072C0486CEB800E47090 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -708,6 +738,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 48ADECD61243E933000AF19C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 8D1107260486CEB800E47090 /* QuakeSpasm */; + targetProxy = 48ADECD51243E933000AF19C /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = { isa = PBXVariantGroup; @@ -728,6 +766,27 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 48ADEC8F1243D946000AF19C /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = Distribution; + }; + name = Debug; + }; + 48ADEC901243D946000AF19C /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + PRODUCT_NAME = Distribution; + ZERO_LINK = NO; + }; + name = Release; + }; C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -833,6 +892,15 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 48ADEC921243D94A000AF19C /* Build configuration list for PBXAggregateTarget "Distribution" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 48ADEC8F1243D946000AF19C /* Debug */, + 48ADEC901243D946000AF19C /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "QuakeSpasm" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/MacOSX/appcast.xml b/MacOSX/appcast.xml index 87f150de..2fccaeb6 100755 --- a/MacOSX/appcast.xml +++ b/MacOSX/appcast.xml @@ -1,15 +1,22 @@ - - QuakeSpasm Changelog - http://www.kristianduske.com/quakespasm/appcast.xml - Most recent changes with links to updates. - en - - Version 0.85.3 - http://quakespasm.sourceforge.net/sparkle/rnotes.html - Sun, 19 Sep 2010 18:00:00 CEST - - + + QuakeSpasm Changelog + http://quakespasm.sourceforge.net/sparkle/appcast.xml + Most recent changes with links to updates. + en + + Version 0.85.3 + http://quakespasm.sourceforge.net/sparkle/rnotes.html#version-0.85.3 + Sun, 19 Sep 2010 14:00:00 +0200 + + \ No newline at end of file diff --git a/MacOSX/dsa_pub.pem b/MacOSX/dsa_pub.pem index a39adb10..04c66027 100644 --- a/MacOSX/dsa_pub.pem +++ b/MacOSX/dsa_pub.pem @@ -1,20 +1,20 @@ -----BEGIN PUBLIC KEY----- -MIIDRjCCAjkGByqGSM44BAEwggIsAoIBAQCYHTRJzjo+qQ4nQilEIIi2ONrKJHQD -0r+DLMQR8ds+nQAyTvHgkZbw7o6j147gMJ956LeyUGDAaWzp4h71nhlCnsVGXIUw -PcSR+I3H5zDgYEmJUwW7qQc90jQbmH7TemzryoIJM+tPt9t6MqExpjRI/yw2gdNh -cRokd1YbugqQqG+QFSr+h3brl/xcYIznK+yDgbrWb5hEhCGuR0EldJaUCCKECpdd -zWTD0oQi/CzYkavVaEXH7XO1Xc6cRb7cKn1KxbSKx+O4HC9e1MTsIteRWVq43hje -WuQrJBPfFEG9c9mhON2o3Gi+b92w1AimLut88AFdLolruxqMl3mf1iQhAiEAw50W -OFSSaHJH8UXQSQpxWQesR8FjPdN+El8XUSlRAgUCggEAS3HFXt4gd7TlErxCpYaz -5sE2EkjD2ukkm+556Gh09bx0sYnN7DtjpzpRr+MHphFjKd/P2zX7lU9CoPimpjHz -WDrVOPZ4qxP37YbJNKtuvQ4gbddXSA5PFrshYqXZyCcz/wJ+MdVdUOrcEUiMz5W4 -VmIhRzl1e5xk+9ld+WP7z1UiwlMHH71GzakncdY25UGwOPgBtNVeFNiMbK1Bqc/f -8obUxOyDHw1J4lqRLIuDZxtSkvMOnPSBpBE2v1CeFe9iUYABwtDlf6SyOmt3msNj -AjMwytt15Cp7pLBO28Mi+seOcIxL1znO5TiEAJulN4r5ucxtEfG1MmINZ3b95tQj -ygOCAQUAAoIBAD9qTBX1qswvN82Pg1LRp9b/c3bScfzqA1diX8OUlA56SqnBM7u4 -pseLN2MY0ECp0/YbcKpFgd9821Xp2/sCGeFMXYssnebOijT+dZmT9lOcHPjXVv62 -VoQE7iJrgrNkFx8n+31+dWw1kZcZYjzu3+glsBE5mHmvaI9/kqvlOGBiS8vTrYZt -L1GWs0K5uCWEyScTn26rbB+bBN4ILxBCdy9wuM/cz8TQv4nmTfDLEy953lRNGYUi -NfRHtN/VVJQmyQp7nQ3Fle3kCIgbEq7FWM4TMTE5yecuJCXka5l9hQ68PB3cx5WA -aieNLzZeOH43byK9Ao7j4WwhMV5KPtW1+zE= +MIIDRzCCAjoGByqGSM44BAEwggItAoIBAQCxeSl5tVYb6wlicfU+CceZFT2letlW +ZZzSII10wojpCUaaxOLXUZnPOp/eVk2/SiudURErLZAJqZHfDtuWmoTIFprcHQA8 +aUTZ1FMMywTHjxKLI9AQvpXk0fNDHZVFOAH1hlRAq8JEmogEEUVtM8T6vp9AVOim +4zGyaBqffeQiZWATB9OdYhiw2bIaG+Lk6A47/T/u9qiSquulDHX1ME2QLewb04vm +5wYSI+nw71DHeObvDI/PECCdWWSkT1DPJLQanPiGi70tWNx2GmSutWGQOhdduAAk +x0mOT7q0Z0kOhNSjdEr2gyJEeLOkorvFFYjBYiiOb40/9ZWIvvG32B+NAiEA1uHb +McyKA1Z3TqpUEYlcHsaZk5LnvxQoi5IbnQNMlPcCggEBAIxOnXjSrKGHQX8jrIaq +FzeI722ZVkNEfofqtw1XbxzmNObEdL+HUXt3PnpqfZmjgWY3dezS9ajNHZY8Dw00 +2A//lwUZe4vWXUO74y6m1nCGICbyQ5yIUsfLspyebpdJf6uL64RLaMUo8cYDrLDO +gJblkpEPjZpH8PprPlSY9NY38xh1K434tcu1OVckwJPByGS7qKVtXQHxJEH2MfXi +K7dEiBXCPb1jMCPwbc+8HhmU+tZgaut2f8l4bNtj3aMqsc7vw5JCHW6lQ2jnz9V1 +5gVUXdXgM2ejVYuZCncl/Im7x9VnDHiJxKGyjkgam21qQwr7JdNDoT50+QYRFm6Z +5B4DggEFAAKCAQAiGtBsOo1qw1vvpfK7qpCiA1tk2RiSiA8KTgVjMSgPph16p/kn +qIiHrxrIxDJ1VHwTeDwBohIZAyF8QHqHfCKiavEGn5jbJ6i26GziFGB+vsXsfl4l +pVdxHqtcDaayfcZtJyRwyoYjXROae3XvbsJABZk5eg8vfw2QqnJ7twNbu8zgaspV +To7FNWqJcRkiN4u+Z4FqNRvEc244paDLj3R4bxVjffY+iaxfccjh88esOp5aQgzF +K7lO6dJGappESG+7GCECMAAjMGapWWHOaB4iXtNr3fBTcsgl66nRWscOQu1/L+BI +3CWcXxEMcjs2eIDrznW1vlyNrO9uUIthnvAW -----END PUBLIC KEY----- diff --git a/MacOSX/sign_update.rb b/MacOSX/sign_update.rb new file mode 100755 index 00000000..6d03e2ef --- /dev/null +++ b/MacOSX/sign_update.rb @@ -0,0 +1,7 @@ +#!/usr/bin/ruby +if ARGV.length < 2 + puts "Usage: ruby sign_update.rb update_archive private_key" + exit +end + +puts `openssl dgst -sha1 -binary < "#{ARGV[0]}" | openssl dgst -dss1 -sign "#{ARGV[1]}" | openssl enc -base64` \ No newline at end of file