Permalink
Browse files

Merge andymatuschak/Sparkle.

  • Loading branch information...
2 parents 67b0860 + 3ea1a9e commit 9937e5a17b7149655268e8d7ebbede265b27a033 @uliwitness uliwitness committed May 2, 2011
Showing with 3,645 additions and 809 deletions.
  1. +9 −0 Configurations/ConfigBinaryDelta.xcconfig
  2. +5 −0 Configurations/ConfigBinaryDeltaDebug.xcconfig
  3. +3 −0 Configurations/ConfigBinaryDeltaRelease.xcconfig
  4. +14 −4 Configurations/ConfigCommon.xcconfig
  5. +5 −2 Configurations/ConfigCommonDebug.xcconfig
  6. +9 −0 Configurations/ConfigUnitTest.xcconfig
  7. +3 −0 Configurations/ConfigUnitTestDebug.xcconfig
  8. +3 −0 Configurations/ConfigUnitTestRelease.xcconfig
  9. +3 −0 Configurations/ConfigUnitTestReleaseGCSupport.xcconfig
  10. +28 −1 License.txt
  11. +1 −0 NTSynchronousTask.h
  12. +112 −151 NTSynchronousTask.m
  13. +4 −1 SUAppcast.h
  14. +63 −37 SUAppcast.m
  15. +8 −2 SUAppcastItem.h
  16. +35 −0 SUAppcastItem.m
  17. +3 −1 SUAutomaticUpdateDriver.h
  18. +2 −0 SUBasicUpdateDriver.h
  19. +37 −9 SUBasicUpdateDriver.m
  20. +15 −0 SUBinaryDeltaApply.h
  21. +101 −0 SUBinaryDeltaApply.m
  22. +26 −0 SUBinaryDeltaCommon.h
  23. +165 −0 SUBinaryDeltaCommon.m
  24. +269 −0 SUBinaryDeltaTool.m
  25. +20 −0 SUBinaryDeltaUnarchiver.h
  26. +48 −0 SUBinaryDeltaUnarchiver.m
  27. +20 −20 SUConstants.h
  28. +23 −23 SUConstants.m
  29. +37 −20 SUDSAVerifier.m
  30. +21 −19 SUDiskImageUnarchiver.m
  31. +1 −0 SUHost.h
  32. +16 −10 SUHost.m
  33. +1 −4 SUInstaller.h
  34. +7 −9 SUInstaller.m
  35. +8 −12 SUPackageInstaller.m
  36. +25 −25 SUPipedUnarchiver.m
  37. +14 −15 SUPlainInstaller.m
  38. +13 −10 SUPlainInstallerInternals.m
  39. +3 −1 SUScheduledUpdateDriver.h
  40. +7 −5 SUStandardVersionComparator.m
  41. +3 −1 SUStatusController.h
  42. +3 −3 SUStatusController.m
  43. +16 −17 SUSystemProfiler.m
  44. +25 −22 SUUIBasedUpdateDriver.m
  45. +5 −2 SUUnarchiver.h
  46. +4 −6 SUUnarchiver.m
  47. +7 −7 SUUnarchiver_Private.h
  48. +17 −13 SUUnarchiver_Private.m
  49. +1 −1 SUUpdateAlert.m
  50. +1 −1 SUUpdateDriver.h
  51. +1 −1 SUUpdateDriver.m
  52. +1 −2 SUUpdatePermissionPrompt.m
  53. +1 −0 SUUpdater.h
  54. +15 −11 SUUpdater.m
  55. +3 −1 SUUserInitiatedUpdateDriver.h
  56. +17 −17 SUUserInitiatedUpdateDriver.m
  57. +2 −1 SUWindowController.m
  58. +15 −1 Sparkle.pch
  59. +299 −300 Sparkle.xcodeproj/project.pbxproj
  60. +501 −0 bsdiff.c
  61. +271 −0 bspatch.c
  62. +12 −0 bspatch.h
  63. BIN cs.lproj/Sparkle.strings
  64. BIN en.lproj/Sparkle.strings
  65. BIN es.lproj/Sparkle.strings
  66. +3 −2 generate_keys.rb
  67. +344 −0 is.lproj/SUUpdateAlert.xib
  68. BIN ja.lproj/Sparkle.strings
  69. BIN pt_PT.lproj/Sparkle.strings
  70. +21 −11 relaunch.m
  71. BIN sk.lproj/Sparkle.strings
  72. BIN tr.lproj/Sparkle.strings
  73. +870 −8 zh_TW.lproj/SUUpdateAlert.xib
@@ -0,0 +1,9 @@
+// BinaryDelta tool only
+
+PRODUCT_NAME = BinaryDelta
+GCC_PREFIX_HEADER =
+SDKROOT = macosx10.5
+MACOSX_DEPLOYMENT_TARGET[arch=i386] = 10.5
+MACOSX_DEPLOYMENT_TARGET[arch=ppc64] = 10.5
+MACOSX_DEPLOYMENT_TARGET[arch=ppc] = 10.5
+MACOSX_DEPLOYMENT_TARGET[arch=x86_64] = 10.5
@@ -0,0 +1,5 @@
+#include "ConfigCommon.xcconfig"
+#include "ConfigCommonDebug.xcconfig"
+#include "ConfigBinaryDelta.xcconfig"
+
+OTHER_CFLAGS = -fsingle-precision-constant -DDEBUG
@@ -0,0 +1,3 @@
+#include "ConfigCommon.xcconfig"
+#include "ConfigCommonRelease.xcconfig"
+#include "ConfigBinaryDelta.xcconfig"
@@ -3,7 +3,7 @@
PREBINDING = NO
ZERO_LINK = NO
CURRENT_PROJECT_VERSION = 1.5
-SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk
+SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk
MACOSX_DEPLOYMENT_TARGET[arch=ppc] = 10.4
MACOSX_DEPLOYMENT_TARGET[arch=ppc64] = 10.5
MACOSX_DEPLOYMENT_TARGET[arch=i386] = 10.4
@@ -14,8 +14,9 @@ GCC_DEBUGGING_SYMBOLS = full
GCC_PRECOMPILE_PREFIX_HEADER = YES
GCC_PREFIX_HEADER = $(SDKROOT)/System/Library/Frameworks/Cocoa.framework/Headers/Cocoa.h
GCC_FAST_OBJC_DISPATCH = YES
-GCC_VERSION = 4.0;
-ARCHS = ppc i386
+GCC_ENABLE_PASCAL_STRINGS = NO
+ARCHS = ppc i386 x86_64
+GCC_VERSION = com.apple.compilers.llvm.clang.1_0
// Enable warnings
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES
@@ -37,4 +38,13 @@ GCC_WARN_UNKNOWN_PRAGMAS = YES
GCC_WARN_UNUSED_VARIABLE = YES
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES
GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = YES
-WARNING_CFLAGS = -Wall
+GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES
+GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES
+GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = YES
+GCC_WARN_UNUSED_FUNCTION = YES
+GCC_WARN_UNUSED_LABEL = YES
+GCC_WARN_UNUSED_VALUE = YES
+GCC_WARN_UNUSED_PARAMETER = YES
+GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES
+GCC_WARN_UNDECLARED_SELECTOR = YES
+WARNING_CFLAGS = -Wall -Wno-unused-parameter -Werror -Wundef -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-format-attribute -Wpacked -Wredundant-decls -Winline -Wdisabled-optimization -Wformat=2 -Winvalid-pch
@@ -3,5 +3,8 @@
GCC_OPTIMIZATION_LEVEL = 0
DEBUG_INFORMATION_FORMAT = dwarf
GCC_GENERATE_DEBUGGING_SYMBOLS = YES
-SPARKLE_EXTRA_DEBUG = -DDEBUG -fstack-protector -D_FORTIFY_SOURCE=2
-OTHER_CFLAGS = $(SPARKLE_EXTRA_DEBUG)
+SPARKLE_EXTRA_DEBUG_10_5_ONLY = -fstack-protector -D_FORTIFY_SOURCE=2
+SPARKLE_EXTRA_DEBUG = -DDEBUG
+OTHER_CFLAGS = $(SPARKLE_EXTRA_DEBUG)
+
+// Add $(SPARKLE_EXTRA_DEBUG_10_5_ONLY) to SPARKLE_EXTRA_DEBUG if your deployment is 10.5 or greater.
@@ -0,0 +1,9 @@
+// Unit Test only
+
+INFOPLIST_FILE = Tests/Sparkle Unit Tests-Info.plist
+OTHER_LDFLAGS = -framework Cocoa -framework SenTestingKit
+PRODUCT_NAME = Sparkle Unit Tests
+WRAPPER_EXTENSION = octest
+FRAMEWORK_SEARCH_PATHS = $(DEVELOPER_LIBRARY_DIR)/Frameworks
+GCC_PREFIX_HEADER = $(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h
+GCC_PRECOMPILE_PREFIX_HEADER = YES
@@ -0,0 +1,3 @@
+#include "ConfigCommon.xcconfig"
+#include "ConfigCommonDebug.xcconfig"
+#include "ConfigUnitTest.xcconfig"
@@ -0,0 +1,3 @@
+#include "ConfigCommon.xcconfig"
+#include "ConfigCommonRelease.xcconfig"
+#include "ConfigUnitTest.xcconfig"
@@ -0,0 +1,3 @@
+#include "ConfigUnitTestRelease.xcconfig"
+
+GCC_ENABLE_OBJC_GC = required
View
@@ -123,4 +123,31 @@ Original SSLeay License
* derivative of this code cannot be changed. i.e. this code cannot simply be
* copied and put under another distribution licence
* [including the GNU Public Licence.]
-*/
+*/
+
+License for bspatch.c and bsdiff.c, from bsdiff 4.3 (<http://www.daemonology.net/bsdiff/>:
+/*-
+ * Copyright 2003-2005 Colin Percival
+ * All rights reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted providing that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
View
@@ -11,6 +11,7 @@
@interface NTSynchronousTask : NSObject
{
+@private
NSTask *mv_task;
NSPipe *mv_outputPipe;
NSPipe *mv_inputPipe;
Oops, something went wrong.

0 comments on commit 9937e5a

Please sign in to comment.