From 800c8f196f6fbddf094a77f7dc6e3e04c39b6849 Mon Sep 17 00:00:00 2001
From: Yegor Jbanov <yjbanov@google.com>
Date: Mon, 25 Jan 2016 22:47:42 -0800
Subject: [PATCH] chore(ddc): make DDC build non-experimental

---
 .travis.yml                                                   | 3 +--
 scripts/ci/build_and_test.sh                                  | 2 +-
 scripts/ci/{build_dart_experimental.sh => build_dart_ddc.sh}  | 4 ++--
 scripts/ci/{dart_experimental => dart_ddc}/pubspec_for_ddc.js | 0
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename scripts/ci/{build_dart_experimental.sh => build_dart_ddc.sh} (96%)
 rename scripts/ci/{dart_experimental => dart_ddc}/pubspec_for_ddc.js (100%)

diff --git a/.travis.yml b/.travis.yml
index d64cd40c0b..4f9b968638 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,7 @@ env:
     - MODE=browserstack_required DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
     - MODE=saucelabs_optional DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
     - MODE=browserstack_optional DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
-    - MODE=dart_experimental DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
+    - MODE=dart_ddc DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
     - MODE=js DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
     - MODE=router DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
     - MODE=build_only DART_CHANNEL=stable DART_VERSION=$DART_STABLE_VERSION
@@ -52,7 +52,6 @@ matrix:
   allow_failures:
   - env: "MODE=saucelabs_optional DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION"
   - env: "MODE=browserstack_optional DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION"
-  - env: "MODE=dart_experimental DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION"
   # TODO(alxhub): remove when dartdoc #1039 is in dev channel
   - env: "MODE=dart DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION"
 
diff --git a/scripts/ci/build_and_test.sh b/scripts/ci/build_and_test.sh
index c3aceb2fcf..233abb0647 100755
--- a/scripts/ci/build_and_test.sh
+++ b/scripts/ci/build_and_test.sh
@@ -8,7 +8,7 @@ echo ===========================================================================
 SCRIPT_DIR=$(dirname $0)
 cd $SCRIPT_DIR/../..
 
-if [ "$MODE" = "dart_experimental" ]; then
+if [ "$MODE" = "dart_ddc" ]; then
   ${SCRIPT_DIR}/build_$MODE.sh
 elif [[ $MODE = saucelabs* ]] ; then
   ${SCRIPT_DIR}/test_saucelabs.sh $MODE
diff --git a/scripts/ci/build_dart_experimental.sh b/scripts/ci/build_dart_ddc.sh
similarity index 96%
rename from scripts/ci/build_dart_experimental.sh
rename to scripts/ci/build_dart_ddc.sh
index 98457b83a3..120da8e7b6 100755
--- a/scripts/ci/build_dart_experimental.sh
+++ b/scripts/ci/build_dart_ddc.sh
@@ -2,7 +2,7 @@
 set -ex
 
 echo =============================================================================
-echo EXPERIMENTAL DART BUILD
+echo "DART DEV COMPILER (DDC) BUILD"
 echo =============================================================================
 
 # go to project dir
@@ -28,7 +28,7 @@ git clone https://github.com/dart-lang/dev_compiler.git tmp/dev_compiler
 ./node_modules/.bin/gulp build/packages.dart
 ./node_modules/.bin/gulp build.dart.material.css
 ./node_modules/.bin/gulp build/pubspec.dart
-node ./scripts/ci/dart_experimental/pubspec_for_ddc.js \
+node ./scripts/ci/dart_ddc/pubspec_for_ddc.js \
     --pubspec-file=dist/dart/playground/pubspec.yaml
 
 # Compile playground
diff --git a/scripts/ci/dart_experimental/pubspec_for_ddc.js b/scripts/ci/dart_ddc/pubspec_for_ddc.js
similarity index 100%
rename from scripts/ci/dart_experimental/pubspec_for_ddc.js
rename to scripts/ci/dart_ddc/pubspec_for_ddc.js