Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
djinni
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
djinni
Commits
6888a7a7
Commit
6888a7a7
authored
Nov 11, 2015
by
Andrew Twyman
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #163 from pwais/pwais_nicer_cmake
Some patches for djinni veterans
parents
d74d3ae5
05a0ed69
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
6 deletions
+26
-6
test-suite/Makefile
test-suite/Makefile
+3
-3
test-suite/README.md
test-suite/README.md
+5
-1
test-suite/java/build.xml
test-suite/java/build.xml
+17
-1
test-suite/java/docker/README.md
test-suite/java/docker/README.md
+1
-1
No files found.
test-suite/Makefile
View file @
6888a7a7
.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
test-suite/README.md
View file @
6888a7a7
...
@@ -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
)
.
test-suite/java/build.xml
View file @
6888a7a7
...
@@ -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"
/>
...
...
test-suite/java/docker/README.md
View file @
6888a7a7
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment