Hello aa,
I'd like you to do a code review. Please execute
g4 diff -c 14259259
or point your web browser to
http://mondrian/14259259
(this changelist has been uploaded to Mondrian)
to review the following code:
Change 14259259 by z...@zork-gears on 2010/01/15 16:00:53 *pending*
Update Gears build to support Firefox 3.6
PRESUBMIT=passed
R=aa
[email protected]
DELTA=98 (73 added, 0 deleted, 25 changed)
OCL=14259259
Affected files ...
... //depot/googleclient/gears/opensource/gears/Makefile#247 edit
... //depot/googleclient/gears/opensource/gears/base/firefox/install.rdf.m4#6
edit
...
//depot/googleclient/gears/opensource/gears/base/firefox/static_files/components/stub.js#1
edit
...
//depot/googleclient/gears/opensource/gears/localserver/firefox/cache_intercept.cc#16
edit
... //depot/googleclient/gears/opensource/gears/tools/config.mk#111 edit
... //depot/googleclient/gears/opensource/gears/tools/rules.mk#111 edit
... //depot/googleclient/gears/opensource/gears/tools/sanity.mk#8 edit
98 delta lines: 73 added, 0 deleted, 25 changed
Also consider running:
g4 lint -c 14259259
which verifies that the changelist doesn't introduce new style violations.
If you can't do the review, please let me know as soon as possible. During
your review, please ensure that all new code has corresponding unit tests and
that existing unit tests are updated appropriately. Visit
http://www/eng/code_review.html for more information.
This is a semiautomated message from "g4 mail". Complaints or suggestions?
Mail [email protected].
Change 14259259 by z...@zork-gears on 2010/01/15 16:00:53 *pending*
Update Gears build to support Firefox 3.6
Affected files ...
... //depot/googleclient/gears/opensource/gears/Makefile#247 edit
... //depot/googleclient/gears/opensource/gears/base/firefox/install.rdf.m4#6
edit
...
//depot/googleclient/gears/opensource/gears/base/firefox/static_files/components/stub.js#1
edit
...
//depot/googleclient/gears/opensource/gears/localserver/firefox/cache_intercept.cc#16
edit
... //depot/googleclient/gears/opensource/gears/tools/config.mk#111 edit
... //depot/googleclient/gears/opensource/gears/tools/rules.mk#111 edit
... //depot/googleclient/gears/opensource/gears/tools/sanity.mk#8 edit
==== //depot/googleclient/gears/opensource/gears/Makefile#247 -
d:\clients\src-gears/googleclient/gears/opensource/gears/Makefile ====
# action=edit type=text
--- googleclient/gears/opensource/gears/Makefile 2010-01-15
15:58:43.000000000 -0800
+++ googleclient/gears/opensource/gears/Makefile 2010-01-15
13:26:13.000000000 -0800
@@ -2258,13 +2258,19 @@
FF2_IDLSRCS += $(FF3_IDLSRCS)
FF2_CPPSRCS += $(FF3_CPPSRCS)
-# Add any hard-coded "FF3_" sources to the FF31_ sources.
+# Add any hard-coded "FF3_" sources to the FF31_ and FF36_ sources.
FF31_VPATH += $(FF3_VPATH)
FF31_M4SRCS += $(FF3_M4SRCS)
FF31_M4SRCS_I18N += $(FF3_M4SRCS_I18N)
FF31_IDLSRCS += $(FF3_IDLSRCS)
FF31_CPPSRCS += $(FF3_CPPSRCS)
+
+FF36_VPATH += $(FF3_VPATH)
+FF36_M4SRCS += $(FF3_M4SRCS)
+FF36_M4SRCS_I18N += $(FF3_M4SRCS_I18N)
+FF36_IDLSRCS += $(FF3_IDLSRCS)
+FF36_CPPSRCS += $(FF3_CPPSRCS)
# Chrome-specific hackery. Chrome is built with BROWSER=NPAPI and OS=win32.
==== //depot/googleclient/gears/opensource/gears/base/firefox/install.rdf.m4#6
-
d:\clients\src-gears/googleclient/gears/opensource/gears/base/firefox/install.rdf.m4
====
# action=edit type=text
--- googleclient/gears/opensource/gears/base/firefox/install.rdf.m4
2010-01-15 15:58:43.000000000 -0800
+++ googleclient/gears/opensource/gears/base/firefox/install.rdf.m4
2010-01-15 14:57:12.000000000 -0800
@@ -68,7 +68,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>1.5</em:minVersion>
- <em:maxVersion>3.5.*</em:maxVersion>
+ <em:maxVersion>3.6.*</em:maxVersion>
</Description>
</em:targetApplication>
====
//depot/googleclient/gears/opensource/gears/base/firefox/static_files/components/stub.js#1
-
d:\clients\src-gears/googleclient/gears/opensource/gears/base/firefox/static_files/components/stub.js
====
# action=edit type=text
---
googleclient/gears/opensource/gears/base/firefox/static_files/components/stub.js
2010-01-15 15:58:43.000000000 -0800
+++
googleclient/gears/opensource/gears/base/firefox/static_files/components/stub.js
2010-01-15 15:07:40.000000000 -0800
@@ -53,6 +53,10 @@
if (firefoxVersion == "3.5") {
return "ff35";
}
+
+ if (firefoxVersion == "3.6") {
+ return "ff36";
+ }
throw "Unexpected Firefox version: " + firefoxVersion;
}
====
//depot/googleclient/gears/opensource/gears/localserver/firefox/cache_intercept.cc#16
-
d:\clients\src-gears/googleclient/gears/opensource/gears/localserver/firefox/cache_intercept.cc
====
# action=edit type=text
--- googleclient/gears/opensource/gears/localserver/firefox/cache_intercept.cc
2010-01-15 15:58:43.000000000 -0800
+++ googleclient/gears/opensource/gears/localserver/firefox/cache_intercept.cc
2010-01-15 14:29:12.000000000 -0800
@@ -601,7 +601,7 @@
return NS_OK;
}
-#if BROWSER_FF3
+#if defined(BROWSER_FF3) && !defined(BROWSER_FF36)
NS_IMETHODIMP CacheIntercept::CreateTemporaryClientID(
nsCacheStoragePolicy policy,
nsACString &retval) {
==== //depot/googleclient/gears/opensource/gears/tools/config.mk#111 -
d:\clients\src-gears/googleclient/gears/opensource/gears/tools/config.mk ====
# action=edit type=text
--- googleclient/gears/opensource/gears/tools/config.mk 2010-01-15
15:58:43.000000000 -0800
+++ googleclient/gears/opensource/gears/tools/config.mk 2010-01-15
14:20:27.000000000 -0800
@@ -228,7 +228,11 @@
ifeq ($(BROWSER),FF3)
GECKO_BASE = ../third_party/gecko_1.9
else
+ifeq ($(BROWSER),FF31)
GECKO_BASE = ../third_party/gecko_1.9.1
+else
+GECKO_BASE = ../third_party/gecko_1.9.2
+endif
endif
endif
GECKO_BIN = $(GECKO_SDK)/gecko_sdk/bin
@@ -246,12 +250,14 @@
FF2_CPPFLAGS += -DBROWSER_FF=1
FF3_CPPFLAGS += -DBROWSER_FF=1
FF31_CPPFLAGS += -DBROWSER_FF3=1 -DBROWSER_FF=1
+FF36_CPPFLAGS += -DBROWSER_FF31=1 -DBROWSER_FF3=1 -DBROWSER_FF=1
# FF2/FF3_CPPFLAGS includes several different base paths of GECKO_SDK because
# different sets of files include SDK/internal files differently.
FF2_CPPFLAGS += -I$(GECKO_BASE) -I$(GECKO_SDK)
-I$(GECKO_SDK)/gecko_sdk/include -DMOZILLA_STRICT_API
FF3_CPPFLAGS += -I$(GECKO_BASE) -I$(GECKO_SDK)
-I$(GECKO_SDK)/gecko_sdk/include -DMOZILLA_STRICT_API
FF31_CPPFLAGS += -I$(GECKO_BASE) -I$(GECKO_SDK)
-I$(GECKO_SDK)/gecko_sdk/include -DMOZILLA_STRICT_API
+FF36_CPPFLAGS += -I$(GECKO_BASE) -I$(GECKO_SDK)
-I$(GECKO_SDK)/gecko_sdk/include -DMOZILLA_STRICT_API
IE_CPPFLAGS +=
CHROME_CPPFLAGS += -I../third_party/v8/bindings_local
@@ -564,6 +570,7 @@
FF2_LIBS = -L$(GECKO_SDK_LIB) -lxpcom -lxpcomglue_s
FF3_LIBS = -L$(GECKO_SDK_LIB) -lxpcom -lxpcomglue_s
FF31_LIBS = -L$(GECKO_SDK_LIB) -lxpcom -lxpcomglue_s
+FF36_LIBS = -L$(GECKO_SDK_LIB) -lxpcom -lxpcomglue_s
# Append differences here:
# Although the 1.9 SDK contains libnspr4, it is better to link against libxul,
# which in turn depends on libnspr4. In Ubuntu 8.04, libnspr4 was not listed in
@@ -571,6 +578,7 @@
FF2_LIBS += -lnspr4
FF3_LIBS += -lxul
FF31_LIBS += -lxul
+FF36_LIBS += -lxul
endif
######################################################################
@@ -736,10 +744,12 @@
FF2_LIBS = -L$(GECKO_SDK)/gecko_sdk/lib -lxpcom -lmozjs -lnspr4 -lplds4 -lplc4
FF3_LIBS = -L$(GECKO_SDK)/gecko_sdk/lib -lxpcom -lmozjs -lnspr4 -lplds4 -lplc4
FF31_LIBS = -L$(GECKO_SDK)/gecko_sdk/lib -lxpcom -lmozjs -lnspr4 -lplds4 -lplc4
+FF36_LIBS = -L$(GECKO_SDK)/gecko_sdk/lib -lxpcom -lmozjs -lnspr4 -lplds4 -lplc4
# Append differences here:
FF2_LIBS += -lxpcom_core
FF3_LIBS += $(GECKO_SDK)/gecko_sdk/lib/XUL
$(GECKO_SDK)/gecko_sdk/lib/libxpcomglue_s.a -lsqlite3 -lsmime3 -lssl3 -lnss3
-lnssutil3 -lsoftokn3
FF31_LIBS += $(GECKO_SDK)/gecko_sdk/lib/XUL
$(GECKO_SDK)/gecko_sdk/lib/libxpcomglue_s.a
+FF36_LIBS += $(GECKO_SDK)/gecko_sdk/lib/XUL
$(GECKO_SDK)/gecko_sdk/lib/libxpcomglue_s.a
# Iceberg command line tool.
ICEBERG = /usr/local/bin/freeze
@@ -896,6 +906,7 @@
FF2_DLLFLAGS =
FF3_DLLFLAGS =
FF31_DLLFLAGS =
+FF36_DLLFLAGS =
IE_DLLFLAGS = /DEF:tools/mscom.def
CHROME_DLLFLAGS = /DEF:base/chrome/module.def
@@ -926,6 +937,7 @@
FF2_LIBS = $(GECKO_LIB)/xpcom.lib $(GECKO_LIB)/xpcomglue_s.lib
$(GECKO_LIB)/nspr4.lib $(GECKO_LIB)/js3250.lib ole32.lib shell32.lib
shlwapi.lib advapi32.lib wininet.lib comdlg32.lib user32.lib
FF3_LIBS = $(GECKO_LIB)/xpcom.lib $(GECKO_LIB)/xpcomglue_s.lib
$(GECKO_LIB)/nspr4.lib $(GECKO_LIB)/js3250.lib ole32.lib shell32.lib
shlwapi.lib advapi32.lib wininet.lib comdlg32.lib user32.lib
FF31_LIBS = $(GECKO_LIB)/xpcom.lib $(GECKO_LIB)/xpcomglue_s.lib
$(GECKO_LIB)/nspr4.lib $(GECKO_LIB)/js3250.lib ole32.lib shell32.lib
shlwapi.lib advapi32.lib wininet.lib comdlg32.lib user32.lib
+FF36_LIBS = $(GECKO_LIB)/xpcom.lib $(GECKO_LIB)/xpcomglue_s.lib
$(GECKO_LIB)/nspr4.lib $(GECKO_LIB)/js3250.lib ole32.lib shell32.lib
shlwapi.lib advapi32.lib wininet.lib comdlg32.lib user32.lib
ifeq ($(OS),win32)
IE_LIBS = kernel32.lib user32.lib gdi32.lib gdiplus.lib uuid.lib sensapi.lib
shlwapi.lib shell32.lib advapi32.lib wininet.lib comdlg32.lib user32.lib
else # wince
==== //depot/googleclient/gears/opensource/gears/tools/rules.mk#111 -
d:\clients\src-gears/googleclient/gears/opensource/gears/tools/rules.mk ====
# action=edit type=text
--- googleclient/gears/opensource/gears/tools/rules.mk 2010-01-15
15:58:43.000000000 -0800
+++ googleclient/gears/opensource/gears/tools/rules.mk 2010-01-15
13:38:49.000000000 -0800
@@ -47,6 +47,7 @@
FF2_OUTDIR = $(OUTDIR)/$(OS)-$(ARCH)/ff2
FF3_OUTDIR = $(OUTDIR)/$(OS)-$(ARCH)/ff3
FF31_OUTDIR = $(OUTDIR)/$(OS)-$(ARCH)/ff31
+FF36_OUTDIR = $(OUTDIR)/$(OS)-$(ARCH)/ff36
IE_OUTDIR = $(OUTDIR)/$(OS)-$(ARCH)/ie
IEMOBILE_OUTDIR = $(OUTDIR)/$(OS)-$(ARCH)/iemobile
NONE_OUTDIR = $(OUTDIR)/$(OS)-$(ARCH)/none
@@ -121,12 +122,12 @@
ui/common/location_data.png \
$(NULL)
-FF31_RESOURCES = \
- $(FF31_OUTDIR)/genfiles/browser-overlay.js \
- $(FF31_OUTDIR)/genfiles/browser-overlay.xul \
- $(FF31_OUTDIR)/genfiles/permissions_dialog.html \
- $(FF31_OUTDIR)/genfiles/settings_dialog.html \
- $(FF31_OUTDIR)/genfiles/shortcuts_dialog.html \
+FF36_RESOURCES = \
+ $(FF36_OUTDIR)/genfiles/browser-overlay.js \
+ $(FF36_OUTDIR)/genfiles/browser-overlay.xul \
+ $(FF36_OUTDIR)/genfiles/permissions_dialog.html \
+ $(FF36_OUTDIR)/genfiles/settings_dialog.html \
+ $(FF36_OUTDIR)/genfiles/shortcuts_dialog.html \
$(NULL)
# End: resource lists that MUST be kept in sync with "win32_msi.wxs.m4"
@@ -167,8 +168,8 @@
$(BROWSER)_GEN_HEADERS = \
$(patsubst
%.idl,$($(BROWSER)_OUTDIR)/genfiles/%.h,$($(BROWSER)_IDLSRCS))
-FF31_GEN_TYPELIBS = \
- $(patsubst %.idl,$(FF31_OUTDIR)/genfiles/%.xpt,$(FF31_IDLSRCS))
+FF36_GEN_TYPELIBS = \
+ $(patsubst %.idl,$(FF36_OUTDIR)/genfiles/%.xpt,$(FF36_IDLSRCS))
IE_OBJS += \
$(patsubst %.idl,$(IE_OUTDIR)/%_i$(OBJ_SUFFIX),$(IE_IDLSRCS))
@@ -233,6 +234,7 @@
FF2_MODULE_DLL = $(FF2_OUTDIR)/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
FF3_MODULE_DLL = $(FF3_OUTDIR)/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
FF31_MODULE_DLL = $(FF31_OUTDIR)/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
+FF36_MODULE_DLL = $(FF36_OUTDIR)/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
IE_MODULE_DLL = $(IE_OUTDIR)/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
IEMOBILE_MODULE_DLL = $(IEMOBILE_OUTDIR)/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
NPAPI_MODULE_DLL = $(NPAPI_OUTDIR)/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
@@ -241,7 +243,7 @@
OPERA_MODULE_DLL = $(OPERA_OUTDIR)/$(DLL_PREFIX)$(MODULE)op$(DLL_SUFFIX)
SF_MODULE_DLL = $(SF_OUTDIR)/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
-FF31_MODULE_TYPELIB = $(FF31_OUTDIR)/$(MODULE).xpt
+FF36_MODULE_TYPELIB = $(FF36_OUTDIR)/$(MODULE).xpt
IEMOBILE_WINCESETUP_DLL = $(IEMOBILE_OUTDIR)/$(DLL_PREFIX)setup$(DLL_SUFFIX)
OPERA_WINCESETUP_DLL = $(OPERA_OUTDIR)/$(DLL_PREFIX)setup$(DLL_SUFFIX)
SF_INPUTMANAGER_EXE = $(SF_OUTDIR)/$(EXE_PREFIX)GearsEnabler$(EXE_SUFFIX)
@@ -326,6 +328,10 @@
$(MAKE) genheaders BROWSER=FF31
$(MAKE) modules BROWSER=FF31
+ $(MAKE) prereqs BROWSER=FF36
+ $(MAKE) genheaders BROWSER=FF36
+ $(MAKE) modules BROWSER=FF36
+
$(MAKE) installers
else
@@ -346,6 +352,10 @@
$(MAKE) prereqs BROWSER=FF31
$(MAKE) genheaders BROWSER=FF31
$(MAKE) modules BROWSER=FF31
+
+ $(MAKE) prereqs BROWSER=FF36
+ $(MAKE) genheaders BROWSER=FF36
+ $(MAKE) modules BROWSER=FF36
$(MAKE) prereqs BROWSER=IE
$(MAKE) genheaders BROWSER=IE
@@ -392,6 +402,10 @@
$(MAKE) prereqs BROWSER=FF31
$(MAKE) genheaders BROWSER=FF31
$(MAKE) modules BROWSER=FF31
+
+ $(MAKE) prereqs BROWSER=FF36
+ $(MAKE) genheaders BROWSER=FF36
+ $(MAKE) modules BROWSER=FF36
$(MAKE) prereqs BROWSER=SF
$(MAKE) genheaders BROWSER=SF
@@ -447,7 +461,11 @@
endif
ifeq ($(BROWSER),FF31)
-modules:: $(FF31_MODULE_DLL) $(FF31_MODULE_TYPELIB)
+modules:: $(FF31_MODULE_DLL)
+endif
+
+ifeq ($(BROWSER),FF36)
+modules:: $(FF36_MODULE_DLL) $(FF36_MODULE_TYPELIB)
endif
ifeq ($(BROWSER),IE)
@@ -669,6 +687,11 @@
$(FF31_OUTDIR)/genfiles/%.xpt: %.idl
$(GECKO_BIN)/xpidl -I $(GECKO_SDK)/gecko_sdk/idl -I $(GECKO_BASE) -m
typelib -o $(FF31_OUTDIR)/genfiles/$* $<
+$(FF36_OUTDIR)/genfiles/%.h: %.idl
+ $(GECKO_BIN)/xpidl -I $(GECKO_SDK)/gecko_sdk/idl -I $(GECKO_BASE) -m
header -o $(FF36_OUTDIR)/genfiles/$* $<
+$(FF36_OUTDIR)/genfiles/%.xpt: %.idl
+ $(GECKO_BIN)/xpidl -I $(GECKO_SDK)/gecko_sdk/idl -I $(GECKO_BASE) -m
typelib -o $(FF36_OUTDIR)/genfiles/$* $<
+
$(IE_OUTDIR)/genfiles/%.h: %.idl
midl $(CPPFLAGS) -env win32 -Oicf -tlb "$(@D)/$*.tlb" -h "$(@D)/$*.h"
-iid "$(IE_OUTDIR)/$*_i.c" -proxy "$(IE_OUTDIR)/$*_p.c" -dlldata
"$(IE_OUTDIR)/$*_d.c" $<
@@ -814,6 +837,9 @@
$(RC) $(RCFLAGS) /DBROWSER_FF3=1 $<
$(FF31_OUTDIR)/%.res: %.rc $(COMMON_RESOURCES)
+ $(RC) $(RCFLAGS) /DBROWSER_FF3=1 $<
+
+$(FF36_OUTDIR)/%.res: %.rc $(COMMON_RESOURCES)
$(RC) $(RCFLAGS) /DBROWSER_FF3=1 $<
$(NPAPI_OUTDIR)/%.res: %.rc $(COMMON_RESOURCES)
@@ -944,7 +970,7 @@
THIRD_PARTY_OBJS1 = $(wordlist 1, 100, $(THIRD_PARTY_OBJS))
THIRD_PARTY_OBJS2 = $(wordlist 101, 999, $(THIRD_PARTY_OBJS))
-# WARNING: Must keep the following three rules (FF2|FF3|FF31_MODULE_DLL) in
+# WARNING: Must keep the following three rules (FF2|FF3|FF31|FF36_MODULE_DLL)
in
# sync! The only difference should be the rule name.
$(FF2_MODULE_DLL): $(BREAKPAD_OBJS) $(COMMON_OBJS) $(SQLITE_OBJS)
$(THIRD_PARTY_OBJS) $($(BROWSER)_OBJS) $($(BROWSER)_LINK_EXTRAS)
ifeq ($(OS),linux)
@@ -992,8 +1018,24 @@
$(MKDLL) $(DLLFLAGS) $($(BROWSER)_DLLFLAGS) $($(BROWSER)_LINK_EXTRAS)
$($(BROWSER)_LIBS) $(EXT_LINKER_CMD_FLAG)$(OUTDIR)/obj_list.temp
rm $(OUTDIR)/obj_list.temp
endif
-
-$(FF31_MODULE_TYPELIB): $(FF31_GEN_TYPELIBS)
+$(FF36_MODULE_DLL): $(BREAKPAD_OBJS) $(COMMON_OBJS) $(LIBGD_OBJS)
$(SQLITE_OBJS) $(THIRD_PARTY_OBJS) $($(BROWSER)_OBJS) $($(BROWSER)_LINK_EXTRAS)
+ ifeq ($(OS),linux)
+ # TODO(playmobil): Find equivalent of "@args_file" for ld on Linux.
+ $(MKDLL) $(DLLFLAGS) $($(BROWSER)_DLLFLAGS) $($(BROWSER)_OBJS)
$(BREAKPAD_OBJS) $(COMMON_OBJS) $(LIBGD_OBJS) $(SQLITE_OBJS)
$(THIRD_PARTY_OBJS) $($(BROWSER)_LINK_EXTRAS) $($(BROWSER)_LIBS)
+ else
+ $(ECHO) $($(BROWSER)_OBJS1) | $(TRANSLATE_LINKER_FILE_LIST) >
$(OUTDIR)/obj_list.temp
+ $(ECHO) $($(BROWSER)_OBJS2) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
+ $(ECHO) $(BREAKPAD_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
+ $(ECHO) $(COMMON_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
+ $(ECHO) $(LIBGD_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
+ $(ECHO) $(SQLITE_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
+ $(ECHO) $(THIRD_PARTY_OBJS1) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
+ $(ECHO) $(THIRD_PARTY_OBJS2) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
+ $(MKDLL) $(DLLFLAGS) $($(BROWSER)_DLLFLAGS) $($(BROWSER)_LINK_EXTRAS)
$($(BROWSER)_LIBS) $(EXT_LINKER_CMD_FLAG)$(OUTDIR)/obj_list.temp
+ rm $(OUTDIR)/obj_list.temp
+ endif
+
+$(FF36_MODULE_TYPELIB): $(FF36_GEN_TYPELIBS)
$(GECKO_BIN)/xpt_link $@ $^
# Split the list of OBJS to avoid "input line is too long" errors.
@@ -1175,7 +1217,7 @@
# We can't list the following as dependencies, because no BROWSER is defined
# for this target, therefore our $(BROWSER)_FOO variables and rules don't
exist.
# For $(FFMERGED_INSTALLER_XPI):
-# $(FF2_MODULE_DLL) $(FF3_MODULE_DLL) $(FF31_MODULE_DLL)
$(FF31_MODULE_TYPELIB) $(FF31_RESOURCES) $(FF31_M4FILES_I18N)
$(FF31_OUTDIR)/genfiles/chrome.manifest
+# $(FF2_MODULE_DLL) $(FF3_MODULE_DLL) $(FF31_MODULE_DLL) $(FF36_MODULE_DLL)
$(FF36_MODULE_TYPELIB) $(FF36_RESOURCES) $(FF36_M4FILES_I18N)
$(FF36_OUTDIR)/genfiles/chrome.manifest
# For $(SF_INSTALLER_PKG):
# $(SF_PLUGIN_BUNDLE) $(SF_INPUTMANAGER_BUNDLE)
# In order to make sure the Installer is always up to date despite these
missing
@@ -1232,14 +1274,15 @@
"mkdir" -p $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/components
"mkdir" -p $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/resources
"mkdir" -p $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib
+ "mkdir" -p $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff36
"mkdir" -p $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff35
"mkdir" -p $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff30
"mkdir" -p $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff2
cp base/firefox/static_files/components/stub.js
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/components
cp base/firefox/static_files/components/bootstrap.js
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/components
cp base/firefox/static_files/lib/updater.js
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib
- cp $(FF31_OUTDIR)/genfiles/install.rdf
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/install.rdf
- cp $(FF31_OUTDIR)/genfiles/chrome.manifest
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/chrome.manifest
+ cp $(FF36_OUTDIR)/genfiles/install.rdf
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/install.rdf
+ cp $(FF36_OUTDIR)/genfiles/chrome.manifest
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/chrome.manifest
ifneq ($(OS),win32)
# TODO(playmobil): Inspector should be located in extensions dir on win32.
"mkdir" -p
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/resources/inspector
@@ -1249,11 +1292,12 @@
endif
"mkdir" -p
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/chrome/chromeFiles/content
"mkdir" -p
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/chrome/chromeFiles/locale
- cp $(FF31_RESOURCES)
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/chrome/chromeFiles/content
+ cp $(FF36_RESOURCES)
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/chrome/chromeFiles/content
cp $(COMMON_RESOURCES)
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/chrome/chromeFiles/content
- cp -R $(FF31_OUTDIR)/genfiles/i18n/*
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/chrome/chromeFiles/locale
+ cp -R $(FF36_OUTDIR)/genfiles/i18n/*
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/chrome/chromeFiles/locale
cp -R $(COMMON_OUTDIR)/genfiles/i18n/*
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/chrome/chromeFiles/locale
- cp $(FF31_MODULE_TYPELIB)
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/components
+ cp $(FF36_MODULE_TYPELIB)
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/components
+ cp $(FF36_MODULE_DLL)
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff36/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
cp $(FF31_MODULE_DLL)
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff35/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
cp $(FF3_MODULE_DLL)
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff30/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
ifneq ($(ARCH),x86_64)
@@ -1266,6 +1310,7 @@
else # not LINUX (and not OSX)
ifeq ($(MODE),dbg)
ifdef IS_WIN32_OR_WINCE
+ cp $(FF36_OUTDIR)/$(MODULE).pdb
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff36/$(MODULE).pdb
cp $(FF31_OUTDIR)/$(MODULE).pdb
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff35/$(MODULE).pdb
cp $(FF3_OUTDIR)/$(MODULE).pdb
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff30/$(MODULE).pdb
cp $(FF2_OUTDIR)/$(MODULE).pdb
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff2/$(MODULE).pdb
==== //depot/googleclient/gears/opensource/gears/tools/sanity.mk#8 -
d:\clients\src-gears/googleclient/gears/opensource/gears/tools/sanity.mk ====
# action=edit type=text
--- googleclient/gears/opensource/gears/tools/sanity.mk 2010-01-15
15:58:44.000000000 -0800
+++ googleclient/gears/opensource/gears/tools/sanity.mk 2010-01-15
14:02:21.000000000 -0800
@@ -40,10 +40,12 @@
ifneq ($(BROWSER),FF2)
ifneq ($(BROWSER),FF3)
ifneq ($(BROWSER),FF31)
+ ifneq ($(BROWSER),FF36)
ifneq ($(BROWSER),IE)
ifneq ($(BROWSER),NPAPI)
ifneq ($(BROWSER),NONE)
- $(error On Windows, BROWSER can only be one of: FF2 | FF3 | FF31 | IE |
NPAPI | NONE)
+ $(error On Windows, BROWSER can only be one of: FF2 | FF3 | FF31 | FF36
| IE | NPAPI | NONE)
+ endif
endif
endif
endif
@@ -64,9 +66,11 @@
ifneq ($(BROWSER),FF2)
ifneq ($(BROWSER),FF3)
ifneq ($(BROWSER),FF31)
+ ifneq ($(BROWSER),FF36)
ifneq ($(BROWSER),SF)
ifneq ($(BROWSER),NONE)
- $(error On OS X, BROWSER can only be one of: FF2 | FF3 | FF31 | SF |
NONE)
+ $(error On OS X, BROWSER can only be one of: FF2 | FF3 | FF31 | FF36 |
SF | NONE)
+ endif
endif
endif
endif
@@ -77,9 +81,11 @@
ifneq ($(BROWSER),FF2)
ifneq ($(BROWSER),FF3)
ifneq ($(BROWSER),FF31)
+ ifneq ($(BROWSER),FF36)
ifneq ($(BROWSER),NPAPI)
ifneq ($(BROWSER),NONE)
- $(error On Linux, BROWSER can only be one of: FF2 | FF3 | FF31 | NPAPI |
NONE)
+ $(error On Linux, BROWSER can only be one of: FF2 | FF3 | FF31 | FF36 |
NPAPI | NONE)
+ endif
endif
endif
endif
