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
683dc7f0
Commit
683dc7f0
authored
May 21, 2015
by
j4cbo
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #91 from dropbox/artwyman/DirsWithSpaces
Build script improvements for paths with spaces
parents
6e8d8ef7
82fa46a7
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
14 deletions
+17
-14
Makefile
Makefile
+9
-6
example/run_djinni.sh
example/run_djinni.sh
+2
-2
src/build
src/build
+1
-1
src/run
src/run
+1
-1
src/run-assume-built
src/run-assume-built
+1
-1
src/support/sbt
src/support/sbt
+1
-1
test-suite/run_djinni.sh
test-suite/run_djinni.sh
+2
-2
No files found.
Makefile
View file @
683dc7f0
all
:
example_ios example_android
all
:
example_ios example_android
test
clean
:
clean
:
-
rm
GypAndroid.mk
-
ndk-build
-C
example/android/app/ clean
-
xcodebuild
-workspace
example/objc/TextSort.xcworkspace
-scheme
TextSort
-configuration
'Debug'
-sdk
iphonesimulator clean
-
rm
-rf
libs/
-
rm
-rf
libs/
-
rm
-rf
obj/
-
rm
-rf
obj/
-
rm
-rf
build/
-
rm
-rf
build/
-
rm
-rf
build_ios/
-
rm
-rf
build_ios/
-
ndk-build
-C
example/android/app/ clean
-
rm
GypAndroid.mk
-
xcodebuild
-workspace
example/objc/TextSort.xcworkspace
-scheme
TextSort
-configuration
'Debug'
-sdk
iphonesimulator clean
# rule to lazily clone gyp
# rule to lazily clone gyp
# freeze gyp at the last version with android support
# freeze gyp at the last version with android support
...
@@ -18,7 +18,7 @@ clean:
...
@@ -18,7 +18,7 @@ clean:
# we specify a root target for android to prevent all of the targets from spidering out
# we specify a root target for android to prevent all of the targets from spidering out
GypAndroid.mk
:
./deps/gyp example/libtextsort.gyp support-lib/support_lib.gyp example/example.djinni
GypAndroid.mk
:
./deps/gyp example/libtextsort.gyp support-lib/support_lib.gyp example/example.djinni
./example/run_djinni.sh
./example/run_djinni.sh
ANDROID_BUILD_TOP
=
dirname
$
(
which ndk-build
)
deps/gyp/gyp
--depth
=
.
-f
android
-DOS
=
android
-Icommon
.gypi example/libtextsort.gyp
--root-target
=
libtextsort_jni
ANDROID_BUILD_TOP
=
$(
shell
dirname
`
which ndk-build
`
)
deps/gyp/gyp
--depth
=
.
-f
android
-DOS
=
android
-Icommon
.gypi example/libtextsort.gyp
--root-target
=
libtextsort_jni
# we specify a root target for android to prevent all of the targets from spidering out
# we specify a root target for android to prevent all of the targets from spidering out
./build_ios/example/libtextsort.xcodeproj
:
./deps/gyp example/libtextsort.gyp support-lib/support_lib.gyp example/example.djinni
./build_ios/example/libtextsort.xcodeproj
:
./deps/gyp example/libtextsort.gyp support-lib/support_lib.gyp example/example.djinni
...
@@ -37,4 +37,7 @@ example_android: GypAndroid.mk
...
@@ -37,4 +37,7 @@ example_android: GypAndroid.mk
@
echo
"Apks produced at:"
@
echo
"Apks produced at:"
@
python example/glob.py example/
'*.apk'
@
python example/glob.py example/
'*.apk'
.PHONY
:
example_android example_ios clean all
test
:
make
-C
test-suite
.PHONY
:
example_android example_ios test clean all
example/run_djinni.sh
View file @
683dc7f0
...
@@ -13,7 +13,7 @@ while [ -h "$loc" ]; do
...
@@ -13,7 +13,7 @@ while [ -h "$loc" ]; do
loc
=
"
`
dirname
"
$loc
"
`
/
$link
"
# Relative link
loc
=
"
`
dirname
"
$loc
"
`
/
$link
"
# Relative link
fi
fi
done
done
base_dir
=
$(
cd
`
dirname
"
$loc
"
`
&&
pwd
)
base_dir
=
$(
cd
"
`
dirname
"
$loc
"
`
"
&&
pwd
)
temp_out
=
"
$base_dir
/djinni-output-temp"
temp_out
=
"
$base_dir
/djinni-output-temp"
...
@@ -50,7 +50,7 @@ fi
...
@@ -50,7 +50,7 @@ fi
"
$base_dir
/../src/build"
"
$base_dir
/../src/build"
[
!
-e
"
$temp_out
"
]
||
rm
-r
"
$temp_out
"
[
!
-e
"
$temp_out
"
]
||
rm
-r
"
$temp_out
"
$base_dir
/../src/run-assume-built
\
"
$base_dir
/../src/run-assume-built"
\
--java-out
"
$temp_out
/java"
\
--java-out
"
$temp_out
/java"
\
--java-package
$java_package
\
--java-package
$java_package
\
--ident-java-field
mFooBar
\
--ident-java-field
mFooBar
\
...
...
src/build
View file @
683dc7f0
...
@@ -12,7 +12,7 @@ while [ -h "$loc" ]; do
...
@@ -12,7 +12,7 @@ while [ -h "$loc" ]; do
loc
=
"`dirname "
$
loc
"`/$link"
# Relative link
loc
=
"`dirname "
$
loc
"`/$link"
# Relative link
fi
fi
done
done
base_dir
=
$
(
cd
`dirname "$loc"`
&&
pwd
)
base_dir
=
$
(
cd
"`dirname "
$
loc
"`"
&&
pwd
)
need_to_build
=
0
need_to_build
=
0
dependencies
=
(
"build.sbt"
"project/plugins.sbt"
"source"
)
dependencies
=
(
"build.sbt"
"project/plugins.sbt"
"source"
)
...
...
src/run
View file @
683dc7f0
...
@@ -12,7 +12,7 @@ while [ -h "$loc" ]; do
...
@@ -12,7 +12,7 @@ while [ -h "$loc" ]; do
loc
=
"
`
dirname
"
$loc
"
`
/
$link
"
# Relative link
loc
=
"
`
dirname
"
$loc
"
`
/
$link
"
# Relative link
fi
fi
done
done
base_dir
=
$(
cd
`
dirname
"
$loc
"
`
&&
pwd
)
base_dir
=
$(
cd
"
`
dirname
"
$loc
"
`
"
&&
pwd
)
"
$base_dir
/build"
"
$base_dir
/build"
exec
"
$base_dir
/target/start"
"
$@
"
exec
"
$base_dir
/target/start"
"
$@
"
src/run-assume-built
View file @
683dc7f0
...
@@ -12,6 +12,6 @@ while [ -h "$loc" ]; do
...
@@ -12,6 +12,6 @@ while [ -h "$loc" ]; do
loc
=
"
`
dirname
"
$loc
"
`
/
$link
"
# Relative link
loc
=
"
`
dirname
"
$loc
"
`
/
$link
"
# Relative link
fi
fi
done
done
base_dir
=
$(
cd
`
dirname
"
$loc
"
`
&&
pwd
)
base_dir
=
$(
cd
"
`
dirname
"
$loc
"
`
"
&&
pwd
)
exec
"
$base_dir
/target/start"
"
$@
"
exec
"
$base_dir
/target/start"
"
$@
"
src/support/sbt
View file @
683dc7f0
...
@@ -12,7 +12,7 @@ while [ -h "$loc" ]; do
...
@@ -12,7 +12,7 @@ while [ -h "$loc" ]; do
loc
=
"
`
dirname
"
$loc
"
`
/
$link
"
# Relative link
loc
=
"
`
dirname
"
$loc
"
`
/
$link
"
# Relative link
fi
fi
done
done
base_dir
=
$(
cd
`
dirname
"
$loc
"
`
&&
pwd
)
base_dir
=
$(
cd
"
`
dirname
"
$loc
"
`
"
&&
pwd
)
# Just the first two digits of the version.
# Just the first two digits of the version.
java_version
=
$(
java
-version
2>&1 |
sed
-ne
'1s/.*"\([0-9][0-9]*\.[0-9][0-9]*\)\..*/\1/p'
)
java_version
=
$(
java
-version
2>&1 |
sed
-ne
'1s/.*"\([0-9][0-9]*\.[0-9][0-9]*\)\..*/\1/p'
)
...
...
test-suite/run_djinni.sh
View file @
683dc7f0
...
@@ -13,7 +13,7 @@ while [ -h "$loc" ]; do
...
@@ -13,7 +13,7 @@ while [ -h "$loc" ]; do
loc
=
"
`
dirname
"
$loc
"
`
/
$link
"
# Relative link
loc
=
"
`
dirname
"
$loc
"
`
/
$link
"
# Relative link
fi
fi
done
done
base_dir
=
$(
cd
`
dirname
"
$loc
"
`
&&
pwd
)
base_dir
=
$(
cd
"
`
dirname
"
$loc
"
`
"
&&
pwd
)
temp_out
=
"
$base_dir
/djinni-output-temp"
temp_out
=
"
$base_dir
/djinni-output-temp"
...
@@ -50,7 +50,7 @@ fi
...
@@ -50,7 +50,7 @@ fi
"
$base_dir
/../src/build"
"
$base_dir
/../src/build"
[
!
-e
"
$temp_out
"
]
||
rm
-r
"
$temp_out
"
[
!
-e
"
$temp_out
"
]
||
rm
-r
"
$temp_out
"
$base_dir
/../src/run-assume-built
\
"
$base_dir
/../src/run-assume-built"
\
--java-out
"
$temp_out
/java"
\
--java-out
"
$temp_out
/java"
\
--java-package
$java_package
\
--java-package
$java_package
\
--ident-java-field
mFooBar
\
--ident-java-field
mFooBar
\
...
...
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