chore(scripts): fix detection of DART_SDK/DART/DARTIUM

Sets the stage to get rid of obsolete DARTSDK.

Author: chirayuk

scripts/env.sh

@@ -4,51 +4,79 @@ set -e
 if [[ -z $ENV_SET ]]; then
   export ENV_SET=1
 
-  if [ -n "$DART_SDK" ]; then
-      DARTSDK=$DART_SDK
+  # Map DART_SDK and DARTSDK to each other if only one is specified.
+  #
+  # TODO(chirayu): Remove this legacy DARTSDK variable support.  Check with Misko
+  # to see if he's using it on this Mac.
+  if [[ -z "$DART_SDK" ]]; then
+    : "${DARTSDK:=$DART_SDK}"
   else
-      echo "sdk=== $DARTSDK"
-      DART=`which dart|cat` # pipe to cat to ignore the exit code
-      DARTSDK=`which dart | sed -e 's/\/dart\-sdk\/.*$/\/dart-sdk/'`
-
-      if [ "$DARTSDK" = "/Applications/dart/dart-sdk" ]; then
-          # Assume we are a mac machine with standard dart setup
-          export DARTIUM="/Applications/dart/chromium/Chromium.app/Contents/MacOS/Chromium"
-      else
-          DARTSDK="`pwd`/dart-sdk"
-          case $( uname -s ) in
-            Darwin)
-              export DARTIUM=${DARTIUM:-./dartium/Chromium.app/Contents/MacOS/Chromium}
-              ;;
-            Linux)
-              export DARTIUM=${DARTIUM:-./dartium/chrome}
-              ;;
-          esac
-      fi
+    : "${DART_SDK:=$DARTSDK}"
   fi
 
-  case $( uname -s ) in
-    Darwin)
+  unset DART
+  PLATFORM="$(uname -s)"
+
+  case "$PLATFORM" in
+    (Darwin)
       path=$(readlink ${BASH_SOURCE[0]}||echo './scripts/env.sh')
       export NGDART_SCRIPT_DIR=$(dirname $path)
       ;;
-    Linux)
+    (Linux)
       export NGDART_SCRIPT_DIR=$(dirname $(readlink -f ${BASH_SOURCE[0]}))
       ;;
+    (*)
+      echo Unsupported platform $PLATFORM.  Exiting ... >&2
+      exit 3
+      ;;
   esac
+
   export NGDART_BASE_DIR=$(dirname $NGDART_SCRIPT_DIR)
 
-  export DART_SDK="$DARTSDK"
+  # Try to find the SDK alongside the dart command first.
+  if [[ -z "$DART_SDK" ]]; then
+    DART=$(which dart) || true
+    if [[ -x "$DART" ]]; then
+      DART_SDK="${DART/dart-sdk\/*/dart-sdk}"
+      if [[ ! -e "$DART_SDK" ]]; then
+        unset DART DART_SDK
+      fi
+    fi
+  fi
+  # Fallback: Assume it's alongside the current directory (e.g. Travis).
+  if [[ -z "$DART_SDK" ]]; then
+    DART_SDK="$(pwd)/dart-sdk"
+  fi
+
+  : "${DART:=$DART_SDK/bin/dart}"
+
+  if [[ ! -x "$DART" ]]; then
+    echo Unable to locate the dart binary / SDK. Exiting >&2
+    exit 3
+  fi
+
+  if [[ -z "$DARTIUM" ]]; then
+    dartiumRoot="$DART_SDK/../chromium"
+    if [[ -e "$dartiumRoot" ]]; then
+      case "$PLATFORM" in
+        (Linux) export DARTIUM="$dartiumRoot/chrome" ;;
+        (Darwin) export DARTIUM="$dartiumRoot/Chromium.app/Contents/MacOS/Chromium" ;;
+        (*) echo Unsupported platform $PLATFORM.  Exiting ... >&2 ; exit 3 ;;
+      esac
+    fi
+  fi
+
+  export DART_SDK
   export DARTSDK
-  export DART=${DART:-"$DARTSDK/bin/dart"}
-  export PUB=${PUB:-"$DARTSDK/bin/pub"}
-  export DARTANALYZER=${DARTANALYZER:-"$DARTSDK/bin/dartanalyzer"}
-  export DARTDOC=${DARTDOC:-"$DARTSDK/bin/dartdoc"}
-  export DART_DOCGEN=${DART_DOCGEN:-"$DARTSDK/bin/docgen"}
+  export DART
+  export PUB=${PUB:-"$DART_SDK/bin/pub"}
+  export DARTANALYZER=${DARTANALYZER:-"$DART_SDK/bin/dartanalyzer"}
+  export DARTDOC=${DARTDOC:-"$DART_SDK/bin/dartdoc"}
+  export DART_DOCGEN=${DART_DOCGEN:-"$DART_SDK/bin/docgen"}
   export DART_VM_OPTIONS="--old_gen_heap_size=2048"
   export DARTIUM_BIN=${DARTIUM_BIN:-"$DARTIUM"}
   export CHROME_BIN=${CHROME_BIN:-"google-chrome"}
-  export PATH=$PATH:$DARTSDK/bin
+  export PATH=$PATH:$DART_SDK/bin
 
   echo '*********'
   echo '** ENV **'
@@ -66,4 +94,4 @@ if [[ -z $ENV_SET ]]; then
   echo NGDART_SCRIPT_DIR=$NGDART_SCRIPT_DIR
   $DART --version 2>&1
 
-fi
+fi

scripts/generate-documentation.sh

@@ -54,7 +54,7 @@ fi;
 
 # Create a version file from the current build version
 doc_version=`head CHANGELOG.md | awk 'NR==2' | sed 's/^# //'`
-dartsdk_version=`cat $DARTSDK/version`
+dartsdk_version=`cat $DART_SDK/version`
 head_sha=`git rev-parse --short HEAD`
 
 echo $doc_version at $head_sha \(with Dart SDK $dartsdk_version\) > docs/VERSION

scripts/travis/install.sh

@@ -16,6 +16,5 @@ if [[ $BROWSERS =~ "dartium" ]]; then
   unzip dartium.zip > /dev/null
   rm -rf dartium
   rm dartium.zip
-  mv dartium-* dartium
+  mv dartium-* chromium
 fi
-