diff --git a/README.dart-sdk b/README.dart-sdk index 1a59eb2c816..47e3040dd5d 100644 --- a/README.dart-sdk +++ b/README.dart-sdk @@ -8,7 +8,7 @@ bin/ Binaries/scripts to compile, run, and manage Dart applications. dart Dart virtual machine dart2js Dart-to-JavaScript compiler dartanalyzer Dart static analyzer - docgen Dart documentation generator + dartdoc Dart documentation generator pub Pub, the Dart package manager dartfmt Dart code formatter diff --git a/dart.gyp b/dart.gyp index fb973e19c56..81a8f053325 100644 --- a/dart.gyp +++ b/dart.gyp @@ -93,13 +93,6 @@ 'packages', ], }, - { - 'target_name': 'api_docs', - 'type': 'none', - 'dependencies': [ - 'utils/apidoc/docgen.gyp:dartdocgen', - ], - }, { 'target_name': 'samples', 'type': 'none', diff --git a/tools/bots/dart_sdk.py b/tools/bots/dart_sdk.py index 33569401644..a7980c1f1ae 100644 --- a/tools/bots/dart_sdk.py +++ b/tools/bots/dart_sdk.py @@ -24,13 +24,6 @@ def BuildSDK(): Run([sys.executable, './tools/build.py', '--mode=release', '--arch=ia32,x64', 'create_sdk']) -def BuildAPIDocs(): - with bot.BuildStep('Build API docs'): - Run([sys.executable, './tools/build.py', '--mode=release', - '--arch=ia32', 'api_docs']) - Run([sys.executable, './tools/build.py', '--mode=release', - '--arch=ia32', 'dartdocgen']) - def BuildDartdocAPIDocs(dirname): dart_sdk = os.path.join(bot_utils.DART_DIR, utils.GetBuildRoot(BUILD_OS, 'release', 'ia32'), @@ -100,12 +93,6 @@ def CreateUploadSDK(): CreateUploadSDKZips() def CreateUploadAPIDocs(): - api_path = os.path.join(bot_utils.DART_DIR, - utils.GetBuildRoot(BUILD_OS, 'release', 'ia32'), - 'api_docs') - api_zip = os.path.join(bot_utils.DART_DIR, - utils.GetBuildRoot(BUILD_OS, 'release', 'ia32'), - 'dart-api-docs.zip') dartdoc_dir = os.path.join(bot_utils.DART_DIR, utils.GetBuildRoot(BUILD_OS, 'release', 'ia32'), 'gen-dartdocs') @@ -114,43 +101,12 @@ def CreateUploadAPIDocs(): 'dartdocs-api.zip') shutil.rmtree(api_path, ignore_errors=True) FileDelete(api_zip) - BuildAPIDocs() - UploadApiDocs(api_path) UploadApiLatestFile() - CreateZip(api_path, api_zip) - DartArchiveUploadAPIDocs(api_zip) BuildDartdocAPIDocs(dartdoc_dir) UploadDartdocApiDocs(dartdoc_dir) CreateZip(dartdoc_dir, dartdoc_zip) DartArchiveUploadDartdocAPIDocs(dartdoc_zip) -def DartArchiveUploadAPIDocs(api_zip): - namer = bot_utils.GCSNamer(CHANNEL, bot_utils.ReleaseType.RAW) - revision = utils.GetArchiveVersion() - for revision in [revision, 'latest']: - destination = (namer.apidocs_directory(revision) + '/' + - namer.apidocs_zipfilename()) - DartArchiveFile(api_zip, destination, checksum_files=False) - -def UploadApiDocs(dir_name): - apidocs_namer = bot_utils.GCSNamerApiDocs(CHANNEL) - revision = utils.GetArchiveVersion() - apidocs_destination_gcsdir = apidocs_namer.docs_dirpath(revision) - apidocs_destination_latestfile = apidocs_namer.docs_latestpath(revision) - - # Return early if the documents have already been uploaded. - # (This can happen if a build was forced, or a commit had no changes in the - # dart repository (e.g. DEPS file update).) - if GsutilExists(apidocs_destination_gcsdir): - print ("Not uploading api docs, since %s is already present." - % apidocs_destination_gcsdir) - return - - # Upload everything inside the built apidocs directory. - gsutil = bot_utils.GSUtil() - gsutil.upload(dir_name, apidocs_destination_gcsdir, recursive=True, - public=True) - def DartArchiveUploadDartdocAPIDocs(api_zip): namer = bot_utils.GCSNamer(CHANNEL, bot_utils.ReleaseType.RAW) revision = utils.GetArchiveVersion() diff --git a/tools/create_sdk.py b/tools/create_sdk.py index b4e2135f765..431b2a8b8da 100755 --- a/tools/create_sdk.py +++ b/tools/create_sdk.py @@ -120,8 +120,8 @@ def CopyShellScript(src_file, dest_dir): def CopyDartScripts(home, sdk_root): - for executable in ['dart2js_sdk', 'dartanalyzer_sdk', 'dartfmt_sdk', 'docgen', - 'dartdocgen', 'pub_sdk', 'dartdoc']: + for executable in ['dart2js_sdk', 'dartanalyzer_sdk', 'dartfmt_sdk', + 'pub_sdk', 'dartdoc']: CopyShellScript(os.path.join(home, 'sdk', 'bin', executable), os.path.join(sdk_root, 'bin'))