Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

Commit bde14f9

Browse files
committed
ci: debug ouput
Signed-off-by: Alexander Bezzubov <[email protected]>
1 parent b12b1ab commit bde14f9

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
- name: 'V2: passing tests' # TODO(#83): remove, after both tests sets converge
3737
install: *test_setup_anchor
3838
script:
39+
- sudo apt-get install -y binutils
3940
- ./sbt assembly
4041
- ./sbt "testOnly *Close* *ClientVersion* *SupportedLanguages*"
4142
- ./sbt "testOnly org.bblfsh.client.v2.BblfshClientParseTest -- -z \"Decoded UAST after parsing\""

build.sbt

+16-11
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,12 @@ getLibuast := {
127127
"rm src/main/resources/libuast/libuast.so" #&& // always a static build
128128
"rm libuast-bin.tar.gz" !
129129

130+
"find src/main/resources"!
131+
132+
"nm src/main/resources/libuast/libuast.a" #| "grep -c UastDecode"!
133+
134+
"nm src/main/resources/libuast/libuast.a" #| "wc -l"!
135+
130136
println("Done unpacking libuast")
131137
}
132138

@@ -154,16 +160,15 @@ def compileUnix(sourceFiles: String) = {
154160
}
155161

156162
val osName = System.getProperty("os.name").toLowerCase()
157-
if (osName.contains("mac os x")) { // TODO(bzz): change to '-fPIC -O2' for release
163+
if (osName.contains("mac os x")) { // TODO(bzz): change back to '-fPIC -O2' for release
158164
val cmd:String = "g++ -shared -Wall -g -std=c++11 " +
159165
"-I/usr/include " +
160166
"-I" + javaHome + "/include/ " +
161167
"-I" + javaHome + "/include/darwin " +
162168
"-Isrc/main/resources/libuast " +
163-
"-Lsrc/main/resources/libuast " + // sic, must be in the classpath for the test
164-
"-l uast " +
165-
"-o src/main/resources/lib/libscalauast.dylib " +
166-
sourceFiles + " "
169+
"-o src/main/resources/lib/libscalauast.dylib " + // sic, must be in the classpath for the test
170+
sourceFiles +
171+
"src/main/resources/libuast/libuast.a "
167172

168173
checkedProcess(cmd, "macOS build")
169174
} else {
@@ -172,12 +177,13 @@ def compileUnix(sourceFiles: String) = {
172177
"-I" + javaHome + "/include/ " +
173178
"-I" + javaHome + "/include/linux " +
174179
"-Isrc/main/resources/libuast " +
175-
"-Lsrc/main/resources/libuast " +
176-
"-l uast " +
177180
"-o src/main/resources/lib/libscalauast.so " +
178-
sourceFiles + " "
181+
sourceFiles +
182+
"src/main/resources/libuast/libuast.a "
179183

180184
checkedProcess(cmd, "Linux build")
185+
186+
"nm src/main/resources/lib/libscalauast.so" #| "grep -c UastDecode"!
181187
}
182188
}
183189

@@ -199,10 +205,9 @@ def crossCompileMacOS(sourceFiles: String): Unit = {
199205
"-I/usr/lib/jvm/java-8-openjdk-amd64/include " +
200206
"-I/usr/lib/jvm/java-8-openjdk-amd64/include/linux " +
201207
"-Isrc/libuast-native/ " +
202-
"-Lsrc/main/resources/libuast " +
203-
"-l uast " +
204208
"-o src/main/resources/lib/libscalauast.dylib " +
205-
sourceFiles
209+
sourceFiles +
210+
"src/main/resources/libuast/libuast.a "
206211

207212
checkedProcess(cmd, "macOS cross-compile build")
208213
}

0 commit comments

Comments
 (0)