Bug 523820 - Remove old MOZILLA_1_9_1_BRANCH ifdefs from comm-central code; (Fv2a-SM) Remove last missed case.
authorSerge Gautherie <sgautherie.bz@free.fr>
Mon, 04 Jan 2010 08:53:13 +0100
changeset 4622 fb6a673527df52af8ee826d5ca05033c7590d3d3
parent 4621 567a9465585ab34fb7b4d5e99a693b46b9d63a26
child 4623 aded7874ea8ec17c80d9d609aa07b7902690c492
push idunknown
push userunknown
push dateunknown
bugs523820
Bug 523820 - Remove old MOZILLA_1_9_1_BRANCH ifdefs from comm-central code; (Fv2a-SM) Remove last missed case. r=Callek.
suite/config/version-191.txt
suite/confvars.sh
deleted file mode 100644
--- a/suite/config/version-191.txt
+++ /dev/null
@@ -1,1 +0,0 @@
-2.0.1pre
\ No newline at end of file
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -40,23 +40,17 @@ MOZ_APP_NAME=seamonkey
 MOZ_APP_DISPLAYNAME=SeaMonkey
 MOZ_MAIL_NEWS=1
 if [ "$COMM_BUILD" ]; then
   MOZ_LDAP_XPCOM=1
 fi
 MOZ_STATIC_MAIL_BUILD=1
 MOZ_COMPOSER=1
 MOZ_SUITE=1
-# Needed for the mozilla-central build side of the system.
-MOZILLA_BRANCH_VERSION=`echo ${MOZILLA_VERSION} | sed -e 's/^\([0-9]\.[0-9]\.[0-9]\).*/\1/;'`
-if test "$MOZILLA_BRANCH_VERSION" = "1.9.1"; then
-  MOZ_APP_VERSION=`cat $topsrcdir/$MOZ_BUILD_APP/config/version-191.txt`
-else
-  MOZ_APP_VERSION=`cat $topsrcdir/$MOZ_BUILD_APP/config/version.txt`
-fi
+MOZ_APP_VERSION=`cat $topsrcdir/$MOZ_BUILD_APP/config/version.txt`
 SEAMONKEY_VERSION=$MOZ_APP_VERSION
 MOZ_NO_XPCOM_OBSOLETE=1
 MOZ_EXTENSIONS_DEFAULT=" venkman inspector irc gnomevfs reporter"
 MOZ_PLACES=1
 MOZ_UPDATER=1
 MOZ_HELP_VIEWER=1
 
 # Disable libxul which is (now) the default on mozilla-central. (Bug 394502)