From 93962297654900821d7604136e288dc912716436 Mon Sep 17 00:00:00 2001 From: naomi black Date: Tue, 11 Mar 2014 13:38:26 -0700 Subject: [PATCH 1/2] chore: correct path to libs in doc gen script --- scripts/generate-documentation.sh | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/scripts/generate-documentation.sh b/scripts/generate-documentation.sh index c1cfa0944..8cde8363f 100755 --- a/scripts/generate-documentation.sh +++ b/scripts/generate-documentation.sh @@ -13,27 +13,27 @@ echo "Generating documentation" --exclude-lib=js,metadata,meta,mirrors,intl,number_symbols,number_symbol_data,intl_helpers,date_format_internal,date_symbols,angular.util \ --no-include-sdk \ --package-root=../packages/ \ - ../lib/angular.dart \ - ../lib/animate/module.dart \ - ../lib/utils.dart \ - ../lib/change_detection/watch_group.dart \ - ../lib/core/module.dart \ - ../lib/core_dom/module.dart \ - ../lib/filter/module.dart \ - ../lib/directive/module.dart \ - ../lib/mock/module.dart \ - ../lib/perf/module.dart \ - ../lib/playback/playback_data.dart \ - ../lib/playback/playback_http.dart \ - ../lib/routing/module.dart \ - ../lib/tools/common.dart \ - ../lib/tools/expression_extractor.dart \ - ../lib/tools/io.dart \ - ../lib/tools/io_impl.dart \ - ../lib/tools/source_crawler_impl.dart \ - ../lib/tools/source_metadata_extractor.dart \ - ../lib/tools/template_cache_annotation.dart \ - ../lib/tools/template_cache_generator.dart + angular.dart \ + animate/module.dart \ + utils.dart \ + change_detection/watch_group.dart \ + core/module.dart \ + core_dom/module.dart \ + filter/module.dart \ + directive/module.dart \ + mock/module.dart \ + perf/module.dart \ + playback/playback_data.dart \ + playback/playback_http.dart \ + routing/module.dart \ + tools/common.dart \ + tools/expression_extractor.dart \ + tools/io.dart \ + tools/io_impl.dart \ + tools/source_crawler_impl.dart \ + tools/source_metadata_extractor.dart \ + tools/template_cache_annotation.dart \ + tools/template_cache_generator.dart cd .. From 16af2e5bc85df4e6ef0c3199764217b859276424 Mon Sep 17 00:00:00 2001 From: naomi black Date: Tue, 11 Mar 2014 16:07:57 -0700 Subject: [PATCH 2/2] chore: move the README edit earlier and improve git fetch of docviewer --- scripts/generate-documentation.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/scripts/generate-documentation.sh b/scripts/generate-documentation.sh index 8cde8363f..af951273d 100755 --- a/scripts/generate-documentation.sh +++ b/scripts/generate-documentation.sh @@ -1,6 +1,9 @@ #!/bin/bash . $(dirname $0)/env.sh +# Temporary change to delete the Build Status image markdown from the README (image md not supported by dartdoc-viewer) +cp README.md README-orig.md +cat README-orig.md | sed "1s/^AngularDart.*/AngularDart/" > README.md # Dart doc can not be run from the same directory as dartdoc-viewer # see: https://code.google.com/p/dart/issues/detail?id=17231 @@ -39,10 +42,18 @@ cd .. DOCVIEWER_DIR="dartdoc-viewer"; if [ ! -d "$DOCVIEWER_DIR" ]; then - git clone https://github.com/angular/dartdoc-viewer.git -b angular-skin $DOCVIEWER_DIR + git clone https://github.com/angular/dartdoc-viewer.git -b angular-skin $DOCVIEWER_DIR +else + (cd $DOCVIEWER_DIR; git pull origin angular-skin) fi; +# Create a version file from the current build version head CHANGELOG.md | awk 'NR==2' | sed 's/^# //' > docs/VERSION + rm -rf $DOCVIEWER_DIR/client/web/docs/ mv docs/ $DOCVIEWER_DIR/client/web/docs/ (cd $DOCVIEWER_DIR/client; pub build) + +# Revert the temp copy of the README.md file + mv README-orig.md README.md +