mozilla
/
releases-comm-central
зеркало из https://github.com/mozilla/releases-comm-central.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 651110 - Remove obsolete MOZILLA_2_0_BRANCH defines; r=Callek 

--HG--
rename : suite/config/version.txt => suite/config/version-50.txt
This commit is contained in:
Mark Banner 2011-04-21 21:52:23 +01:00
Родитель 0a7b56e95f
Коммит b142707b81
11 изменённых файлов: 16 добавлений и 44 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
calendar/lightning/Makefile.in
Просмотреть файл

@ -58,11 +58,9 @@ PREF_JS_EXPORTS = $(srcdir)/content/lightning.js
# Lighting version number
LIGHTNING_VERSION := $(shell cat $(srcdir)/../sunbird/config/version.txt)
ifdef MOZILLA_2_0_BRANCH
THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-20.txt)
SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version-20.txt)
elif defined(MOZILLA_5_0_BRANCH)
if defined(MOZILLA_5_0_BRANCH)
THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-50.txt)
SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version-50.txt)
else
THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)

6
calendar/providers/gdata/Makefile.in
Просмотреть файл

@ -50,11 +50,9 @@ XPI_PKGNAME = gdata-provider
STRIP_XPI = 1
CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
ifdef MOZILLA_2_0_BRANCH
THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-20.txt)
SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version-20.txt)
elif defined(MOZILLA_5_0_BRANCH)
if defined(MOZILLA_5_0_BRANCH)
THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-50.txt)
SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version-50.txt)
else
THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)

6
calendar/timezones/Makefile.in
Просмотреть файл

@ -77,11 +77,9 @@ INSTALL_EXTENSION_ID = calendar-timezones@mozilla.org
endif
CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
ifdef MOZILLA_2_0_BRANCH
THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-20.txt)
SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version-20.txt)
elif defined(MOZILLA_5_0_BRANCH)
if defined(MOZILLA_5_0_BRANCH)
THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-50.txt)
SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version-50.txt)
else
THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)

1
config/autoconf.mk.in
Просмотреть файл

@ -44,7 +44,6 @@ MOZILLA_CLIENT = 1
COMM_BUILD = @COMM_BUILD@
MOZILLA_SRCDIR = $(topsrcdir)/mozilla
MOZILLA_VERSION = @MOZILLA_VERSION@
MOZILLA_2_0_BRANCH = @MOZILLA_2_0_BRANCH@
MOZILLA_5_0_BRANCH = @MOZILLA_5_0_BRANCH@
THUNDERBIRD_VERSION = @THUNDERBIRD_VERSION@

6
config/config.mk
Просмотреть файл

@ -425,16 +425,16 @@ PURIFY = purify $(PURIFYOPTIONS)
QUANTIFY = quantify $(QUANTIFYOPTIONS)
ifdef CROSS_COMPILE
XPIDL_COMPILE = $(CYGWIN_WRAPPER) $(LIBXUL_DIST)/host/bin/host_xpidl$(HOST_BIN_SUFFIX)
ifneq (,$(MOZILLA_2_0_BRANCH)$(MOZILLA_5_0_BRANCH))
ifdef MOZILLA_5_0_BRANCH
XPIDL_LINK = $(CYGWIN_WRAPPER) $(LIBXUL_DIST)/host/bin/host_xpt_link$(HOST_BIN_SUFFIX)
endif
else
XPIDL_COMPILE = $(CYGWIN_WRAPPER) $(LIBXUL_DIST)/bin/xpidl$(BIN_SUFFIX)
ifneq (,$(MOZILLA_2_0_BRANCH)$(MOZILLA_5_0_BRANCH))
ifdef MOZILLA_5_0_BRANCH
XPIDL_LINK = $(CYGWIN_WRAPPER) $(LIBXUL_DIST)/bin/xpt_link$(BIN_SUFFIX)
endif
endif
ifeq (,$(MOZILLA_2_0_BRANCH)$(MOZILLA_5_0_BRANCH))
ifndef MOZILLA_5_0_BRANCH
XPIDL_LINK = $(PYTHON) $(SDK_BIN_DIR)/xpt.py link
endif

4
config/rules.mk
Просмотреть файл

@ -1690,13 +1690,13 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_COMPILE) $(XPIDL_GEN_DIR)/.done
# no need to link together if XPIDLSRCS contains only XPIDL_MODULE
ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
ifneq (,$(MOZILLA_2_0_BRANCH)$(MOZILLA_5_0_BRANCH))
ifdef MOZILLA_5_0_BRANCH
$(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS)) $(GLOBAL_DEPS) $(XPIDL_LINK)
$(XPIDL_LINK) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS))
else
$(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS)) $(GLOBAL_DEPS)
$(XPIDL_LINK) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS))
endif # MOZILLA_2_0_BRANCH || MOZILLA_5_0_BRANCH
endif # MOZILLA_5_0_BRANCH
endif # XPIDL_MODULE.xpt != XPIDLSRCS
libs:: $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt

7
configure.in
Просмотреть файл

@ -255,16 +255,11 @@ MOZILLA_BRANCH_VERSION=`echo ${MOZILLA_VERSION} | sed -e 's/^\([0-9]\.[0-9]\).*/
changequote([,])
dnl Set the Gecko branch version.
MOZILLA_2_0_BRANCH=
MOZILLA_5_0_BRANCH=
if test "$MOZILLA_BRANCH_VERSION" = "2.0"; then
MOZILLA_2_0_BRANCH=1
AC_DEFINE(MOZILLA_2_0_BRANCH)
elif test "$MOZILLA_BRANCH_VERSION" = "5.0"; then
if test "$MOZILLA_BRANCH_VERSION" = "5.0"; then
MOZILLA_5_0_BRANCH=1
AC_DEFINE(MOZILLA_5_0_BRANCH)
fi
AC_SUBST(MOZILLA_2_0_BRANCH)
AC_SUBST(MOZILLA_5_0_BRANCH)

16
mailnews/import/eudora/src/nsEudoraEditor.cpp
Просмотреть файл

@ -101,13 +101,8 @@ NS_IMETHODIMP nsEudoraEditor::GetSelection(nsISelection * *aSelection)
}
#ifdef MOZILLA_2_0_BRANCH
// [noscript] void init (in nsIDOMDocument doc, in nsIPresShellPtr shell, in nsIContentPtr aRoot, in nsISelectionController aSelCon, in unsigned long aFlags)
NS_IMETHODIMP nsEudoraEditor::Init(nsIDOMDocument *doc, nsIPresShell * shell, nsIContent * aRoot, nsISelectionController *aSelCon, PRUint32 aFlags)
#else
// [noscript] void init (in nsIDOMDocument doc, in nsIContentPtr aRoot, in nsISelectionController aSelCon, in unsigned long aFlags)
NS_IMETHODIMP nsEudoraEditor::Init(nsIDOMDocument *doc, nsIContent * aRoot, nsISelectionController *aSelCon, PRUint32 aFlags)
#endif
{
return NS_ERROR_NOT_IMPLEMENTED;
}
@ -625,13 +620,11 @@ NS_IMETHODIMP nsEudoraEditor::DebugUnitTests(PRInt32 *outNumTests, PRInt32 *outN
return NS_ERROR_NOT_IMPLEMENTED;
}
#ifndef MOZILLA_2_0_BRANCH
// readonly attribute boolean transactionManager
NS_IMETHODIMP nsEudoraEditor::GetLastKeypressEventTrusted(PRBool *aResult)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
#endif
// void pasteAsQuotation (in long aSelectionType)
NS_IMETHODIMP nsEudoraEditor::PasteAsQuotation(PRInt32 aSelectionType)
@ -1075,13 +1068,6 @@ NS_IMETHODIMP nsEudoraHTMLImageElement::GetPrefix(nsAString & aPrefix)
return NS_ERROR_NOT_IMPLEMENTED;
}
#ifdef MOZILLA_2_0_BRANCH
NS_IMETHODIMP nsEudoraHTMLImageElement::SetPrefix(const nsAString & aPrefix)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
#endif
// readonly attribute DOMString localName
NS_IMETHODIMP nsEudoraHTMLImageElement::GetLocalName(nsAString & aLocalName)
{
@ -1272,7 +1258,6 @@ NS_IMETHODIMP nsEudoraHTMLImageElement::SetClassName(const nsAString & aClassNam
return NS_ERROR_NOT_IMPLEMENTED;
}
#ifndef MOZILLA_2_0_BRANCH
NS_IMETHODIMP nsEudoraHTMLImageElement::GetAccessKey(nsAString &aAccessKey)
{
return NS_ERROR_NOT_IMPLEMENTED;
@ -1297,7 +1282,6 @@ NS_IMETHODIMP nsEudoraHTMLImageElement::Click()
{
return NS_ERROR_NOT_IMPLEMENTED;
}
#endif
// attribute DOMString name
NS_IMETHODIMP nsEudoraHTMLImageElement::GetName(nsAString & aName)

1
suite/config/version-20.txt
Просмотреть файл

@ -1 +0,0 @@
2.1pre

1
suite/config/version-50.txt Normal file
Просмотреть файл

@ -0,0 +1 @@
2.2a1pre

6
suite/confvars.sh
Просмотреть файл

@ -59,11 +59,11 @@ MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
MOZ_SERVICES_SYNC=1
# Needed for the mozilla-central build side of the system.
# Can be dropped when we branch MOZILLA_2_0_BRANCH
# Can be dropped when we branch MOZILLA_5_0_BRANCH
MOZILLA_BRANCH_VERSION=`echo ${MOZILLA_VERSION} | sed -e 's/^\([0-9]\.[0-9]\).*/\1/;'`
if test "$MOZILLA_BRANCH_VERSION" = "2.0"; then
MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version-20.txt
if test "$MOZILLA_BRANCH_VERSION" = "5.0"; then
MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version-50.txt
else
MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
fi