Commit f4ce7601 authored by Andrew Twyman's avatar Andrew Twyman

Cleanups to bash script

parent a2a52e24
...@@ -57,8 +57,10 @@ elif [ $# -eq 1 ]; then ...@@ -57,8 +57,10 @@ elif [ $# -eq 1 ]; then
exit exit
fi fi
# Build Djinni. # Build Djinni
"$base_dir/../src/build" "$base_dir/../src/build"
# Run Djinni generation
[ ! -e "$temp_out" ] || rm -r "$temp_out" [ ! -e "$temp_out" ] || rm -r "$temp_out"
(cd "$base_dir" && \ (cd "$base_dir" && \
"$base_dir/../src/run-assume-built" \ "$base_dir/../src/run-assume-built" \
...@@ -125,27 +127,29 @@ fi ...@@ -125,27 +127,29 @@ fi
# Make sure we can parse back our own generated YAML file # Make sure we can parse back our own generated YAML file
cp "$base_dir/djinni/yaml-test.djinni" "$temp_out/yaml" cp "$base_dir/djinni/yaml-test.djinni" "$temp_out/yaml"
(cd "$base_dir" && \
"$base_dir/../src/run-assume-built" \ "$base_dir/../src/run-assume-built" \
--java-out "$temp_out/java" \ --java-out "$temp_out_relative/java" \
--java-package $java_package \ --java-package $java_package \
--ident-java-field mFooBar \ --ident-java-field mFooBar \
\ \
--cpp-out "$temp_out/cpp" \ --cpp-out "$temp_out_relative/cpp" \
--ident-cpp-enum-type foo_bar \ --ident-cpp-enum-type foo_bar \
--cpp-optional-template "std::experimental::optional" \ --cpp-optional-template "std::experimental::optional" \
--cpp-optional-header "<experimental/optional>" \ --cpp-optional-header "<experimental/optional>" \
\ \
--jni-out "$temp_out/jni" \ --jni-out "$temp_out_relative/jni" \
--ident-jni-class NativeFooBar \ --ident-jni-class NativeFooBar \
--ident-jni-file NativeFooBar \ --ident-jni-file NativeFooBar \
\ \
--objc-out "$temp_out/objc" \ --objc-out "$temp_out_relative/objc" \
--objcpp-out "$temp_out/objc" \ --objcpp-out "$temp_out_relative/objc" \
--objc-type-prefix DB \ --objc-type-prefix DB \
\ \
--idl "$temp_out/yaml/yaml-test.djinni" --idl "$temp_out_relative/yaml/yaml-test.djinni" \
)
# Copy changes from "$temp_output" to final dir. # Copy changes from "$temp_out" to final dir.
mirror() { mirror() {
local prefix="$1" ; shift local prefix="$1" ; shift
......
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