Merge remote-tracking branch 'origin/master'

This commit is contained in:
Irmen de Jong 2019-01-15 20:56:14 +01:00
commit aa3d8afe00
3 changed files with 9 additions and 7 deletions

View File

@ -1,8 +1,5 @@
set PROG8_COMPILER_DIR=compiler set PROG8CLASSPATH=./out/production/compiler;./out/production/parser
set PROG8_LIBDIR=%PROG8_COMPILER_DIR%/prog8lib
set PROG8CLASSPATH=%PROG8_COMPILER_DIR%/out/production/compiler/
set KOTLINPATH=%USERPROFILE%/.IdeaIC2018.3/config/plugins/Kotlin set KOTLINPATH=%USERPROFILE%/.IdeaIC2018.3/config/plugins/Kotlin
set LIBJARS=%KOTLINPATH%/lib/kotlin-stdlib.jar;%KOTLINPATH%/lib/kotlin-reflect.jar;%PROG8_COMPILER_DIR%/antlr/lib/antlr-runtime-4.7.2.jar set LIBJARS=%KOTLINPATH%/lib/kotlin-stdlib.jar;%KOTLINPATH%/lib/kotlin-reflect.jar;./parser/antlr/lib/antlr-runtime-4.7.2.jar
java -Dprog8.libdir=%PROG8_LIBDIR% -cp %PROG8CLASSPATH%;%LIBJARS% prog8.CompilerMainKt %* java -cp %PROG8CLASSPATH%;%LIBJARS% prog8.CompilerMainKt %*

View File

@ -2,6 +2,6 @@
PROG8CLASSPATH=./out/production/compiler:./out/production/parser PROG8CLASSPATH=./out/production/compiler:./out/production/parser
KOTLINPATH=${HOME}/.IntelliJIdea2018.3/config/plugins/Kotlin KOTLINPATH=${HOME}/.IntelliJIdea2018.3/config/plugins/Kotlin
LIBJARS=${KOTLINPATH}/lib/kotlin-stdlib.jar:${KOTLINPATH}/lib/kotlin-reflect.jar:./parser//antlr/lib/antlr-runtime-4.7.2.jar LIBJARS=${KOTLINPATH}/lib/kotlin-stdlib.jar:${KOTLINPATH}/lib/kotlin-reflect.jar:./parser/antlr/lib/antlr-runtime-4.7.2.jar
java -cp ${PROG8CLASSPATH}:${LIBJARS} prog8.CompilerMainKt $* java -cp ${PROG8CLASSPATH}:${LIBJARS} prog8.CompilerMainKt $*

5
stackvm.cmd Normal file
View File

@ -0,0 +1,5 @@
set PROG8CLASSPATH=./out/production/compiler
set KOTLINPATH=%USERPROFILE%/.IdeaIC2018.3/config/plugins/Kotlin
set LIBJARS=%KOTLINPATH%/lib/kotlin-stdlib.jar;%KOTLINPATH%/lib/kotlin-reflect.jar
java -cp %PROG8CLASSPATH%;%LIBJARS% prog8.StackVmMainKt %*