Skip to content

Commit b9fa5d5

Browse files
committed
Downgraded LLVM, bridj
The current bridj 7 snapshot has a bug which makes it unable to find the llvm libraries. For now, downgraded to 0.6.2. This has the added caveat that we have to disable warnings when running libbridj related items, since they are not properly stackgaurded.
1 parent 3e6a9ad commit b9fa5d5

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
language: java
2-
before_install: "sudo apt-get install -y ant-contrib && ant deps"
2+
before_install:
3+
- sudo apt-get install -y ant-contrib
4+
- sudo ln -s /usr/share/java/ant-contrib.jar /usr/share/ant/lib/
5+
- ant deps
36
install: "ant jar"
47
script: "ant test"
58
jdk:

build.xml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<project name="MJC">
22
<property name="junit.jar" value="/usr/share/java/junit4.jar" />
3-
<!-- The stable 0.6.2 bridj seems to be responsible for strange crashes,
4-
so use the newest 0.7 snapshot. -->
5-
<property name="bridj.name" value="bridj-0.7-20140629.160052-71.jar" />
6-
<property name="bridj.url" value="https://oss.sonatype.org/content/groups/public/com/nativelibs4java/bridj/0.7-SNAPSHOT/${bridj.name}" />
3+
<property name="bridj.name" value="bridj-0.6.2.jar" />
4+
<property name="bridj.url" value="https://oss.sonatype.org/content/groups/public/com/nativelibs4java/bridj/0.6.2/${bridj.name}" />
75
<property name="bridj.jar" value="build/libs/${bridj.name}" />
86
<property name="llvm-j.jar" value="build/libs/llvm-j.jar" />
97
<property name="commons.jar.system" value="/usr/share/java/commons-cli-1.2.jar" />
@@ -63,9 +61,8 @@
6361
<arg value="junit4" />
6462
<arg value="libjna-java" />
6563
<arg value="astyle" />
66-
<arg value="clang-3.5" />
67-
<arg value="llvm-3.5-dev" />
68-
<arg value="llvm-dev" />
64+
<arg value="clang-3.4" />
65+
<arg value="llvm-3.4-dev" />
6966
<arg value="libc6-dev-i386" />
7067
<arg value="python" />
7168
<arg value="wget" />
@@ -135,8 +132,9 @@
135132
<available file="${llvm-j.jar}"/>
136133
<else>
137134
<exec executable="make" dir="llvm-j" failonerror="true">
135+
<arg value="LLVM_C=/usr/include/llvm-c-3.4/llvm-c" />
136+
<arg value="LLVM_VERSION=3.4" />
138137
<arg value="llvm" />
139-
<arg value="LLVM_VERSION=3.5" />
140138
</exec>
141139
<mkdir dir="build/llvm-j/"/>
142140
<javac includeantruntime="false" srcdir="llvm-j/src/"

runTests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def runTest(self):
171171
if os.path.exists(o):
172172
os.remove(o)
173173

174-
compile_test = RunTest(mjc_file, ["java",
174+
compile_test = RunTest(mjc_file, ["java", "-XX:-PrintWarnings",
175175
"-Xms512m", "-Xmx1024m",
176176
"-jar", "build/jar/mjc.jar",
177177
"-i", self.testfile,

0 commit comments

Comments
 (0)