From 1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Wed, 17 Dec 2008 18:05:15 -0800 Subject: Code drop from //branches/cupcake/...@124589 --- WebKitLibraries/ChangeLog | 322 ++++++++++++++++++++- WebKitLibraries/WebKitSystemInterface.h | 43 +-- WebKitLibraries/libWebCoreSQLite3.a | Bin 1495496 -> 3012256 bytes WebKitLibraries/libWebKitSystemInterfaceLeopard.a | Bin 1791488 -> 1773088 bytes WebKitLibraries/libWebKitSystemInterfaceTiger.a | Bin 730628 -> 729556 bytes .../WebKitSystemInterface/WebKitSystemInterface.h | 3 +- WebKitLibraries/win/lib/WebKitSystemInterface.lib | Bin 122194 -> 124648 bytes .../win/lib/WebKitSystemInterface_debug.lib | Bin 63220 -> 65018 bytes WebKitLibraries/win/tools/scripts/PRODUCTVERSION | 2 +- WebKitLibraries/win/tools/scripts/VERSION | 2 +- WebKitLibraries/win/tools/scripts/auto-version.sh | 74 ++--- WebKitLibraries/win/tools/vsprops/common.vsprops | 5 +- 12 files changed, 370 insertions(+), 81 deletions(-) (limited to 'WebKitLibraries') diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index ed9e1d8..e25f2cf 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,8 +1,314 @@ -2008-02-15 Mark Rowe +2008-10-23 Anders Carlsson - Merge r30084 to Safari-3-1-branch. + Reviewed by John Sullivan. + + Fix by adding a workaround for . + + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2008-10-08 Mark Rowe + + Rubber-stamped by Jon Honeycutt. + + Remove restriction on version number ending in a 4. + + * win/tools/scripts/auto-version.sh: + +2008-10-07 Anders Carlsson + + Reviewed by Mitz Pettel. + + Update WebKitSystemInterface. + + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2008-09-09 Dan Bernstein + + Reviewed by Darin Adler. + + - WebKitLibraries part of Use alternate character-to-glyph interface on Leopard + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + +2008-09-04 Adam Roben + + Ignore warning LNK4221 on Windows + + This warning is emitted when an object file with no public symbols is + passed to the linker/librarian. This often occurs in WebCore for files + that have been disabled via ENABLE()/USE() macros. + + Rubberstamped by Anders Carlsson. + + * win/tools/vsprops/common.vsprops: Ignore warning LNK4221. + +2008-08-27 Timothy Hatcher + + Adds the WKAdvanceDefaultButtonPulseAnimation function. + + Add Mac support for -webkit-appearance: default-button + + Reviewed by Adele Peterson. + + * WebKitSystemInterface.h: Added WKAdvanceDefaultButtonPulseAnimation. + * libWebKitSystemInterfaceLeopard.a: Updated. + * libWebKitSystemInterfaceTiger.a: Updated. + +2008-08-26 Adam Roben + + Disable a truncation warning that is disabled/doesn't exist on Mac + + This warning was firing when initializing floats from double literals. + I haven't yet found any other situation that would cause this warning + to arise. + + Reviewed by Sam Weinig. + + * win/tools/vsprops/common.vsprops: Turn off warning C4305. + +2008-07-20 Steve Falkenburg + + Build fix. + + * win/tools/vsprops/common.vsprops: + +2008-07-08 Dan Bernstein + + Reviewed by John Sullivan. + + - WebKitSystemInterface part of Need a way to disable updates in offscreen views + + * WebKitSystemInterface.h: Added WKWindowWillOrderOnScreenNotification. + * libWebKitSystemInterfaceLeopard.a: Updated. + * libWebKitSystemInterfaceTiger.a: Updated. + +2008-07-01 Steve Falkenburg + + Bump version numbers. + + Reviewed by Mark Rowe. + + * win/tools/scripts/PRODUCTVERSION: + * win/tools/scripts/VERSION: + +2008-05-13 Dan Bernstein + + Reviewed by John Sullivan. + + - WebKitSystemInterface support for improve render quality of transformed text + + * libWebKitSystemInterfaceLeopard.a: Improved glyph positioning in + transformed graphics contexts. + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: Added + wkSetCGContextFontRenderingStyle(). + * win/lib/WebKitSystemInterface.lib: Updated. + * win/lib/WebKitSystemInterface_debug.lib: Updated. + +2008-05-09 Adam Roben + + Disable a MSVC warning + + Reviewed by Darin Adler. + + * win/tools/vsprops/common.vsprops: Add warning 4503 to the list of + disabled warnings. It's a warning about decorated names being longer + than MSVC's limit of 4096 characters. This warning doesn't indicate a + correctness problem, but these truncated decorated names will be + harder to recognize during debugging or when they appear in linker + errors. + +2008-04-28 Darin Adler + + Reviewed by Adam. + + - fix Windows build + + * win/tools/vsprops/common.vsprops: Add warning 4344 to the list of disabled warnings. + It's really a warning about a bug they fixed in MSVC -- not helpful to us in WebKit. + +2008-04-24 Mark Rowe + + Reviewed by Sam Weinig. + + Remove code for calculating the glyph cache size. + + * WebKitSystemInterface.h: Remove unused symbol. + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2008-03-28 Steve Falkenburg + + Versioning. + + * win/tools/scripts/PRODUCTVERSION: + +2008-03-26 Adam Roben + + Windows build fix after r31322 + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: Updated. + * win/lib/WebKitSystemInterface.lib: Updated. + * win/lib/WebKitSystemInterface_debug.lib: Updated. + +2008-03-26 Mark Rowe + + Reviewed by David Hyatt. + + Make the Ahem font antialias correctly on Acid3 on Tiger. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceTiger.a: + +2008-03-19 Mark Rowe - 2008-02-07 Ada Chan + Rubber-stamped by Sam Weinig. + + Fix http://bugs.webkit.org/show_bug.cgi?id=17816. + Bug 17816: libWebCoreSQLite3.a is 2-architecture universal binary (not 4-architecture) + + * libWebCoreSQLite3.a: Land a 4-way fat binary. + +2008-03-12 Steve Falkenburg + + New version of WebKitSystemInterface.lib with + more compiler warnings suppressed. + + * win/lib/WebKitSystemInterface.lib: + * win/tools/vsprops/common.vsprops: + +2008-03-12 Dan Bernstein + + Reviewed by Darin Adler and Sam Weinig. + + - use CoreText API instead of SPI on Leopard + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + +2008-03-11 Steve Falkenburg + + Disable two PGO/LTCG specific warnings. + + Reviewed by Oliver. + + * win/tools/vsprops/common.vsprops: + +2008-02-29 Mark Rowe + + Update Tiger version of WebKitSystemInterface to match r30690. + + * libWebKitSystemInterfaceTiger.a: + +2008-02-29 Adele Peterson + + Reviewed by Mark. + + Auto-generate image arrays. + + * libWebKitSystemInterfaceLeopard.a: + +2008-02-29 Mark Rowe + + Reviewed by Anders Carlsson. + + Replace use of WKPathFromFont with implementation in terms of public API. + + * WebKitSystemInterface.h: Remove unused symbol. + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2008-02-29 Mark Rowe + + Reviewed by Oliver Hunt. + + Fix spelling of "request" in name of WKNSURLProtocolClassForRequest. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2008-02-29 Mark Rowe + + Reviewed by Oliver Hunt. + + Don't use WKSupportsMultipartXMixedReplace on Leopard as multipart/x-mixed-replace is always handled by NSURLRequest. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + +2008-02-29 Mark Rowe + + Reviewed by Oliver Hunt and Oliver Hunt. + + WebKit should use CGEventSourceSecondsSinceLastEventType in place of WKSecondsSinceLastInputEvent SPI. + + * WebKitSystemInterface.h: Remove unused symbol. + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2008-02-28 Mark Rowe + + Reviewed by Dan Bernstein. + + Remove two unused functions from WebKitSystemInterface. + + * WebKitSystemInterface.h: Remove WKPreferRGB32Key and WKGetDefaultGlyphForChar as they are unused. Also remove + a duplicate declaration of WKSecondsSinceLastInputEvent. + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2008-02-28 Mark Rowe + + Reviewed by Dave Hyatt. + + Make use of new CGFont APIs on Leopard rather than making a WebKitSystemInterface call. + + * WebKitSystemInterface.h: Only declare WKGetFontMetrics on Tiger. + * libWebKitSystemInterfaceLeopard.a: Update for removal of WKGetFontMetrics. + +2008-02-27 Brady Eidson + + Tiger build fix + + * libWebKitSystemInterfaceTiger.a: + +2008-02-27 Brady Eidson + + Reviewed by Mark Rowe + + Removed some unused methods: + WKGetNSURLResponseCalculatedExpiration + WKGetNSURLResponseMustRevalidate + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2008-02-13 Adam Roben + + * win/tools/scripts/auto-version.sh: Removed a redundant symbol. + +2008-02-12 Adam Roben + + Clean up auto-version.sh a bit + + It now does quite a bit less file I/O and many fewer fork/exec pairs. + It's also quite a bit easier to read. + + Reviewed by Steve. + + * win/tools/scripts/auto-version.sh: + +2008-02-12 Steve Falkenburg + + Versioning script change. + + * win/tools/scripts/auto-version.sh: + +2008-02-07 Ada Chan Added 4 new methods: wkSetClientCertificateInSSLProperties, @@ -90,7 +396,7 @@ Use shared vsprops for most vcproj properties. - Reviewed by Darin. + Reviewed by Darin Adler. * win/tools/vsprops/common.vsprops: * win/tools/vsprops/debug.vsprops: @@ -244,7 +550,7 @@ 2007-11-02 Antti Koivisto - Reviewed by Darin. + Reviewed by Darin Adler. Update to add WKQTMovieViewSetDrawSynchronously @@ -337,7 +643,7 @@ Added wkGetDefaultHTTPCookieStorage(). Updated libraries. - Reviewed by Darin. + Reviewed by Darin Adler. * win/include/WebKitSystemInterface/WebKitSystemInterface.h: * win/lib/WebKitSystemInterface.lib: @@ -445,7 +751,7 @@ 2007-03-27 Antti Koivisto - Reviewed by Darin. + Reviewed by Darin Adler. Added wkGetWheelEventDeltas @@ -512,7 +818,7 @@ 2006-07-09 Anders Carlsson - Reviewed by Darin. + Reviewed by Darin Adler. * WebKitSystemInterface.h: * libWebKitSystemInterface.a: diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index de8cb12..c1d4822 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -1,6 +1,6 @@ /* WebKitSystemInterface.h - Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. + Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. Public header file. */ @@ -31,17 +31,11 @@ NSString *WKGetMIMETypeForExtension(NSString *extension); NSDate *WKGetNSURLResponseLastModifiedDate(NSURLResponse *response); NSTimeInterval WKGetNSURLResponseFreshnessLifetime(NSURLResponse *response); -NSTimeInterval WKGetNSURLResponseCalculatedExpiration(NSURLResponse *response); -BOOL WKGetNSURLResponseMustRevalidate(NSURLResponse *response); CFStringEncoding WKGetWebDefaultCFStringEncoding(void); -float WKSecondsSinceLastInputEvent(void); -CFStringRef WKPreferRGB32Key(void); - void WKSetMetadataURL(NSString *URLString, NSString *referrer, NSString *path); void WKSetNSURLConnectionDefersCallbacks(NSURLConnection *connection, BOOL defers); -float WKSecondsSinceLastInputEvent(void); void WKShowKeyAndMain(void); #ifndef __LP64__ @@ -58,12 +52,15 @@ WKNSURLConnectionDelegateProxyPtr WKCreateNSURLConnectionDelegateProxy(void); void WKDisableCGDeferredUpdates(void); -Class WKNSURLProtocolClassForReqest(NSURLRequest *request); +Class WKNSURLProtocolClassForRequest(NSURLRequest *request); void WKSetNSURLRequestShouldContentSniff(NSMutableURLRequest *request, BOOL shouldContentSniff); unsigned WKGetNSAutoreleasePoolCount(void); +void WKAdvanceDefaultButtonPulseAnimation(NSButtonCell *button); + NSString *WKMouseMovedNotification(void); +NSString *WKWindowWillOrderOnScreenNotification(void); void WKSetNSWindowShouldPostEventNotifications(NSWindow *window, BOOL post); CFTypeID WKGetAXTextMarkerTypeID(void); @@ -77,8 +74,7 @@ void WKAccessibilityHandleFocusChanged(void); AXUIElementRef WKCreateAXUIElementRef(id element); void WKUnregisterUniqueIdForElement(id element); -BOOL WKFontSmoothingModeIsLCD(int mode); -void WKSetUpFontCache(size_t s); +void WKSetUpFontCache(void); void WKSignalCFReadStreamEnd(CFReadStreamRef stream); void WKSignalCFReadStreamHasBytes(CFReadStreamRef stream); @@ -109,35 +105,46 @@ void WKDrawBezeledTextArea(NSRect, BOOL enabled); void WKPopupMenu(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*); void WKSendUserChangeNotifications(void); -#ifndef __LP64__ +#ifndef __LP64__ BOOL WKConvertNSEventToCarbonEvent(EventRecord *carbonEvent, NSEvent *cocoaEvent); void WKSendKeyEventToTSM(NSEvent *theEvent); void WKCallDrawingNotification(CGrafPtr port, Rect *bounds); #endif BOOL WKGetGlyphTransformedAdvances(CGFontRef, NSFont*, CGAffineTransform *m, ATSGlyphRef *glyph, CGSize *advance); -CGFontRef WKGetCGFontFromNSFont(NSFont *font); -void WKGetFontMetrics(CGFontRef font, int *ascent, int *descent, int *lineGap, unsigned *unitsPerEm); NSFont *WKGetFontInLanguageForRange(NSFont *font, NSString *string, NSRange range); NSFont *WKGetFontInLanguageForCharacter(NSFont *font, UniChar ch); void WKSetCGFontRenderingMode(CGContextRef cgContext, NSFont *font); -ATSUFontID WKGetNSFontATSUFontId(NSFont *font); -void WKReleaseStyleGroup(void *group); BOOL WKCGContextGetShouldSmoothFonts(CGContextRef cgContext); +#ifdef BUILDING_ON_TIGER +// CGFontGetAscent, CGFontGetDescent, CGFontGetLeading and CGFontGetUnitsPerEm were not available until Leopard +void WKGetFontMetrics(CGFontRef font, int *ascent, int *descent, int *lineGap, unsigned *unitsPerEm); +// CTFontCopyGraphicsFont was not available until Leopard +CGFontRef WKGetCGFontFromNSFont(NSFont *font); +// CTFontGetPlatformFont was not available until Leopard +ATSUFontID WKGetNSFontATSUFontId(NSFont *font); +// CGFontCopyFullName was not available until Leopard +CFStringRef WKCopyFullFontName(CGFontRef font); +#endif + void WKSetPatternBaseCTM(CGContextRef, CGAffineTransform); void WKSetPatternPhaseInUserSpace(CGContextRef, CGPoint); +#ifndef BUILDING_ON_TIGER +void WKGetGlyphsForCharacters(CGFontRef, const UniChar[], CGGlyph[], size_t); +#else typedef void *WKGlyphVectorRef; OSStatus WKConvertCharToGlyphs(void *styleGroup, const UniChar *characters, unsigned numCharacters, WKGlyphVectorRef glyphs); OSStatus WKGetATSStyleGroup(ATSUStyle fontStyle, void **styleGroup); +void WKReleaseStyleGroup(void *group); OSStatus WKInitializeGlyphVector(int count, WKGlyphVectorRef glyphs); void WKClearGlyphVector(WKGlyphVectorRef glyphs); int WKGetGlyphVectorNumGlyphs(WKGlyphVectorRef glyphVector); ATSLayoutRecord *WKGetGlyphVectorFirstRecord(WKGlyphVectorRef glyphVector); size_t WKGetGlyphVectorRecordSize(WKGlyphVectorRef glyphVector); -ATSGlyphRef WKGetDefaultGlyphForChar(NSFont *font, UniChar c); +#endif #ifndef __LP64__ NSEvent *WKCreateNSEventWithCarbonEvent(EventRef eventRef); @@ -150,8 +157,10 @@ void WKNSWindowRestoreCGContext(NSWindow *, CGContextRef); void WKNSWindowMakeBottomCornersSquare(NSWindow *); +#ifdef BUILDING_ON_TIGER +// WKSupportsMultipartXMixedReplace is not required on Leopard as multipart/x-mixed-replace is always handled by NSURLRequest BOOL WKSupportsMultipartXMixedReplace(NSMutableURLRequest *request); -NSString* WKPathFromFont(NSFont *font); +#endif BOOL WKCGContextIsBitmapContext(CGContextRef context); diff --git a/WebKitLibraries/libWebCoreSQLite3.a b/WebKitLibraries/libWebCoreSQLite3.a index c545777..2e175e2 100644 Binary files a/WebKitLibraries/libWebCoreSQLite3.a and b/WebKitLibraries/libWebCoreSQLite3.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a index 48fbd61..d1e7871 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceTiger.a b/WebKitLibraries/libWebKitSystemInterfaceTiger.a index b73a60a..0b30d6a 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceTiger.a and b/WebKitLibraries/libWebKitSystemInterfaceTiger.a differ diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h index cb41ffd..9d3c969 100644 --- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h +++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h @@ -45,8 +45,9 @@ typedef const struct _CFURLRequest* CFURLRequestRef; void wkSetFontSmoothingLevel(int type); int wkGetFontSmoothingLevel(); -uint32_t wkSetFontSmoothingStyle(CGContextRef cg); +uint32_t wkSetFontSmoothingStyle(CGContextRef cg, bool fontAllowsSmoothing); void wkRestoreFontSmoothingStyle(CGContextRef cg, uint32_t oldStyle); +void wkSetCGContextFontRenderingStyle(CGContextRef, bool isSystemFont, bool isPrinterFont); void wkGetGlyphAdvances(CGFontRef, const CGAffineTransform&, bool isSystemFont, bool isPrinterFont, CGGlyph, CGSize& advance); void wkGetGlyphs(CGFontRef, const UChar[], CGGlyph[], size_t count); void wkSetUpFontCache(size_t s); diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib index 116018e..2d8df77 100644 Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib index 162d92d..9bc4e47 100644 Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ diff --git a/WebKitLibraries/win/tools/scripts/PRODUCTVERSION b/WebKitLibraries/win/tools/scripts/PRODUCTVERSION index 06a4457..5186d07 100644 --- a/WebKitLibraries/win/tools/scripts/PRODUCTVERSION +++ b/WebKitLibraries/win/tools/scripts/PRODUCTVERSION @@ -1 +1 @@ -3.1 \ No newline at end of file +4.0 diff --git a/WebKitLibraries/win/tools/scripts/VERSION b/WebKitLibraries/win/tools/scripts/VERSION index 642ea6f..9dbddfa 100644 --- a/WebKitLibraries/win/tools/scripts/VERSION +++ b/WebKitLibraries/win/tools/scripts/VERSION @@ -1 +1 @@ -525 +528 diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh index a93f4af..c7f064c 100755 --- a/WebKitLibraries/win/tools/scripts/auto-version.sh +++ b/WebKitLibraries/win/tools/scripts/auto-version.sh @@ -30,29 +30,22 @@ VERSIONFILE=$VERSIONPATH/autoversion.h mkdir -p "$VERSIONPATH" PRODUCTVERSION=`cat "$SRCPATH/PRODUCTVERSION"` -MAJORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/' "$SRCPATH/PRODUCTVERSION"` -MINORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/' "$SRCPATH/PRODUCTVERSION"` -TINYVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/' "$SRCPATH/PRODUCTVERSION"` +MAJORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/'` +MINORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/'` +TINYVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/'` if [ "$TINYVERSION" == "" ]; then TINYVERSION=0 fi if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then - echo -n `cat "$SRCPATH/VERSION"` > "$VERSIONFILE" + PROPOSEDVERSION=$(cat "$SRCPATH/VERSION") else - echo -n $RC_PROJECTSOURCEVERSION > "$VERSIONFILE" + PROPOSEDVERSION="$RC_PROJECTSOURCEVERSION" fi -if [ `grep -c -E "4\.|4$" "$VERSIONFILE"` -ne 0 ]; then - echo "Can't set WebKit's version to something that ends in a 4!" - echo "If we do, someone's going to think it's Netscape 4." - echo "Radar bug 3787996 has some details." - exit 1 -fi - -BLDMAJORVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/' "$VERSIONFILE"` -BLDMINORVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/' "$VERSIONFILE"` -BLDVARIANTVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\5/' "$VERSIONFILE"` +BLDMAJORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'` +BLDMINORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/'` +BLDVARIANTVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\5/'` if [ "$BLDMINORVERSION" == "" ]; then BLDMINORVERSION=0 fi @@ -61,43 +54,22 @@ if [ "$BLDVARIANTVERSION" == "" ]; then fi SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed 's/^Revision: \(.*\)/\1/'` -BLDNMBR=`cat "$VERSIONFILE"` -BLDNMBRSHORT=`cat "$VERSIONFILE"` -BUILDER="" +BLDNMBR="$PROPOSEDVERSION" +BLDNMBRSHORT="$BLDNMBR" if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then - echo -n "+" >> "$VERSIONFILE" - BLDNMBRSHORT=`cat "$VERSIONFILE"` - echo -n " " >> "$VERSIONFILE" - echo -n `whoami` >> "$VERSIONFILE" - echo -n " - " >> "$VERSIONFILE" - echo -n `date` >> "$VERSIONFILE" - echo -n " - r$SVNOPENSOURCEREVISION" >> "$VERSIONFILE" - BLDNMBR=`cat "$VERSIONFILE"` + BLDNMBRSHORT="$BLDNMBRSHORT+" + BLDNMBR="$BLDNMBRSHORT $(whoami) - $(date) - r$SVNOPENSOURCEREVISION" fi -echo -n '#define __VERSION_TEXT__ "' > "$VERSIONFILE" -echo -n $PRODUCTVERSION >> "$VERSIONFILE" -echo -n " (" >> "$VERSIONFILE" -echo -n $BLDNMBR >> "$VERSIONFILE" -echo ')"' >> "$VERSIONFILE" -echo -n '#define __BUILD_NUMBER_SHORT__ "' >> "$VERSIONFILE" -echo -n $BLDNMBRSHORT >> "$VERSIONFILE" -echo '"' >> "$VERSIONFILE" - -echo -n '#define __VERSION_MAJOR__ ' >> "$VERSIONFILE" -echo $MAJORVERSION >> "$VERSIONFILE" -echo -n '#define __VERSION_MINOR__ ' >> "$VERSIONFILE" -echo $MINORVERSION >> "$VERSIONFILE" -echo -n '#define __VERSION_TINY__ ' >> "$VERSIONFILE" -echo $TINYVERSION >> "$VERSIONFILE" - -echo -n '#define __BUILD_NUMBER_MAJOR__ ' >> "$VERSIONFILE" -echo $BLDMAJORVERSION >> "$VERSIONFILE" -echo -n '#define __BUILD_NUMBER_MINOR__ ' >> "$VERSIONFILE" -echo $BLDMINORVERSION >> "$VERSIONFILE" -echo -n '#define __BUILD_NUMBER_VARIANT__ ' >> "$VERSIONFILE" -echo $BLDVARIANTVERSION >> "$VERSIONFILE" - -echo -n '#define __SVN_REVISION__ ' >> "$VERSIONFILE" -echo $SVNREVISION >> "$VERSIONFILE" +cat > "$VERSIONFILE" <