Issue 2231 - Use system JsDoc 3 instead our JsDoc 2 fork

build.py

 # coding: utf-8
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import os, sys, re, subprocess, shutil, buildtools
 from getopt import getopt, GetoptError
 from StringIO import StringIO
 from zipfile import ZipFile
@@ skipping 351 matching lines @@
       )).encode('utf-8')
 
 
 def generateDocs(baseDir, scriptName, opts, args, type):
   if len(args) == 0:
     print 'No target directory specified for the documentation'
     usage(scriptName, type, 'docs')
     return
   targetDir = args[0]
 
-  toolkit = None
-  quiet = False
-  for option, value in opts:
-    if option in ('-t', '--toolkit'):
-      toolkit = value
-    elif option in ('-q', '--quiet'):
-      quiet = True
-
-  if toolkit == None:
-    toolkit = os.path.join(baseDir, 'jsdoc-toolkit')
-    if not os.path.exists(toolkit):
-      subprocess.check_call(['hg', 'clone', 'https://hg.adblockplus.org/jsdoc-toolkit/', toolkit])
-
-  command = [os.path.join(toolkit, 'jsrun.js'),
-             '-t=' + os.path.join(toolkit, 'templates', 'jsdoc'),
-             '-d=' + targetDir,
-             '-a',
-             '-p',
-             '-x=js,jsm',
+  command = ['jsdoc',
+             '--destination', targetDir,
+             '--access', 'all',
              os.path.join(baseDir, 'lib')]
-  if quiet:
+  if any(opt in ('-q', '--quiet') for opt, _ in opts):
     subprocess.check_output(command)
   else:
     subprocess.check_call(command)
 
 def runReleaseAutomation(baseDir, scriptName, opts, args, type):
   keyFiles = []
   downloadsRepo = os.path.join(baseDir, '..', 'downloads')
   for option, value in opts:
     if option in ('-k', '--key'):
       keyFiles.append(value)
@@ skipping 81 matching lines @@
 
 with addCommand(showDescriptions, 'showdesc') as command:
   command.shortDescription = 'Print description strings for all locales'
   command.description = 'Display description strings for all locales as specified in the corresponding meta.properties files.'
   command.addOption('Only include the given locales', short='l', long='locales', value='l1,l2,l3')
   command.params = '[options]'
   command.supportedTypes = ('gecko')
 
 with addCommand(generateDocs, 'docs') as command:
   command.shortDescription = 'Generate documentation (requires node.js)'
-  command.description = 'Generate documentation files and write them into the specified directory. This operation requires node.js to be installed.'
-  command.addOption('JsDoc Toolkit location', short='t', long='toolkit', value='dir')
+  command.description = 'Generate documentation files and write them into the specified directory. This operation requires JsDoc to be installed.'

[Wladimir Palant, 2015/03/31 13:13:55]

Nit: JsDoc 3

[Sebastian Noack, 2015/03/31 13:18:16]

Done.

   command.addOption('Suppress JsDoc Toolkit output', short='q', long='quiet')
   command.params = '[options] <directory>'
   command.supportedTypes = ('gecko')
 
 with addCommand(runReleaseAutomation, 'release') as command:
   command.shortDescription = 'Run release automation'
   command.description = 'Note: If you are not the project owner then you '\
     'probably don\'t want to run this!\n\n'\
     'Runs release automation: creates downloads for the new version, tags '\
     'source code repository as well as downloads and buildtools repository.'
@@ skipping 71 matching lines @@
         if option in ('-h', '--help'):
           usage(scriptName, type, command)
           sys.exit()
       commands[command](baseDir, scriptName, opts, args, type)
     else:
       print 'Command %s is not supported for this application type' % command
       usage(scriptName, type)
   else:
     print 'Command %s is unrecognized' % command
     usage(scriptName, type)