Skip to content

Commit

Permalink
remove docgen from the sdk
Browse files Browse the repository at this point in the history
BUG=
R=whesse@google.com

Review URL: https://codereview.chromium.org//1356943002 .
  • Loading branch information
keertip committed Sep 18, 2015
1 parent d6051a5 commit 3d37a55
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 54 deletions.
2 changes: 1 addition & 1 deletion README.dart-sdk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 0 additions & 7 deletions dart.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,6 @@
'packages',
],
},
{
'target_name': 'api_docs',
'type': 'none',
'dependencies': [
'utils/apidoc/docgen.gyp:dartdocgen',
],
},
{
'target_name': 'samples',
'type': 'none',
Expand Down
44 changes: 0 additions & 44 deletions tools/bots/dart_sdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down Expand Up @@ -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')
Expand All @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions tools/create_sdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'))

Expand Down

0 comments on commit 3d37a55

Please sign in to comment.