[webkit-changes] cvs commit: WebKit Makefile.am

Geoffrey ggaren at opensource.apple.com
Mon Aug 1 16:56:56 PDT 2005


ggaren      05/08/01 16:56:55

  Modified:    .        Tag: Safari-2-0-branch Makefile.am
               .        Tag: Safari-2-0-branch Makefile.am
               ForwardingHeaders/misc Tag: Safari-2-0-branch
                        main_thread_malloc.h
               khtml/ecma Tag: Safari-2-0-branch kjs_html.lut.h
               khtml/misc Tag: Safari-2-0-branch main_thread_malloc.h
               .        Tag: Safari-2-0-branch Makefile.am
  Log:
  Updating projects and make files for XCode 2.1.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.27.10.1 +1 -1      JavaScriptCore/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/Makefile.am,v
  retrieving revision 1.27
  retrieving revision 1.27.10.1
  diff -u -r1.27 -r1.27.10.1
  --- Makefile.am	4 Nov 2004 00:40:31 -0000	1.27
  +++ Makefile.am	1 Aug 2005 23:56:52 -0000	1.27.10.1
  @@ -1,7 +1,7 @@
   SUBDIRS = pcre kjs
   
   all-am:
  -	xcodebuild -target All -buildstyle $(BUILDSTYLE) OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS)
  +	xcodebuild -target All -configuration $(BUILDSTYLE) OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS)
   clean-am:
   	xcodebuild -target All clean OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS)
   	rm -rf $(SYMROOTS)/JavaScriptCore.build
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.28.18.1 +1 -1      WebCore/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /cvs/root/WebCore/Makefile.am,v
  retrieving revision 1.28
  retrieving revision 1.28.18.1
  diff -u -r1.28 -r1.28.18.1
  --- Makefile.am	27 Jan 2004 00:11:39 -0000	1.28
  +++ Makefile.am	1 Aug 2005 23:56:53 -0000	1.28.18.1
  @@ -1,7 +1,7 @@
   SUBDIRS = khtml kwq
   
   all-am: previous-clean-timestamp previous-js-clean-timestamp
  -	xcodebuild -buildstyle $(BUILDSTYLE) OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS) 
  +	xcodebuild -configuration $(BUILDSTYLE) OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS) 
   clean-am:
   	xcodebuild clean OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS) 
   	rm -rf $(SYMROOTS)/WebCore.build
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +1 -1      WebCore/ForwardingHeaders/misc/main_thread_malloc.h
  
  Index: main_thread_malloc.h
  ===================================================================
  RCS file: /cvs/root/WebCore/ForwardingHeaders/misc/main_thread_malloc.h,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- main_thread_malloc.h	26 Apr 2005 18:46:03 -0000	1.1
  +++ main_thread_malloc.h	1 Aug 2005 23:56:53 -0000	1.1.2.1
  @@ -1 +1 @@
  -#import <main_thread_malloc.h>
  +#import "../../khtml/misc/main_thread_malloc.h"
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.29.8.2  +2 -2      WebCore/khtml/ecma/Attic/kjs_html.lut.h
  
  Index: kjs_html.lut.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/ecma/Attic/kjs_html.lut.h,v
  retrieving revision 1.29.8.1
  retrieving revision 1.29.8.2
  diff -u -r1.29.8.1 -r1.29.8.2
  --- kjs_html.lut.h	12 Jul 2005 00:45:43 -0000	1.29.8.1
  +++ kjs_html.lut.h	1 Aug 2005 23:56:53 -0000	1.29.8.2
  @@ -1077,13 +1077,13 @@
      { "clearShadow", Context2D::ClearShadow, DontDelete|Function, 0, &Context2DTableEntries[60] },
      { 0, 0, 0, 0, 0 },
      { "rotate", Context2D::Rotate, DontDelete|Function, 2, 0 },
  -   { "quadraticCurveToPoint", Context2D::QuadraticCurveTo, DontDelete|Function, 4, 0 },
  +   { 0, 0, 0, 0, 0 },
      { 0, 0, 0, 0, 0 },
      { "setFillColor", Context2D::SetFillColor, DontDelete|Function, 1, &Context2DTableEntries[58] },
      { "setStrokeColor", Context2D::SetStrokeColor, DontDelete|Function, 1, &Context2DTableEntries[57] },
      { "setLineWidth", Context2D::SetLineWidth, DontDelete|Function, 1, 0 },
      { 0, 0, 0, 0, 0 },
  -   { 0, 0, 0, 0, 0 },
  +   { "quadraticCurveTo", Context2D::QuadraticCurveTo, DontDelete|Function, 4, 0 },
      { "fill", Context2D::Fill, DontDelete|Function, 0, 0 },
      { "fillStyle", Context2D::FillStyle, DontDelete, 0, &Context2DTableEntries[49] },
      { "strokeStyle", Context2D::StrokeStyle, DontDelete, 0, 0 },
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +7 -9      WebCore/khtml/misc/main_thread_malloc.h
  
  Index: main_thread_malloc.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/misc/main_thread_malloc.h,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- main_thread_malloc.h	26 Apr 2005 18:46:04 -0000	1.1
  +++ main_thread_malloc.h	1 Aug 2005 23:56:54 -0000	1.1.2.1
  @@ -20,7 +20,6 @@
    *
    */
   
  -
   #ifndef KHTMLMAINTTHREADMALLOC_H
   #define KHTMLMAINTTHREADMALLOC_H
   
  @@ -30,31 +29,30 @@
   // while holding the collector lock (this is true whenenever the interpreter is
   // executing or GC is taking place).
   
  +namespace khtml {
   
   #ifndef NDEBUG
   
  -#define main_thread_malloc malloc
  -#define main_thread_calloc calloc
  -#define main_thread_free free
  -#define main_thread_realloc realloc
  +inline void *main_thread_malloc(size_t n) { return malloc(n); }
  +inline void *main_thread_calloc(size_t n_elements, size_t element_size) { return calloc(n_elements, element_size); }
  +inline void main_thread_free(void* p) { free(p); }
  +inline void *main_thread_realloc(void* p, size_t n) { return realloc(p, n); }
   
   #define MAIN_THREAD_ALLOCATED
   
   #else
   
  -namespace khtml {
  -
   void *main_thread_malloc(size_t n);
   void *main_thread_calloc(size_t n_elements, size_t element_size);
   void main_thread_free(void* p);
   void *main_thread_realloc(void* p, size_t n);
   
  -};
  -
   #define MAIN_THREAD_ALLOCATED \
   void* operator new(size_t s) { return khtml::main_thread_malloc(s); } \
   void operator delete(void* p) { khtml::main_thread_free(p); }
   
   #endif
   
  +};
  +
   #endif /* KHTMLMAINTTHREADMALLOC_H */
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.21.18.1 +1 -1      WebKit/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /cvs/root/WebKit/Makefile.am,v
  retrieving revision 1.21
  retrieving revision 1.21.18.1
  diff -u -r1.21 -r1.21.18.1
  --- Makefile.am	16 Feb 2004 16:19:16 -0000	1.21
  +++ Makefile.am	1 Aug 2005 23:56:55 -0000	1.21.18.1
  @@ -1,5 +1,5 @@
   all-am: previous-clean-timestamp
  -	xcodebuild -buildstyle $(BUILDSTYLE) OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS) 
  +	xcodebuild -configuration $(BUILDSTYLE) OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS) 
   clean-am:
   	xcodebuild clean OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS) 
   	rm -rf $(SYMROOTS)/WebKit.build
  
  
  



More information about the webkit-changes mailing list