remove K_NAILGUN env variable

Dwight Guth · Dwight Guth · commit 800dc77860be · 2015-03-13T12:39:14.000-05:00
Former-commit-id: 6434447fce34bb64e93e9da67d3f29ec862cf16e [formerly b6ae435c081a383ed4b72b171f1a2cc2e4ac9a7d]
Former-commit-id: 63cd68861868389676cbede9e33a31ff24d399a1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@
   Limited support for K 3.5 will continue until the release of K 4.0. We will
   backport bug fixes if necessary. K 4.0 will be released when the
   Java backend is deemed a suitable complete replacement for maude.
+- Removed the `K_NAILGUN` environment variable: K now uses nailgun whenever
+  it is able to connect to a K server.
 
 ## KRun ##
 
diff --git a/k-distribution/pom.xml b/k-distribution/pom.xml
@@ -88,7 +88,6 @@
                   <arg value="-v" />
                   <arg value="--report" />
                   <arg value="--debug" />
-                  <env key="K_NAILGUN" value="true" />
                 </exec>
               </target>
               <skip>${skipKTest}</skip>
diff --git a/k-distribution/src/main/scripts/lib/k b/k-distribution/src/main/scripts/lib/k
@@ -5,12 +5,14 @@ if [ -z "$K_OPTS" ];
   then export K_OPTS="-Xms64m -Xmx1024m -Xss32m -XX:+TieredCompilation"
 fi
 if "$(dirname "$0")/checkJava"; then
-  if [ -n "$K_NAILGUN" ]; then
-    if [[ `uname` == *MINGW* || `uname` == *CYGWIN* ]]; then
-      ng.exe org.kframework.main.Main "$@"
-    else
-      ng org.kframework.main.Main "$@"
-    fi
+  if [[ `uname` == *MINGW* || `uname` == *CYGWIN* ]]; then
+    NG=ng.exe
+  else
+    NG=ng
+  fi
+  $NG ng-version > /dev/null 2>&1
+  if [ $? -eq 0 ]; then
+    $NG org.kframework.main.Main "$@"
   else
     java -Djava.awt.headless=true $K_OPTS -ea -cp "$(dirname "$0")/java/*" org.kframework.main.Main "$@"
   fi
diff --git a/k-distribution/src/main/scripts/lib/k.bat b/k-distribution/src/main/scripts/lib/k.bat
@@ -3,6 +3,7 @@ SETLOCAL ENABLEEXTENSIONS
 IF ERRORLEVEL 1 ECHO Unable to enable extensions
 call "%~dp0\setenv.bat"
 IF NOT DEFINED K_OPTS SET K_OPTS=-Xms64m -Xmx1024m -Xss32m -XX:+TieredCompilation
-IF DEFINED K_NAILGUN ng.exe org.kframework.main.Main %*
-IF NOT DEFINED K_NAILGUN java  -Djava.awt.headless=true -ea %K_OPTS% -cp "%~dp0..\lib\java\*" org.kframework.main.Main %*
+ng.exe ng-version > NUL 2>&1
+IF ERRORLEVEL 0 ng.exe org.kframework.main.Main %*
+ELSE java  -Djava.awt.headless=true -ea %K_OPTS% -cp "%~dp0..\lib\java\*" org.kframework.main.Main %*
 ENDLOCAL
