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
6058bd09
Commit
6058bd09
authored
Jul 15, 2015
by
j4cbo
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #119 from spanndemic/misc-typos
Misc typos
parents
0521e806
b9c28534
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
README.md
README.md
+3
-3
common.gypi
common.gypi
+1
-1
example/README.md
example/README.md
+3
-3
example/run_djinni.sh
example/run_djinni.sh
+1
-1
No files found.
README.md
View file @
6058bd09
...
@@ -21,7 +21,7 @@ We announced Djinni at CppCon 2014. Access the slides from https://bit.ly/djinni
...
@@ -21,7 +21,7 @@ We announced Djinni at CppCon 2014. Access the slides from https://bit.ly/djinni
### Types
### Types
Djinni generates code based on interface definitions in an IDL file. An IDL file can contain
Djinni generates code based on interface definitions in an IDL file. An IDL file can contain
three kinds of declaration: enums, records, and interfaces.
three kinds of declaration
s
: enums, records, and interfaces.
*
Enums become C++ enum classes, Java enums, or ObjC
`NS_ENUM`
s.
*
Enums become C++ enum classes, Java enums, or ObjC
`NS_ENUM`
s.
*
Records are pure-data value objects.
*
Records are pure-data value objects.
...
@@ -158,7 +158,7 @@ you'll need to add calls to your own `JNI_OnLoad` and `JNI_OnUnload` functions.
...
@@ -158,7 +158,7 @@ you'll need to add calls to your own `JNI_OnLoad` and `JNI_OnUnload` functions.
#### Objective-C / C++ Project
#### Objective-C / C++ Project
##### Includes & Build Target
##### Includes & Build Target
Generated file
for Objective-C / C++ is
as follows (assuming prefix is
`DB`
):
Generated file
s for Objective-C / C++ are
as follows (assuming prefix is
`DB`
):
| Type | C++ header | C++ source | Objective-C files | Objective-C++ files |
| Type | C++ header | C++ source | Objective-C files | Objective-C++ files |
|-----------|------------------------|----------------------------|--------------------------|-----------------------------|
|-----------|------------------------|----------------------------|--------------------------|-----------------------------|
...
@@ -235,7 +235,7 @@ will be translated as well.
...
@@ -235,7 +235,7 @@ will be translated as well.
### Constants
### Constants
Constants can be defined within interfaces and records. In Java and C++ they are part of the
Constants can be defined within interfaces and records. In Java and C++ they are part of the
generated class; and in Objective-C, constant names are globals with name of the
generated class; and in Objective-C, constant names are globals with
the
name of the
interface/record prefixed. Example:
interface/record prefixed. Example:
record_with_const = record +c +j +o {
record_with_const = record +c +j +o {
...
...
common.gypi
View file @
6058bd09
{
{
"target_defaults": {
"target_defaults": {
"default_configuration": "Debug",
"default_configuration": "Debug",
# enable and
oird short names (not full path
) for linking libraries
# enable and
roid short names (not full paths
) for linking libraries
"android_unmangled_name": 1,
"android_unmangled_name": 1,
'cflags': [ '-gdwarf-2', '-Werror', '-Wall', '-Wextra', '-Wno-missing-field-initializers' ],
'cflags': [ '-gdwarf-2', '-Werror', '-Wall', '-Wextra', '-Wno-missing-field-initializers' ],
'cflags_cc': [ '-std=c++11', '-frtti', '-fexceptions', '-Wno-literal-suffix' ],
'cflags_cc': [ '-std=c++11', '-frtti', '-fexceptions', '-Wno-literal-suffix' ],
...
...
example/README.md
View file @
6058bd09
...
@@ -6,7 +6,7 @@ view, and when the button "Sort" is hit, sorts the lines in that view.
...
@@ -6,7 +6,7 @@ view, and when the button "Sort" is hit, sorts the lines in that view.
Interface Stucture
Interface Stucture
------------------
------------------
Two interfaces are defined: SortItems and TextboxListener. SortItems is implemented in C++; its
Two interfaces are defined: SortItems and TextboxListener. SortItems is implemented in C++; its
method sort() takes a list of strings (wrapped in a record), sort it, and passes the sorted list to
method sort() takes a list of strings (wrapped in a record), sort
s
it, and passes the sorted list to
TextboxListener.update() . TextboxListener is implemented in Java / Objective-C, and will update the
TextboxListener.update() . TextboxListener is implemented in Java / Objective-C, and will update the
text area on the UI when update() is called. You can check the source tree for implemetation
text area on the UI when update() is called. You can check the source tree for implemetation
details.
details.
...
@@ -46,7 +46,7 @@ iOS Version
...
@@ -46,7 +46,7 @@ iOS Version
-----------
-----------
The iOS project is in objc/ . Note that the interface layout is only tested under 4-inch iPhone.
The iOS project is in objc/ . Note that the interface layout is only tested under 4-inch iPhone.
The main handwritten logic is at TXSViewController.mm. Please open TextSort.
**xcworkspace**
(not the
The main handwritten logic is at TXSViewController.mm. Please open TextSort.
**xcworkspace**
(not the
xcodeproj file) This program can be built using
default setting
in Xcode. Or more simply:
xcodeproj file) This program can be built using
the default settings
in Xcode. Or more simply:
```
```
cd djinni_root_rit/example;
cd djinni_root_rit/example;
xcodebuild -workspace objc/TextSort.xcworkspace -scheme TextSort -configuration 'Debug' -sdk iphoneos
xcodebuild -workspace objc/TextSort.xcworkspace -scheme TextSort -configuration 'Debug' -sdk iphoneos
...
@@ -71,7 +71,7 @@ then gradle can not find your NDK installation. First make sure that you've
...
@@ -71,7 +71,7 @@ then gradle can not find your NDK installation. First make sure that you've
installed the NDK. On Mac OS X, you can install easily via
installed the NDK. On Mac OS X, you can install easily via
[
homebrew
](
http://brew.sh/
)
:
`brew install android-ndk`
[
homebrew
](
http://brew.sh/
)
:
`brew install android-ndk`
After that, you have to tell gradle
where the location of the NDK location
.
After that, you have to tell gradle
the location of the NDK
.
This can happen by either setting the
`ANDROID_NDK_HOME`
environment variable
This can happen by either setting the
`ANDROID_NDK_HOME`
environment variable
to the path where the NDK was installed, or by creating a
`local.properties`
to the path where the NDK was installed, or by creating a
`local.properties`
file in the project directory.
file in the project directory.
...
...
example/run_djinni.sh
View file @
6058bd09
...
@@ -34,7 +34,7 @@ if [ $# -eq 0 ]; then
...
@@ -34,7 +34,7 @@ if [ $# -eq 0 ]; then
elif
[
$#
-eq
1
]
;
then
elif
[
$#
-eq
1
]
;
then
command
=
"
$1
"
;
shift
command
=
"
$1
"
;
shift
if
[
"
$command
"
!=
"clean"
]
;
then
if
[
"
$command
"
!=
"clean"
]
;
then
echo
"Unexpected argu
em
nt:
\"
$command
\"
."
1>&2
echo
"Unexpected argu
me
nt:
\"
$command
\"
."
1>&2
exit
1
exit
1
fi
fi
for
dir
in
"
$temp_out
"
"
$cpp_out
"
"
$jni_out
"
"
$java_out
"
;
do
for
dir
in
"
$temp_out
"
"
$cpp_out
"
"
$jni_out
"
"
$java_out
"
;
do
...
...
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