]>
Commit | Line | Data |
---|---|---|
5cc0a050 ER |
1 | --- mozilla/allmakefiles.sh~ 2007-04-03 22:04:34.000000000 +0300 |
2 | +++ mozilla/allmakefiles.sh 2007-06-04 14:02:26.641218344 +0300 | |
428ab583 ER |
3 | @@ -1561,6 +1561,14 @@ |
4 | sql ) MAKEFILES_extensions="$MAKEFILES_extensions | |
5 | $MAKEFILES_sql" | |
6 | ;; | |
7 | + | |
8 | + tidy ) MAKEFILES_extensions="$MAKEFILES_extensions | |
9 | + extensions/tidy/Makefile | |
10 | + extensions/tidy/src/Makefile | |
11 | + extensions/tidy/test/Makefile | |
12 | + extensions/tidy/spvalid/Makefile | |
13 | + " ;; | |
14 | + | |
15 | schema-validation ) MAKEFILES_extensions="$MAKEFILES_extensions | |
16 | extensions/schema-validation/Makefile | |
17 | extensions/schema-validation/public/Makefile | |
c29a4afc ER |
18 | --- mozilla/configure~ 2007-06-04 14:32:43.192411445 +0300 |
19 | +++ mozilla/configure 2007-06-04 17:01:47.504921162 +0300 | |
20 | @@ -13168,7 +13168,7 @@ | |
21 | MOZ_PHOENIX=1 | |
22 | MOZ_SAFE_BROWSING=1 | |
23 | MOZ_APP_VERSION=$FIREFOX_VERSION | |
24 | - MOZ_EXTENSIONS_DEFAULT=" cookie xml-rpc xmlextras pref transformiix universalchardet webservices inspector gnomevfs auth permissions reporter spellcheck" | |
25 | + MOZ_EXTENSIONS_DEFAULT=" tidy cookie xml-rpc xmlextras pref transformiix universalchardet webservices inspector gnomevfs auth permissions reporter spellcheck" | |
26 | cat >> confdefs.h <<\EOF | |
27 | #define MOZ_PHOENIX 1 | |
28 | EOF | |
29 | --- mozilla/configure.in~ 2007-06-04 14:32:42.892404643 +0300 | |
30 | +++ mozilla/configure.in 2007-06-04 17:02:06.255346400 +0300 | |
31 | @@ -4329,7 +4329,7 @@ | |
32 | MOZ_PHOENIX=1 | |
33 | MOZ_SAFE_BROWSING=1 | |
34 | MOZ_APP_VERSION=$FIREFOX_VERSION | |
35 | - MOZ_EXTENSIONS_DEFAULT=" cookie xml-rpc xmlextras pref transformiix universalchardet webservices inspector gnomevfs auth permissions reporter spellcheck" | |
36 | + MOZ_EXTENSIONS_DEFAULT=" tidy cookie xml-rpc xmlextras pref transformiix universalchardet webservices inspector gnomevfs auth permissions reporter spellcheck" | |
37 | AC_DEFINE(MOZ_PHOENIX) | |
38 | ;; | |
39 | ||
6a200fc1 ER |
40 | --- mozilla/extensions/tidy/src/Makefile.in~ 2007-09-04 23:38:53.000000000 +0300 |
41 | +++ mozilla/extensions/tidy/src/Makefile.in 2007-09-04 23:49:39.434545403 +0300 | |
42 | @@ -104,7 +104,7 @@ | |
43 | ||
44 | EXTRA_DSO_LDOPTS += \ | |
3ef384de ER |
45 | $(NSPR_LIBS) \ |
46 | - $(LIB_PREFIX)osp.$(LIB_SUFFIX) \ | |
47 | + -losp \ | |
48 | $(NULL) | |
49 | ||
6a200fc1 ER |
50 | include $(topsrcdir)/config/rules.mk |
51 | --- mozilla/extensions/tidy/src/Makefile.in~ 2007-09-04 23:49:39.000000000 +0300 | |
52 | +++ mozilla/extensions/tidy/src/Makefile.in 2007-09-04 23:50:13.205311926 +0300 | |
53 | @@ -111,6 +111,6 @@ | |
54 | ||
55 | INCLUDES += -I$(srcdir)/../tidy/include | |
56 | INCLUDES += -I$(srcdir)/../tidy/src | |
ea31e368 | 57 | -INCLUDES += -I$(srcdir)/../opensp/include |
ea31e368 | 58 | +INCLUDES += -I/usr/include/OpenSP |
6a200fc1 ER |
59 | INCLUDES += -I$(srcdir)/. |
60 | ||
be7ed01a ER |
61 | --- mozilla/extensions/tidy/src/Makefile.in~ 2007-09-05 01:41:08.000000000 +0300 |
62 | +++ mozilla/extensions/tidy/src/Makefile.in 2007-09-05 12:21:13.420348101 +0300 | |
96232f52 ER |
63 | @@ -103,6 +103,7 @@ |
64 | endif | |
65 | ||
66 | EXTRA_DSO_LDOPTS += \ | |
67 | + $(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \ | |
68 | $(NSPR_LIBS) \ | |
69 | -losp \ | |
70 | $(NULL) | |
6a200fc1 ER |
71 | --- mozilla/extensions/tidy/src/SpValid.cpp~ 2007-08-27 10:38:12.000000000 +0300 |
72 | +++ mozilla/extensions/tidy/src/SpValid.cpp 2007-09-04 23:53:25.049666582 +0300 | |
3ef384de ER |
73 | @@ -9,7 +9,7 @@ |
74 | #ifdef WIN32 | |
75 | #include "../opensp/include/config.h" | |
76 | #else | |
77 | -#include "../opensp/config.h" | |
78 | +#include <OpenSP/config.h> | |
79 | #endif | |
80 | ||
81 | #include "nsMemory.h" | |
43eb8780 ER |
82 | @@ -19,13 +19,13 @@ |
83 | ||
84 | #include <stdlib.h> | |
85 | ||
6a200fc1 | 86 | -#include "../opensp/include/MessageEventHandler.h" |
43eb8780 | 87 | -#include "NsgmlsMessages.h" |
6a200fc1 | 88 | -#include "../opensp/include/sptchar.h" |
43eb8780 ER |
89 | +#include <OpenSP/MessageEventHandler.h> |
90 | +#include <OpenSP/nsgmls/NsgmlsMessages.h> | |
91 | +#include <OpenSP/sptchar.h> | |
92 | #include "SpValid.h" | |
6a200fc1 ER |
93 | -#include "../opensp/include/InternalInputSource.h" |
94 | +#include <OpenSP/InternalInputSource.h> | |
43eb8780 | 95 | |
6a200fc1 | 96 | -#include "../opensp/include/Parser.h" |
43eb8780 | 97 | +#include <OpenSP/lib/Parser.h> |
43eb8780 ER |
98 | |
99 | #ifdef SP_NAMESPACE | |
100 | using namespace SP_NAMESPACE; |