Commit 6888a7a7 authored by Andrew Twyman's avatar Andrew Twyman

Merge pull request #163 from pwais/pwais_nicer_cmake

Some patches for djinni veterans
parents d74d3ae5 05a0ed69
.PHONY: all objc java linux .PHONY: all objc java linux_docker
FORCE_DJINNI := $(shell ./run_djinni.sh >&2) FORCE_DJINNI := $(shell ./run_djinni.sh >&2)
all: objc java linux all: objc java
objc: objc:
cd objc; xcodebuild -sdk iphonesimulator -project DjinniObjcTest.xcodeproj -scheme DjinniObjcTest test cd objc; xcodebuild -sdk iphonesimulator -project DjinniObjcTest.xcodeproj -scheme DjinniObjcTest test
...@@ -10,5 +10,5 @@ objc: ...@@ -10,5 +10,5 @@ objc:
java: java:
cd java && ant compile test cd java && ant compile test
linux: linux_docker:
cd ..; ./test-suite/java/docker/run_dockerized_test.sh cd ..; ./test-suite/java/docker/run_dockerized_test.sh
...@@ -18,4 +18,8 @@ You may need to have Xcode open for the simulator portion of the objc ...@@ -18,4 +18,8 @@ You may need to have Xcode open for the simulator portion of the objc
tests to complete successfully. Try opening the app if you see a tests to complete successfully. Try opening the app if you see a
failure connecting to the simulator. failure connecting to the simulator.
To test Java generated code in linux environments, run `make linux`. Testing in Linux (via Docker)
-----------------------------
To test Java generated code in a variety of linux environments (via Docker),
run `make linux_docker`. FMI see
[Docker-based testing instructions](java/docker/README.md).
...@@ -2,7 +2,23 @@ ...@@ -2,7 +2,23 @@
<project name="Djinni-test"> <project name="Djinni-test">
<target name="compile"> <target name="compile">
<mkdir dir="build"/> <mkdir dir="build"/>
<mkdir dir="build/local"/> <mkdir dir="build/local"/>
<!-- Veteran djinni users might not have cmake. Given them some advice. -->
<property environment="env" />
<fail
message="****${line.separator}
Can't find cmake! Please install, using e.g.:${line.separator}
$ brew install cmake ${line.separator}
$ sudo port install cmake ${line.separator}
$ apt-get install cmake ${line.separator}
$ yum install cmake ${line.separator}
****${line.separator}">
<condition>
<not><available file="cmake" filepath="${env.PATH}" /></not>
</condition>
</fail>
<exec executable="cmake" failonerror="true" dir="build"> <exec executable="cmake" failonerror="true" dir="build">
<!-- Verbose helps make debugging compiler issues easier --> <!-- Verbose helps make debugging compiler issues easier -->
<arg value="-DCMAKE_VERBOSE_MAKEFILE=ON"/> <arg value="-DCMAKE_VERBOSE_MAKEFILE=ON"/>
......
...@@ -2,7 +2,7 @@ Djinni Linux Tests ...@@ -2,7 +2,7 @@ Djinni Linux Tests
------------------ ------------------
This directory contains a suite of tools for testing djinni (JNI only) This directory contains a suite of tools for testing djinni (JNI only)
on Linux. The suite helps ensure the portability of djinni and on Linux via Docker. The suite helps ensure the portability of djinni and
(self-)document compatible platforms. (self-)document compatible platforms.
Quickstart Quickstart
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment