Merge pull request #563 from JanBessai/JavaRTSFix
Java RTS operational again
commit217c3f3f66fe329ce0ab71675f59a781573e9b79
authorEdwin Brady <edwin.brady@gmail.com>
dateMon 28 Oct 2013, 16:17 (13 years ago)
parent7c86659068f3d4
.gitignore−1
@@ -10,7 +10,6 @@ cabal-dev/
1010*~
1111.DS_Store
1212custom.mk
13−java/executable_pom.xml
1413test/output
1514test/test???/output
1615test/reg???/output
.travis.yml+2
@@ -14,3 +14,5 @@ script:
1414 - cabal copy
1515 - make test
1616 - make test_llvm
17+ - make test_java
18+
idris.cabal+1−1
@@ -57,6 +57,7 @@ Data-files: jsrts/Runtime-browser.js
5757 rts/idris_rts.h
5858 rts/idris_stdfgn.h
5959 rts/libtest.c
60+ java/*.xml
6061
6162Extra-source-files:
6263 Makefile
@@ -86,7 +87,6 @@ Extra-source-files:
8687 effects/Effect/*.idr
8788 effects/*.idr
8889
89− java/*.xml
9090
9191 javascript/*.idr
9292 javascript/JavaScript/*.idr
java/executable_pom_template.xml → java/executable_pom.xmlrenamed+1−1
@@ -15,7 +15,7 @@
1515 <dependency>
1616 <groupId>org.idris-lang</groupId>
1717 <artifactId>idris</artifactId>
18− <version>0.9.10-alpha-1</version>
18+ <version>0.9.10-alpha-2</version>
1919 </dependency>
2020$DEPENDENCIES$
2121 </dependencies>
src/Util/System.hs+1−1
@@ -84,4 +84,4 @@ getIncFlags = do dir <- getDataDir
8484 return $ "-I" ++ dir </> "rts"
8585
8686getExecutablePom = do dir <- getDataDir
87− return $ dir </> "executable_pom.xml"
87+ return $ dir </> "java" </> "executable_pom.xml"