Skip to content

F
Front-End
Unverified Commit 1561815e authored by Greg Spencer's avatar Greg Spencer Committed by GitHub
Browse files
Options

Revert "Generate a zip file of offline docs and a Dash/Zeal docset. (#24244)" (#24313) 

This reverts commit f3a4f7e8.

Accidental merge on red.
parent f3a4f7e8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 153 deletions
dev/bots/docs.sh
View file @ 1561815e
......@@ -30,42 +30,6 @@ function script_location() {
echo "$(cd -P "$(dirname "$script_location")" >/dev/null && pwd)"
}
# Zip up the docs so people can download them for offline usage.
function create_offline_zip() {
# Must be run from "$FLUTTER_ROOT/dev/docs"
echo "Zipping Flutter offline docs archive."
rm -rf flutter.docs.zip doc/offline
(cd ./doc; zip -r -9 -q ../flutter.docs.zip .)
}
# Generate the docset for Flutter docs for use with Dash, Zeal, and Velocity.
function create_docset() {
# Must be run from "$FLUTTER_ROOT/dev/docs" Must have dashing installed: go
# get -u github.com/technosophos/dashing Dashing produces a LOT of output
# (~30MB), so we redirect it, and just show the end of it if there was a
# problem.
echo "Building Flutter docset."
rm -rf flutter.docset
sed -e "s/{{VERSION}}/$FLUTTER_VERSION/g" dashing.json.tmpl > dashing.json && \
(dashing build --source ./doc --config ./dashing.json > /tmp/dashing.log 2>&1 || (tail -100 /tmp/dashing.log; false)) && \
tar cf flutter.docset.tar.gz --use-compress-program="gzip --best" flutter.docset
}
function move_offline_into_place() {
# Must be run from "$FLUTTER_ROOT/dev/docs"
echo "Moving offline data into place."
mkdir -p doc/offline
mv flutter.docs.zip doc/offline/flutter.docs.zip
du -sh doc/offline/flutter.docs.zip
if [[ "$CIRRUS_BRANCH" == "stable" ]]; then
echo -e "<entry>\n <version>${FLUTTER_VERSION}</version>\n <url>https://docs.flutter.io/offline/flutter.docset.tar.gz</url>\n</entry>" > doc/offline/flutter.xml
else
echo -e "<entry>\n <version>${FLUTTER_VERSION}</version>\n <url>https://master-docs-flutter-io.firebaseapp.com/offline/flutter.docset.tar.gz</url>\n</entry>" > doc/offline/flutter.xml
fi
mv flutter.docset.tar.gz doc/offline/flutter.docset.tar.gz
du -sh doc/offline/flutter.docset.tar.gz
}
# So that users can run this script from anywhere and it will work as expected.
SCRIPT_LOCATION="$(script_location)"
# Sets the Flutter root to be "$(script_location)/../..": This script assumes
......@@ -89,13 +53,12 @@ export PATH="$FLUTTER_BIN:$DART_BIN:$PATH"
# Make sure dart is installed by invoking flutter to download it.
"$FLUTTER" --version
FLUTTER_VERSION=$(cat "$FLUTTER_ROOT/version")
# If the pub cache directory exists in the root, then use that.
FLUTTER_PUB_CACHE="$FLUTTER_ROOT/.pub-cache"
if [[ -d "$FLUTTER_PUB_CACHE" ]]; then
# This has to be exported, because pub interprets setting it to the empty
# string in the same way as setting it to ".".
# This has to be exported, because pub interprets setting it
# to the empty string in the same way as setting it to ".".
export PUB_CACHE="${PUB_CACHE:-"$FLUTTER_PUB_CACHE"}"
fi
......@@ -109,17 +72,6 @@ fi
(cd "$FLUTTER_ROOT" && "$DART" "$FLUTTER_ROOT/dev/tools/dartdoc.dart")
(cd "$FLUTTER_ROOT" && "$DART" "$FLUTTER_ROOT/dev/tools/java_and_objc_doc.dart")
# Zip up the docs so people can download them for offline usage.
(cd "$FLUTTER_ROOT/dev/docs"; create_offline_zip)
# Generate the docset for Flutter docs for use with Dash, Zeal, and Velocity.
(cd "$FLUTTER_ROOT/dev/docs"; create_docset)
# Move the offline archives into place, now that all the processing of the doc
# directory is done. This avoids the tools recursively processing the archives
# as part of their process.
(cd "$FLUTTER_ROOT/dev/docs"; move_offline_into_place)
# Ensure google webmaster tools can verify our site.
cp "$FLUTTER_ROOT/dev/docs/google2ed1af765c529f57.html" "$FLUTTER_ROOT/dev/docs/doc"
......
dev/ci/docker_linux/Dockerfile
View file @ 1561815e
......@@ -21,7 +21,6 @@ RUN apt-get install -y --no-install-recommends \
git \
wget \
curl \
zip \
unzip \
ca-certificates \
gnupg
......@@ -35,7 +34,6 @@ RUN bash "${NODEJS_INSTALL}/nodejs_install.sh"
# Install the rest of the dependencies.
RUN apt-get install -y --no-install-recommends \
locales \
golang \
ruby \
ruby-dev \
nodejs \
......@@ -84,22 +82,13 @@ ENV PATH="$GRADLE_ROOT/bin:$PATH"
ENV PATH="/usr/bin:${PATH}"
RUN dpkg-query -L nodejs
# Install Firebase
# This is why we need nodejs installed.
RUN /usr/bin/npm --verbose install -g firebase-tools
# Install dashing
# This is why we need golang installed.
RUN mkdir -p /opt/gopath/bin
ENV GOPATH=/opt/gopath
ENV PATH="${GOPATH}/bin:${PATH}"
RUN go get -u github.com/technosophos/dashing
RUN /usr/bin/npm install -g git://github.com/firebase/firebase-tools.git
# Set locale to en_US
RUN locale-gen en_US "en_US.UTF-8" && dpkg-reconfigure locales
ENV LANG en_US.UTF-8
# Install coveralls and Firebase
# This is why we need ruby installed.
RUN gem install coveralls
RUN gem install bundler
dev/docs/dashing.json.tmpl deleted 100644 → 0
View file @ f3a4f7e8
{
"name": "flutter",
"package": "flutter",
"version": "{{VERSION}}",
"author": {
"name": "The Flutter Team",
"link": "https://flutter.io"
},
"index": "index.html",
"selectors": {
"#exceptions span.name a": {
"type": "Exception"
},
"body > main > div.col-xs-12.col-sm-9.col-md-8.main-content > h1": {
"requiretext": " library",
"type": "Library",
"regexp": " library",
"replacement": ""
},
"body > main > div.col-xs-12.col-sm-9.main-content > h1": {
"requiretext": " class",
"type": "Class",
"regexp": " class",
"replacement": ""
},
"body > main > div.col-xs-12.col-md-8.main-content > h1": {
"requiretext": " function",
"type": "Function",
"regexp": " function",
"replacement": ""
},
"body > main > div.col-sm-9.col-md-8.main-content > h1": {
"requiretext": " typedef",
"type": "Type",
"regexp": " typedef",
"replacement": ""
},
"body > main > .col-xs-12.col-sm-9.col-md-8.main-content > h1": {
"requiretext": " enum",
"type": "Enum",
"regexp": " enum",
"replacement": ""
},
"body > main > .col-md-8.main-content > h1": {
"requiretext": " constant",
"type": "Constant",
"regexp": " constant",
"replacement": ""
},
"body > main > div.col-xs-12.col-sm-9 > h1": {
"requiretext": " method",
"type": "Method",
"regexp": " method",
"replacement": ""
},
"body > main > .col-xs-12.col-sm-9.col-md-8 > h1": {
"requiretext": " property",
"type": "Property",
"regexp": " property",
"replacement": ""
},
"body > main > .col-xs-12.col-md-8 > h1": {
"requiretext": " constructor",
"type": "Constructor",
"regexp": " constructor",
"replacement": ""
},
"body > main > .col-xs-12.col-sm-9.main-content > h1": {
"requiretext": "operator ",
"type": "Operator",
"regexp": "operator ",
"replacement": ""
}
},
"ignore": [
"ABOUT"
],
"icon32x32": "icon.png",
"allowJS": true,
"ExternalURL": "https://docs.flutter.io"
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab