[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:10:04 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 2942d936482edcec4dc65076118ad4361eb5ac3f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Apr 26 17:11:47 2002 +0000
Check in some old changes from my TiBook so I can trash the source tree.
Pay no attention to the man who is not supposed to be working.
* Tools/Scripts/find-unused-symbols: Added. Only partly done.
* configure.in: Some small tweaks.
WebCore:
Pay no attention to the man who is not supposed to be working.
* khtml/Makefile.am:
* khtml/css/Makefile.am:
* khtml/ecma/Makefile.am:
* khtml/html/Makefile.am:
* khtml/java/Makefile.am:
* khtml/misc/Makefile.am:
* khtml/rendering/Makefile.am:
* khtml/xml/Makefile.am:
Don't generate empty .moc files or khtmldata.h; there's no reason
not to just check them in instead. Also tweak a few build rules to
use automatic make variables.
* khtml/ecma/kjs_window.moc: Added.
* khtml/html/html_documentimpl.moc: Added.
* khtml/html/htmltokenizer.moc: Added.
* khtml/java/kjavaapplet.moc: Added.
* khtml/java/kjavaappletcontext.moc: Added.
* khtml/java/kjavaappletserver.moc: Added.
* khtml/java/kjavaappletwidget.moc: Added.
* khtml/java/kjavadownloader.moc: Added.
* khtml/java/kjavaprocess.moc: Added.
* khtml/khtmlview.moc: Added.
* khtml/misc/khtmldata.h: Added.
* khtml/rendering/render_form.moc: Added.
* khtml/rendering/render_frames.moc: Added.
* khtml/rendering/render_replaced.moc: Added.
* khtml/xml/dom_docimpl.moc: Added.
* khtml/xml/xml_tokenizer.moc: Added.
* kwq/kwqdebug.mm: Make some globals private.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1082 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 3f75dc3..efea9df 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,38 @@
+2002-04-26 Darin Adler <darin at apple.com>
+
+ Pay no attention to the man who is not supposed to be working.
+
+ * khtml/Makefile.am:
+ * khtml/css/Makefile.am:
+ * khtml/ecma/Makefile.am:
+ * khtml/html/Makefile.am:
+ * khtml/java/Makefile.am:
+ * khtml/misc/Makefile.am:
+ * khtml/rendering/Makefile.am:
+ * khtml/xml/Makefile.am:
+ Don't generate empty .moc files or khtmldata.h; there's no reason
+ not to just check them in instead. Also tweak a few build rules to
+ use automatic make variables.
+
+ * khtml/ecma/kjs_window.moc: Added.
+ * khtml/html/html_documentimpl.moc: Added.
+ * khtml/html/htmltokenizer.moc: Added.
+ * khtml/java/kjavaapplet.moc: Added.
+ * khtml/java/kjavaappletcontext.moc: Added.
+ * khtml/java/kjavaappletserver.moc: Added.
+ * khtml/java/kjavaappletwidget.moc: Added.
+ * khtml/java/kjavadownloader.moc: Added.
+ * khtml/java/kjavaprocess.moc: Added.
+ * khtml/khtmlview.moc: Added.
+ * khtml/misc/khtmldata.h: Added.
+ * khtml/rendering/render_form.moc: Added.
+ * khtml/rendering/render_frames.moc: Added.
+ * khtml/rendering/render_replaced.moc: Added.
+ * khtml/xml/dom_docimpl.moc: Added.
+ * khtml/xml/xml_tokenizer.moc: Added.
+
+ * kwq/kwqdebug.mm: Make some globals private.
+
2002-04-25 Darin Adler <darin at apple.com>
* kwq/KWQMetrics.h: Add NSObject to required protocols for
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3f75dc3..efea9df 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,38 @@
+2002-04-26 Darin Adler <darin at apple.com>
+
+ Pay no attention to the man who is not supposed to be working.
+
+ * khtml/Makefile.am:
+ * khtml/css/Makefile.am:
+ * khtml/ecma/Makefile.am:
+ * khtml/html/Makefile.am:
+ * khtml/java/Makefile.am:
+ * khtml/misc/Makefile.am:
+ * khtml/rendering/Makefile.am:
+ * khtml/xml/Makefile.am:
+ Don't generate empty .moc files or khtmldata.h; there's no reason
+ not to just check them in instead. Also tweak a few build rules to
+ use automatic make variables.
+
+ * khtml/ecma/kjs_window.moc: Added.
+ * khtml/html/html_documentimpl.moc: Added.
+ * khtml/html/htmltokenizer.moc: Added.
+ * khtml/java/kjavaapplet.moc: Added.
+ * khtml/java/kjavaappletcontext.moc: Added.
+ * khtml/java/kjavaappletserver.moc: Added.
+ * khtml/java/kjavaappletwidget.moc: Added.
+ * khtml/java/kjavadownloader.moc: Added.
+ * khtml/java/kjavaprocess.moc: Added.
+ * khtml/khtmlview.moc: Added.
+ * khtml/misc/khtmldata.h: Added.
+ * khtml/rendering/render_form.moc: Added.
+ * khtml/rendering/render_frames.moc: Added.
+ * khtml/rendering/render_replaced.moc: Added.
+ * khtml/xml/dom_docimpl.moc: Added.
+ * khtml/xml/xml_tokenizer.moc: Added.
+
+ * kwq/kwqdebug.mm: Make some globals private.
+
2002-04-25 Darin Adler <darin at apple.com>
* kwq/KWQMetrics.h: Add NSObject to required protocols for
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3f75dc3..efea9df 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,38 @@
+2002-04-26 Darin Adler <darin at apple.com>
+
+ Pay no attention to the man who is not supposed to be working.
+
+ * khtml/Makefile.am:
+ * khtml/css/Makefile.am:
+ * khtml/ecma/Makefile.am:
+ * khtml/html/Makefile.am:
+ * khtml/java/Makefile.am:
+ * khtml/misc/Makefile.am:
+ * khtml/rendering/Makefile.am:
+ * khtml/xml/Makefile.am:
+ Don't generate empty .moc files or khtmldata.h; there's no reason
+ not to just check them in instead. Also tweak a few build rules to
+ use automatic make variables.
+
+ * khtml/ecma/kjs_window.moc: Added.
+ * khtml/html/html_documentimpl.moc: Added.
+ * khtml/html/htmltokenizer.moc: Added.
+ * khtml/java/kjavaapplet.moc: Added.
+ * khtml/java/kjavaappletcontext.moc: Added.
+ * khtml/java/kjavaappletserver.moc: Added.
+ * khtml/java/kjavaappletwidget.moc: Added.
+ * khtml/java/kjavadownloader.moc: Added.
+ * khtml/java/kjavaprocess.moc: Added.
+ * khtml/khtmlview.moc: Added.
+ * khtml/misc/khtmldata.h: Added.
+ * khtml/rendering/render_form.moc: Added.
+ * khtml/rendering/render_frames.moc: Added.
+ * khtml/rendering/render_replaced.moc: Added.
+ * khtml/xml/dom_docimpl.moc: Added.
+ * khtml/xml/xml_tokenizer.moc: Added.
+
+ * kwq/kwqdebug.mm: Make some globals private.
+
2002-04-25 Darin Adler <darin at apple.com>
* kwq/KWQMetrics.h: Add NSObject to required protocols for
diff --git a/WebCore/khtml/Makefile.am b/WebCore/khtml/Makefile.am
index 0ce13e7..0fca5d9 100644
--- a/WebCore/khtml/Makefile.am
+++ b/WebCore/khtml/Makefile.am
@@ -35,11 +35,3 @@ INCLUDES = \
$(KWQ_INCLUDES) \
$(KDELIBS_INCLUDES) \
$(NULL)
-
-khtmlview.moc:
- echo '#include <khtmlview.h>' > $@
-
-BUILT_SOURCES = khtmlview.moc
-
-CLEANFILES = $(BUILT_SOURCES)
-
diff --git a/WebCore/khtml/css/Makefile.am b/WebCore/khtml/css/Makefile.am
index b40668f..78303a8 100644
--- a/WebCore/khtml/css/Makefile.am
+++ b/WebCore/khtml/css/Makefile.am
@@ -45,15 +45,15 @@ INCLUDES = \
$(VALUEFILES): value-stamp
-value-stamp: makevalues
- sh ./makevalues
- touch ./value-stamp
+value-stamp: makevalues cssvalues.in
+ sh $<
+ touch $@
$(PROPFILES): prop-stamp
-prop-stamp: makeprop
- sh ./makeprop
- touch ./prop-stamp
+prop-stamp: makeprop cssproperties.in
+ sh $<
+ touch $@
BUILT_SOURCES = $(VALUEFILES) $(PROPFILES) value-stamp prop-stamp
diff --git a/WebCore/khtml/ecma/Makefile.am b/WebCore/khtml/ecma/Makefile.am
index 9005e0e..eeba373 100644
--- a/WebCore/khtml/ecma/Makefile.am
+++ b/WebCore/khtml/ecma/Makefile.am
@@ -29,24 +29,11 @@ libkhtmlecma_o_SOURCES = \
kjs_window.h \
$(NULL)
-# FIXME - can't build ecma test because kwq is not yet built at this point
-#
-# noinst_PROGRAMS = testecma
-#
-# testecma_SOURCES = \
-# testecma.cpp \
-# $(NULL)
-#
-# testecma_LDADD = ./libkhtmlecma.a
-
INCLUDES = \
$(KWQ_INCLUDES) \
$(KDELIBS_INCLUDES) \
$(NULL)
-kjs_window.moc:
- touch $@
-
LUT_FILES = \
kjs_css.lut.h \
kjs_dom.lut.h \
@@ -64,8 +51,5 @@ CREATE_HASH_TABLE = $(top_srcdir)/JavaScriptCore/kjs/create_hash_table
%.lut.h: %.cpp $(CREATE_HASH_TABLE)
$(CREATE_HASH_TABLE) $< > $@
-
-BUILT_SOURCES = kjs_window.moc $(LUT_FILES)
+BUILT_SOURCES = $(LUT_FILES)
CLEANFILES = $(BUILT_SOURCES)
-
-
diff --git a/JavaScriptCore/dummy.cpp b/WebCore/khtml/ecma/kjs_window.moc
similarity index 100%
copy from JavaScriptCore/dummy.cpp
copy to WebCore/khtml/ecma/kjs_window.moc
diff --git a/WebCore/khtml/html/Makefile.am b/WebCore/khtml/html/Makefile.am
index 4548964..7322c17 100644
--- a/WebCore/khtml/html/Makefile.am
+++ b/WebCore/khtml/html/Makefile.am
@@ -44,17 +44,11 @@ INCLUDES = \
-I. \
$(NULL)
-htmltokenizer.moc:
- touch $@
-
-html_documentimpl.moc:
- touch $@
-
noinst_HEADERS = kentities.c
kentities.c: kentities.gperf
$(GPERF) -a -L "ANSI-C" -C -G -c -o -t -k '*' -NfindEntity -D -s 2 $< > $@
-BUILT_SOURCES = $(noinst_HEADERS) htmltokenizer.moc html_documentimpl.moc
+BUILT_SOURCES = $(noinst_HEADERS)
CLEANFILES = $(BUILT_SOURCES)
diff --git a/JavaScriptCore/dummy.cpp b/WebCore/khtml/html/html_documentimpl.moc
similarity index 100%
copy from JavaScriptCore/dummy.cpp
copy to WebCore/khtml/html/html_documentimpl.moc
diff --git a/JavaScriptCore/dummy.cpp b/WebCore/khtml/html/htmltokenizer.moc
similarity index 100%
copy from JavaScriptCore/dummy.cpp
copy to WebCore/khtml/html/htmltokenizer.moc
diff --git a/WebCore/khtml/java/Makefile.am b/WebCore/khtml/java/Makefile.am
index f3d6f19..bee848a 100644
--- a/WebCore/khtml/java/Makefile.am
+++ b/WebCore/khtml/java/Makefile.am
@@ -19,38 +19,7 @@ libkhtmljava_o_SOURCES = \
kjavaprocess.h \
$(NULL)
-
INCLUDES = \
$(KWQ_INCLUDES) \
$(KDELIBS_INCLUDES) \
$(NULL)
-
-
-kjavaapplet.moc:
- touch $@
-
-kjavaappletcontext.moc:
- touch $@
-
-kjavaappletserver.moc:
- touch $@
-
-kjavaappletwidget.moc:
- touch $@
-
-kjavadownloader.moc:
- touch $@
-
-kjavaprocess.moc:
- touch $@
-
-BUILT_SOURCES = \
- kjavaapplet.moc \
- kjavaappletcontext.moc \
- kjavaappletserver.moc \
- kjavaappletwidget.moc \
- kjavadownloader.moc \
- kjavaprocess.moc \
- $(NULL)
-
-CLEANFILES = $(BUILT_SOURCES)
diff --git a/JavaScriptCore/dummy.cpp b/WebCore/khtml/java/kjavaapplet.moc
similarity index 100%
copy from JavaScriptCore/dummy.cpp
copy to WebCore/khtml/java/kjavaapplet.moc
diff --git a/JavaScriptCore/dummy.cpp b/WebCore/khtml/java/kjavaappletcontext.moc
similarity index 100%
copy from JavaScriptCore/dummy.cpp
copy to WebCore/khtml/java/kjavaappletcontext.moc
diff --git a/JavaScriptCore/dummy.cpp b/WebCore/khtml/java/kjavaappletserver.moc
similarity index 100%
copy from JavaScriptCore/dummy.cpp
copy to WebCore/khtml/java/kjavaappletserver.moc
diff --git a/JavaScriptCore/dummy.cpp b/WebCore/khtml/java/kjavaappletwidget.moc
similarity index 100%
copy from JavaScriptCore/dummy.cpp
copy to WebCore/khtml/java/kjavaappletwidget.moc
diff --git a/JavaScriptCore/dummy.cpp b/WebCore/khtml/java/kjavadownloader.moc
similarity index 100%
copy from JavaScriptCore/dummy.cpp
copy to WebCore/khtml/java/kjavadownloader.moc
diff --git a/JavaScriptCore/dummy.cpp b/WebCore/khtml/java/kjavaprocess.moc
similarity index 100%
copy from JavaScriptCore/dummy.cpp
copy to WebCore/khtml/java/kjavaprocess.moc
diff --git a/WebCore/khtml/khtmlview.moc b/WebCore/khtml/khtmlview.moc
new file mode 100644
index 0000000..4055f1f
--- /dev/null
+++ b/WebCore/khtml/khtmlview.moc
@@ -0,0 +1 @@
+#include <khtmlview.h>
diff --git a/WebCore/khtml/misc/Makefile.am b/WebCore/khtml/misc/Makefile.am
index 3dcf0a9..287c32b 100644
--- a/WebCore/khtml/misc/Makefile.am
+++ b/WebCore/khtml/misc/Makefile.am
@@ -44,21 +44,18 @@ ATTRSFILES = \
htmlattrs.gperf \
$(NULL)
-khtmldata.h:
- touch $@
-
$(TAGFILES): tag-stamp
-tag-stamp: maketags
- perl ./maketags
- touch ./tag-stamp
+tag-stamp: maketags htmltags.in
+ perl $<
+ touch $@
$(ATTRSFILES): attr-stamp
-attr-stamp: makeattrs
- perl ./makeattrs
- touch ./attr-stamp
+attr-stamp: makeattrs htmlattrs.in
+ perl $<
+ touch $@
-BUILT_SOURCES = khtmldata.h $(TAGFILES) $(ATTRSFILES) tag-stamp attr-stamp
+BUILT_SOURCES = $(TAGFILES) $(ATTRSFILES) tag-stamp attr-stamp
CLEANFILES = $(BUILT_SOURCES)
diff --git a/JavaScriptCore/dummy.cpp b/WebCore/khtml/misc/khtmldata.h
similarity index 100%
copy from JavaScriptCore/dummy.cpp
copy to WebCore/khtml/misc/khtmldata.h
diff --git a/WebCore/khtml/rendering/Makefile.am b/WebCore/khtml/rendering/Makefile.am
index f887fd9..c891dbe 100644
--- a/WebCore/khtml/rendering/Makefile.am
+++ b/WebCore/khtml/rendering/Makefile.am
@@ -47,26 +47,7 @@ libkhtmlrendering_o_SOURCES = \
render_text.h \
$(NULL)
-
INCLUDES = \
$(KWQ_INCLUDES) \
$(KDELIBS_INCLUDES) \
$(NULL)
-
-render_form.moc:
- touch $@
-
-render_frames.moc:
- touch $@
-
-render_replaced.moc:
- touch $@
-
-BUILT_SOURCES = \
- render_form.moc \
- render_frames.moc \
- render_replaced.moc \
- $(NULL)
-
-CLEANFILES = $(BUILT_SOURCES)
-
diff --git a/JavaScriptCore/dummy.cpp b/WebCore/khtml/rendering/render_form.moc
similarity index 100%
copy from JavaScriptCore/dummy.cpp
copy to WebCore/khtml/rendering/render_form.moc
diff --git a/JavaScriptCore/dummy.cpp b/WebCore/khtml/rendering/render_frames.moc
similarity index 100%
copy from JavaScriptCore/dummy.cpp
copy to WebCore/khtml/rendering/render_frames.moc
diff --git a/JavaScriptCore/dummy.cpp b/WebCore/khtml/rendering/render_replaced.moc
similarity index 100%
copy from JavaScriptCore/dummy.cpp
copy to WebCore/khtml/rendering/render_replaced.moc
diff --git a/WebCore/khtml/xml/Makefile.am b/WebCore/khtml/xml/Makefile.am
index 6e3c0d8..098af71 100644
--- a/WebCore/khtml/xml/Makefile.am
+++ b/WebCore/khtml/xml/Makefile.am
@@ -33,13 +33,3 @@ INCLUDES = \
$(KWQ_INCLUDES) \
$(KDELIBS_INCLUDES) \
$(NULL)
-
-dom_docimpl.moc:
- touch $@
-
-xml_tokenizer.moc:
- touch $@
-
-BUILT_SOURCES = dom_docimpl.moc xml_tokenizer.moc
-
-CLEANFILES = $(BUILT_SOURCES)
diff --git a/JavaScriptCore/dummy.cpp b/WebCore/khtml/xml/dom_docimpl.moc
similarity index 100%
copy from JavaScriptCore/dummy.cpp
copy to WebCore/khtml/xml/dom_docimpl.moc
diff --git a/JavaScriptCore/dummy.cpp b/WebCore/khtml/xml/xml_tokenizer.moc
similarity index 100%
copy from JavaScriptCore/dummy.cpp
copy to WebCore/khtml/xml/xml_tokenizer.moc
diff --git a/WebCore/kwq/kwqdebug.mm b/WebCore/kwq/kwqdebug.mm
index 219efc5..df6d015 100644
--- a/WebCore/kwq/kwqdebug.mm
+++ b/WebCore/kwq/kwqdebug.mm
@@ -27,13 +27,13 @@
#ifndef xNDEBUG
-unsigned int KWQ_LOG_LEVEL = 0;
+static unsigned int KWQ_LOG_LEVEL = 0;
void KWQSetLogLevel(int mask) {
KWQ_LOG_LEVEL = mask;
}
-bool kwq_checkedDefault = 0;
+static bool kwq_checkedDefault = 0;
unsigned int KWQGetLogLevel(){
if (!kwq_checkedDefault){
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list