Bug 569013 - Remove old MOZILLA_1_9_2_BRANCH ifdefs from comm-central code, Calendar part. r=Callek
authorStefan Sitter <ssitter@gmail.com>
Fri, 28 May 2010 20:14:00 -0400
changeset 5803 11875fa2da7e21e9395fca1df747d7990aeb169e
parent 5802 2fbaaafb706afe6c4b08bd54bb1a1cc208eaab5d
child 5804 3b861cce0e6647000d63392a373fbc9fb4c8bd5c
push idunknown
push userunknown
push dateunknown
reviewersCallek
bugs569013
Bug 569013 - Remove old MOZILLA_1_9_2_BRANCH ifdefs from comm-central code, Calendar part. r=Callek
calendar/confvars.sh
calendar/installer/removed-files.in
calendar/installer/windows/packages-static
calendar/lightning/Makefile.in
calendar/lightning/install.rdf
calendar/providers/gdata/Makefile.in
calendar/providers/gdata/install.rdf
calendar/sunbird/app/Makefile.in
calendar/sunbird/config/version-192.txt
calendar/timezones/Makefile.in
--- a/calendar/confvars.sh
+++ b/calendar/confvars.sh
@@ -38,40 +38,26 @@
 
 MOZ_APP_NAME=sunbird
 # This sets the default for nightly branding, and may get overriden by options
 # in configure.in depending on the arguments passed.
 MOZ_BRANDING_DIRECTORY=$MOZ_BUILD_APP/sunbird/branding/nightly
 MOZ_UPDATER=1
 MOZ_SUNBIRD=1
 MOZ_CALENDAR=1
-MOZ_APP_VERSION=$SUNBIRD_VERSION
 MOZ_PLAINTEXT_EDITOR_ONLY=1
 NECKO_PROTOCOLS_DEFAULT="about data file ftp http res viewsource"
 MOZ_NO_ACTIVEX_SUPPORT=1
 MOZ_ACTIVEX_SCRIPTING_SUPPORT=
 MOZ_INSTALLER=
 MOZ_MATHML=
 NECKO_COOKIES=
 MOZ_EXTENSIONS_DEFAULT=
 MOZ_UNIVERSALCHARDET=
 
-# Needed for the mozilla-central build side of the system.
-# Can be dropped when we branch MOZILLA_1_9_2_BRANCH
-MOZILLA_BRANCH_VERSION=`echo ${MOZILLA_VERSION} | sed -e 's/^\([0-9]\.[0-9]\.[0-9]\).*/\1/;'`
-
-if test "$MOZILLA_BRANCH_VERSION" = "1.9.2"; then
-  MOZ_APP_VERSION_TXT=$topsrcdir/$MOZ_BUILD_APP/sunbird/config/version-192.txt
-  MOZ_NO_XPCOM_OBSOLETE=1
-  # MOZ_OJI is only required to be cleared for MOZILLA_1_9_2_BRANCH (OS X).
-  MOZ_OJI=
-else
-  MOZ_APP_VERSION_TXT=$topsrcdir/$MOZ_BUILD_APP/sunbird/config/version.txt
-fi
-
+MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/sunbird/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
-
 SUNBIRD_VERSION=$MOZ_APP_VERSION
 MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/sunbird
 
 # Until we can build with libxul, we can't have ipc either
 MOZ_ENABLE_LIBXUL=
 MOZ_IPC=
--- a/calendar/installer/removed-files.in
+++ b/calendar/installer/removed-files.in
@@ -16,24 +16,20 @@ defaults/profile/extensions/{972ce4c6-7e
 defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/
 defaults/profile/extensions/Extensions.rdf
 defaults/profile/extensions/installed-extensions.txt
 defaults/profile/extensions/
 defaults/profile/US/
 # {641d8d09-7dda-4850-8228-ac0ab65e2ac9} = DOM Inspector
 extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9}/install.rdf
 extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9}/
-#ifdef MOZILLA_1_9_2_BRANCH
-greprefs.js
-#else
 greprefs/all.js
 greprefs/security-prefs.js
 greprefs/xpinstall.js
 greprefs/
-#endif
 components/component.reg
 components/compreg.dat
 components/xpti.dat
 components/xptitemp.dat
 components/nsBackgroundUpdateService.js
 components/nsCloseAllWindows.js
 #
 # Clean out old calendar components which didn't implement nsIModule
@@ -448,39 +444,31 @@ calendar-js/calProviderBase.js
 calendar-js/calProviderUtils.js
 calendar-js/calAuthUtils.js
 
 # Bug 420811 replace loading and broken image GIFs with PNGs
 res/broken-image.gif
 res/loading-image.gif
 
 #ifdef XP_WIN
-#ifdef MOZILLA_1_9_2_BRANCH
-mozjs.dll
-#else
 # Bug 504029
 js3250.dll
 #endif
-#endif
 
 # bug 520394 - We now use Cocoa Printing instead of PrintPDE
 #ifdef XP_MACOSX
 ../Plug-Ins/PrintPDE.plugin/Contents/Info.plist
 ../Plug-Ins/PrintPDE.plugin/Contents/MacOS/PrintPDE
 ../Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/Localizable.strings
 ../Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib/classes.nib
 ../Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib/info.nib
 ../Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib/objects.xib
 #endif
 
 # Bug 534408 - Core bug 514665 dropped/replaced USE_SHORT_LIBNAME uses: port that to c-c (apps)
 #ifdef XP_WIN
 components/calbscmp.dll
 #endif
 
-#ifndef MOZILLA_1_9_2_BRANCH
 components/contentprefs.xpt
-#endif
 
 # Bug 522712 - Port |Bug 511761 - Only use compatibility.ini (not .autoreg, or stat()s) to invalidate fastloads and other caches| to comm-central (apps)
-#ifndef MOZILLA_1_9_2_BRANCH
 .autoreg
-#endif
--- a/calendar/installer/windows/packages-static
+++ b/calendar/installer/windows/packages-static
@@ -5,20 +5,16 @@
 ; [] designates a toplevel component. Example: [xpcom]
 ; - in front of a file specifies it to be removed from the destination
 ; * wildcard support to recursively copy the entire directory
 ; ; file comment
 ;
 
 #filter substitution
 
-#ifdef MOZILLA_1_9_2_BRANCH
-bin/.autoreg
-#endif
-
 [@AB_CD@]
 bin\chrome\@AB_CD@.jar
 bin\chrome\@AB_CD@.manifest
 bin\chrome\calendar-@AB_CD@.jar
 bin\chrome\calendar-@AB_CD@.manifest
 bin\chrome\sunbird-@AB_CD@.jar
 bin\chrome\sunbird-@AB_CD@.manifest
 bin\defaults\pref\sunbird-l10n.js
@@ -26,21 +22,17 @@ bin\defaults\profile\prefs.js
 bin\defaults\profile\chrome\*
 bin\dictionaries\*
 bin\uninstall\helper.exe
 bin\update.locale
 bin\updater.ini
 
 [xpcom]
 bin\components\components.list
-#ifdef MOZILLA_1_9_2_BRANCH
-bin\js3250.dll
-#else
 bin\mozjs.dll
-#endif
 bin\plc4.dll
 bin\plds4.dll
 bin\xpcom.dll
 bin\xpcom_core.dll
 bin\nspr4.dll
 bin\components\xpinstal.dll
 bin\components\jar50.dll
 bin\Microsoft.VC80.CRT.manifest
@@ -72,28 +64,23 @@ bin\components\calbaseinternal.xpt
 bin\components\caldav.xpt
 bin\components\caps.xpt
 bin\components\chardet.xpt
 bin\components\chrome.xpt
 bin\components\commandhandler.xpt
 bin\components\commandlines.xpt
 bin\components\composer.xpt
 bin\components\content_base.xpt
-#ifndef MOZILLA_1_9_2_BRANCH
 bin\components\content_canvas.xpt
-#endif
 bin\components\content_events.xpt
 bin\components\content_html.xpt
 bin\components\content_htmldoc.xpt
 bin\components\content_xmldoc.xpt
 bin\components\content_xslt.xpt
 bin\components\content_xtf.xpt
-#ifdef MOZILLA_1_9_2_BRANCH
-bin\components\contentprefs.xpt
-#endif
 bin\components\cookie.xpt
 bin\components\docshell_base.xpt
 bin\components\dom.xpt
 bin\components\dom_base.xpt
 bin\components\dom_canvas.xpt
 bin\components\dom_core.xpt
 bin\components\dom_css.xpt
 bin\components\dom_events.xpt
@@ -313,23 +300,17 @@ bin\extensions\calendar-timezones@mozill
 bin\extensions\calendar-timezones@mozilla.org\chrome\calendar-timezones.jar
 bin\extensions\calendar-timezones@mozilla.org\chrome\calendar-timezones-@AB_CD@.jar
 bin\extensions\calendar-timezones@mozilla.org\defaults\preferences\preferences.js
 
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
 bin\defaults\pref\sunbird.js
 bin\defaults\pref\channel-prefs.js
-#ifdef MOZILLA_1_9_2_BRANCH
-bin\greprefs\all.js
-bin\greprefs\security-prefs.js
-bin\greprefs\xpinstall.js
-#else
 bin\greprefs.js
-#endif
 bin\defaults\autoconfig\platform.js
 bin\defaults\autoconfig\prefcalls.js
 
 ; [Layout Engine Resources]
 ; Style Sheets, Graphics and other Resources used by the layout engine.
 bin\res\hiddenWindow.html
 bin\res\ua.css
 bin\res\html.css
--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -48,23 +48,18 @@ MODULE		= lightning
 
 export XPI_NAME = lightning
 export USE_EXTENSION_MANIFEST = 1
 XPI_PKGNAME = lightning
 
 STRIP_XPI = 1
 DIST_FILES = install.rdf
 PREF_JS_EXPORTS = $(srcdir)/content/lightning.js
-ifdef MOZILLA_1_9_2_BRANCH
-LIGHTNING_VERSION := $(shell cat $(srcdir)/../sunbird/config/version-192.txt)
-THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-192.txt)
-else
 LIGHTNING_VERSION := $(shell cat $(srcdir)/../sunbird/config/version.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
-endif
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
 ifdef LIGHTNING_FIREFOX
 FIREFOX_VERSION := $(shell cat $(MOZILLA_SRCDIR)/browser/config/version.txt)
 endif
 
 ifneq (,$(findstring pre,$(LIGHTNING_VERSION)))
 DEFINES += -DLIGHTNING_PRERELEASE_VERSION=1
 endif
--- a/calendar/lightning/install.rdf
+++ b/calendar/lightning/install.rdf
@@ -6,21 +6,17 @@
 
   <Description about="urn:mozilla:install-manifest">
     <!-- Target Application this extension can install into, 
         with minimum and maximum supported versions. --> 
     <em:targetApplication>
       <Description>
         <!-- thunderbird -->
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-#ifdef MOZILLA_1_9_2_BRANCH
-        <em:minVersion>3.1a1pre</em:minVersion>
-#else
         <em:minVersion>3.2a1pre</em:minVersion>
-#endif
         <em:maxVersion>@THUNDERBIRD_VERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
 
 #if LIGHTNING_FIREFOX
     <!-- We only allow installation of Lightning into Firefox for ease of
        - development. You can edit the JS and then click reload in Firefox as
        - opposed to having to restart Thunderbird after each edit. -->
--- a/calendar/providers/gdata/Makefile.in
+++ b/calendar/providers/gdata/Makefile.in
@@ -44,23 +44,18 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = gdata-provider
 
 export USE_EXTENSION_MANIFEST = 1
 export XPI_NAME = gdata-provider
 DIST_FILES = install.rdf
 XPI_PKGNAME = gdata-provider
 STRIP_XPI = 1
 
-ifdef MOZILLA_1_9_2_BRANCH
-CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version-192.txt)
-THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-192.txt)
-else
 CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
-endif
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
 DEFINES += -DAB_CD=$(AB_CD) \
            -DCALENDAR_VERSION=$(CALENDAR_VERSION) \
            -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
            -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
            -DCOMM_BUILD=$(COMM_BUILD) \
            $(NULL)
 
--- a/calendar/providers/gdata/install.rdf
+++ b/calendar/providers/gdata/install.rdf
@@ -36,67 +36,51 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}</em:id>
-#ifdef MOZILLA_1_9_2_BRANCH
-    <em:version>0.7pre</em:version>
-#else
     <em:version>0.8pre</em:version>
-#endif
     <em:type>2</em:type>
 
     <!-- Target Application this extension can install into,
          with minimum and maximum supported versions. -->
     <em:targetApplication>
       <Description>
         <!-- Sunbird -->
         <em:id>{718e30fb-e89b-41dd-9da7-e25a45638b28}</em:id>
-#ifdef MOZILLA_1_9_2_BRANCH
-        <em:minVersion>1.0b2pre</em:minVersion>
-#else
         <em:minVersion>1.1a1pre</em:minVersion>
-#endif
         <em:maxVersion>@CALENDAR_VERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>
       <Description>
         <!-- Thunderbird -->
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-#ifdef MOZILLA_1_9_2_BRANCH
-        <em:minVersion>3.1a1pre</em:minVersion>
-#else
         <em:minVersion>3.2a1pre</em:minVersion>
-#endif
         <em:maxVersion>@THUNDERBIRD_VERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>
       <Description>
         <!-- SeaMonkey -->
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.1a1pre</em:minVersion>
         <em:maxVersion>@SEAMONKEY_VERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
 
     <em:requires>
       <Description>
         <!-- Lightning (also Sunbird via extension stub) -->
         <em:id>{e2fda1a4-762b-4020-b5ad-a41df1933103}</em:id>
-#ifdef MOZILLA_1_9_2_BRANCH
-        <em:minVersion>1.0b2pre</em:minVersion>
-#else
         <em:minVersion>1.1a1pre</em:minVersion>
-#endif
         <em:maxVersion>@CALENDAR_VERSION@</em:maxVersion>
       </Description>
     </em:requires>
 
     <em:name>Provider for Google Calendar</em:name>
     <em:description>Allows bidirectional access to Google Calendar</em:description>
     <em:creator>Philipp Kewisch</em:creator>
     <em:contributor>Mark James (http://www.famfamfam.com/lab/icons/silk/)</em:contributor>
--- a/calendar/sunbird/app/Makefile.in
+++ b/calendar/sunbird/app/Makefile.in
@@ -179,25 +179,21 @@ EXTRA_DEPS	+= \
 	$(STATIC_EXTRA_DEPS) \
 	$(NULL)
 DEFINES		+= $(STATIC_DEFINES)
 CPPSRCS		+= $(STATIC_CPPSRCS)
 EXTRA_DSO_LIBS	+= $(STATIC_EXTRA_DSO_LIBS)
 REQUIRES	+= $(STATIC_REQUIRES)
 EXTRA_LIBS	+= $(STATIC_EXTRA_LIBS)
 
-ifndef MOZILLA_1_9_2_BRANCH
-
 # OpenGL is required by (mozilla/)content/canvas: see (mozilla/)layout/build/Makefile.in.
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 OS_LIBS += -framework OpenGL
 endif
 
-endif # MOZILLA_1_9_2_BRANCH
-
 endif # BUILD_STATIC_LIBS
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
 OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32)
 RCINCLUDE = splash.rc
 ifndef GNU_CC
 RCFLAGS += -DMOZ_SUNBIRD -I$(srcdir)
@@ -293,21 +289,16 @@ endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 libs::
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DIST)/bin/chrome/icons/default
 
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DESTDIR)$(mozappdir)/chrome/icons/default
 endif
 
-ifdef MOZILLA_1_9_2_BRANCH
-libs::
-	touch $(DIST)/bin/.autoreg
-endif
-
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 
 APP_NAME = $(MOZ_APP_DISPLAYNAME)
 
 ifdef MOZ_DEBUG
 APP_NAME := $(APP_NAME)Debug
 endif
 
deleted file mode 100644
--- a/calendar/sunbird/config/version-192.txt
+++ /dev/null
@@ -1,1 +0,0 @@
-1.0b2pre
--- a/calendar/timezones/Makefile.in
+++ b/calendar/timezones/Makefile.in
@@ -71,23 +71,18 @@ STRIP_XPI = 1
 PREF_JS_EXPORTS = $(srcdir)/defaults/preferences.js
 DIRS = locales
 
 ifndef DISABLE_LIGHTNING_INSTALL
 # install as a global extension in dist/bin/extensions/
 INSTALL_EXTENSION_ID = calendar-timezones@mozilla.org
 endif
 
-ifdef MOZILLA_1_9_2_BRANCH
-CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version-192.txt)
-THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-192.txt)
-else
 CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
-endif
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
 TIMEZONES_VERSION := $(shell cat $(srcdir)/config/version.txt)
 
 DEFINES += -DAB_CD=$(AB_CD) \
            -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
            -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
            -DCALENDAR_VERSION=$(CALENDAR_VERSION) \
            -DTIMEZONES_VERSION=$(TIMEZONES_VERSION) \