git.iko.soy/Idris-dev
on master help sign in
Minor fixes for the Java backend
0bdb8e6Jan Bessai
src/IRTS/CodegenJava.hs+2−4
compare with master
unifiedsplit
@@ -164,7 +164,7 @@ jarHeader =
164 ++ "if test -n \"$JAVA_HOME\"; then\n"
164 ++ "if test -n \"$JAVA_HOME\"; then\n"
165 ++ " java=\"$JAVA_HOME/bin/java\"\n"
165 ++ " java=\"$JAVA_HOME/bin/java\"\n"
166 ++ "fi\n"
166 ++ "fi\n"
167− ++ "exec \"$java\" $java_args -jar $MYSELF \"$@\""
167+ ++ "exec \"$java\" $java_args -jar $MYSELF \"$@\"\n"
168 ++ "exit 1\n"
168 ++ "exit 1\n"
169
169
170-----------------------------------------------------------------------
170-----------------------------------------------------------------------
@@ -381,9 +381,7 @@ mkMainMethod =
381 "main"
381 "main"
382 [FormalParam [] (array stringType) False (VarId $ Ident "args")]
382 [FormalParam [] (array stringType) False (VarId $ Ident "args")]
383 $ Block [ BlockStmt . ExpStmt
383 $ Block [ BlockStmt . ExpStmt
384− $ call "idris_initArgs" [ (threadType ~> "currentThread") []
384+ $ call "idris_initArgs" [ jConst "args" ]
385− , jConst "args"
386− ]
387 , BlockStmt . ExpStmt $ call (mangle' (sMN 0 "runMain")) []
385 , BlockStmt . ExpStmt $ call (mangle' (sMN 0 "runMain")) []
388 ]
386 ]
389
387
src/IRTS/Java/Pom.hs+1−1
@@ -49,7 +49,7 @@ pom clsName artifactName dependencies = unode "project" ([
49 unode "skipTest" "true"
49 unode "skipTest" "true"
50 ],
50 ],
51 unode "dependencies" (
51 unode "dependencies" (
52− dependency "org.idris-lang" "idris" "0.9.10-alpha-2" :
52+ dependency "org.idris-lang" "idris" "0.9.11-alpha-2-SNAPSHOT" :
53 map parseToDep dependencies
53 map parseToDep dependencies
54 ),
54 ),
55 unode "build" [
55 unode "build" [