Inlined KSCRIPT_BUILD_LIBS and fixed local test instructions.

Author: holgerbrandl

.travis.yml

@@ -46,13 +46,10 @@ install:
   - sdk install gradle
 
   - export KSCRIPT_HOME="/home/travis/build/holgerbrandl/kscript"
-  - export KSCRIPT_BUILD_LIBS="$KSCRIPT_HOME/build/libs"
-  - pwd
-  - export PATH=$KSCRIPT_BUILD_LIBS::$PATH
+  - export PATH=${KSCRIPT_HOME}/build/libs:$PATH
 
   # build it
   - cd $KSCRIPT_HOME && ./gradlew assemble
-  - cd $KSCRIPT_BUILD_LIBS
 
   ## install assert.h
   - wget https://raw.github.com/lehmannro/assert.sh/v1.1/assert.sh && chmod +x assert.sh

misc/kscript_release.sh

@@ -5,7 +5,6 @@
 # 3. Push and wait for travis CI results
 
 export KSCRIPT_HOME="/Users/brandl/projects/kotlin/kscript";
-export KSCRIPT_BUILD_LIBS="$KSCRIPT_HOME/build/libs";
 export PATH=${KSCRIPT_HOME}:${PATH}
 export PATH=~/go/bin/:$PATH
 
@@ -29,8 +28,8 @@ cd $KSCRIPT_HOME
 
 ## compile binary distribution (including jar and wrapper-script)
 mkdir -p $KSCRIPT_ARCHIVE/kscript-${kscript_version}/bin
-cp ${KSCRIPT_BUILD_LIBS}/kscript ${KSCRIPT_ARCHIVE}/kscript-${kscript_version}/bin
-cp ${KSCRIPT_BUILD_LIBS}/kscript.jar ${KSCRIPT_ARCHIVE}/kscript-${kscript_version}/bin/kscript.jar
+cp ${KSCRIPT_HOME}/kscript ${KSCRIPT_ARCHIVE}/kscript-${kscript_version}/bin
+cp ${KSCRIPT_HOME}/build/libs/kscript.jar ${KSCRIPT_ARCHIVE}/kscript-${kscript_version}/bin/kscript.jar
 
 cd ${KSCRIPT_ARCHIVE}
 rm ${KSCRIPT_ARCHIVE}/kscript-${kscript_version}.zip

test/TestsReadme.md

@@ -23,10 +23,6 @@ export KSCRIPT_HOME="/Users/brandl/projects/kotlin/kscript"
 #export KSCRIPT_HOME="/cygdrive/z/kscript"
 ## change into this/test directory
 
-## make sure to use devel-version
-export PATH=${KSCRIPT_HOME}:${PATH}
-which kscript
-
 ## make sure assert.h is in PATH
 which assert.sh || exit 1
 
@@ -36,6 +32,10 @@ cd ${KSCRIPT_HOME}
 ./gradlew assemble
 
 
+## make sure to use devel-version from build/libs
+export PATH=${KSCRIPT_HOME}/build/libs:${PATH}
+which kscript
+
 ## clean up the environment
 #sdk use kotlin 1.1-RC
 kscript --clear-cache

test/test_suite.sh

@@ -118,7 +118,7 @@ assert_end environment_tests
 ## dependency_lookup
 
 # export KSCRIPT_HOME="/Users/brandl/projects/kotlin/kscript"; export PATH=${KSCRIPT_HOME}:${PATH}
-resolve_deps() { kotlin -classpath ${KSCRIPT_BUILD_LIBS}/kscript.jar kscript.app.DependencyUtil "$@";}
+resolve_deps() { kotlin -classpath ${KSCRIPT_HOME}/build/libs/kscript.jar kscript.app.DependencyUtil "$@";}
 export -f resolve_deps
 
 
@@ -240,7 +240,7 @@ assert 'kscript "println(args.size)" "foo bar"' 1       ## allow for spaces
 assert 'kscript "println(args[0])" "foo bar"' "foo bar" ## make sure quotes are not propagated into args
 
 
-kscript_nocall() { kotlin -classpath ${KSCRIPT_BUILD_LIBS}/kscript.jar kscript.app.KscriptKt "$@";}
+kscript_nocall() { kotlin -classpath ${KSCRIPT_HOME}/build/libs/kscript.jar kscript.app.KscriptKt "$@";}
 export -f kscript_nocall
 
 ## temp projects with include symlinks