bug 455727 - import calendar/ into comm-central, remove pulling of calendar from client.py, r=Callek
authorRobert Kaiser <kairo@kairo.at>
Thu, 18 Sep 2008 16:12:49 +0200
changeset 371 d4b728dc9da418f8d5601ed6735e9a00ac963c4e
parent 370 637edb398796ad3d5a07b9d1368e690fb91c06d2
child 372 7c0bfdcda6731e77303f3c47b01736aaa93d5534
push idunknown
push userunknown
push dateunknown
reviewersCallek
bugs455727
bug 455727 - import calendar/ into comm-central, remove pulling of calendar from client.py, r=Callek
client.py
--- a/client.py
+++ b/client.py
@@ -1,18 +1,16 @@
 #!/usr/bin/python
 
-CALENDAR_CO_TAG = 'HEAD'
 EXTENSION_CO_TAG = 'HEAD'
 LDAPCSDK_CO_TAG = 'LDAPCSDK_6_0_6_RTM'
 
 CHATZILLA_CO_TAG = 'HEAD'
 VENKMAN_CO_TAG = 'HEAD'
 
-CALENDAR_DIRS = ('calendar',)
 EXTENSION_DIRS = ('extensions/typeaheadfind',
                   'extensions/wallet',)
 LDAPCSDK_DIRS = ('directory/c-sdk',)
 
 CHATZILLA_DIRS = ('extensions/irc',)
 VENKMAN_DIRS = ('extensions/venkman',)
 
 DEFAULT_COMM_REV = "tip"
@@ -122,19 +120,16 @@ o.add_option("--skip-cvs", dest="skip_cv
              action="store_true", default=False,
              help="Skip pulling the old directories from the Mozilla CVS repository.")
 o.add_option("--skip-chatzilla", dest="skip_chatzilla",
              action="store_true", default=False,
              help="Skip pulling the ChatZilla repository.")
 o.add_option("--skip-venkman", dest="skip_venkman",
              action="store_true", default=False,
              help="Skip pulling the Venkman repository.")
-o.add_option("--skip-calendar", dest="skip_calendar",
-             action="store_true", default=False,
-             help="Skip pulling the Calendar repository.")
 
 o.add_option("--hg", dest="hg", default=os.environ.get('HG', 'hg'),
              help="The location of the hg binary")
 o.add_option("--cvs", dest="cvs", default=os.environ.get('CVS', 'cvs'),
              help="The location of the cvs binary")
 o.add_option("--cvsroot", dest="cvsroot",
              default=os.environ.get('CVSROOT', ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot'),
              help="The CVSROOT (default: :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot")
@@ -184,18 +179,16 @@ if action in ('checkout', 'co'):
 
     if not options.skip_mozilla:
         do_hg_pull('mozilla', options.mozilla_repo, options.hg, options.mozilla_rev)
 
     if not options.skip_inspector:
         do_hg_pull(os.path.join('mozilla', 'extensions', 'inspector'), options.inspector_repo, options.hg, options.inspector_rev)
 
     if not options.skip_cvs:
-        if not options.skip_calendar:
-          do_cvs_checkout(CALENDAR_DIRS, CALENDAR_CO_TAG, options.cvsroot, options.cvs, '')
         do_cvs_checkout(LDAPCSDK_DIRS, LDAPCSDK_CO_TAG, options.cvsroot, options.cvs, '')
         if os.path.exists(os.path.join(topsrcdir, 'mozilla', 'extensions')):
           do_cvs_checkout(EXTENSION_DIRS, EXTENSION_CO_TAG, options.cvsroot, options.cvs, 'mozilla')
         else:
           print >>sys.stderr, "Warning: mozilla/extensions does not exist, built-in extensions could not be checked out."
           pass
 
     if not options.skip_chatzilla: