diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-09-11 21:31:46 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-09-11 21:31:46 -0400 |
| commit | adb2550b3a19ca8d22bdca73ab3180367e27dc2e (patch) | |
| tree | 186d26ae96ce1297175aa5f0f460547955f17366 | |
| parent | 0d3dc5f39a4b0b02c3f3ed673a7713a8a4e15c69 (diff) | |
| parent | e773f2948c0832b8e3abb76820f74e2c2a810f32 (diff) | |
Merge pull request #796 from tsloughter/priv_escript
use full path of apps for priv files included in escript
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | rebar.config | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index a4d4498..f2c3b91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ before_deploy: "rm -rf !(rebar3)" deploy: on: branch: master - condition: $TRAVIS_OTP_RELEASE = R15B03 + condition: $TRAVIS_OTP_RELEASE = R16B03-1 provider: s3 access_key_id: AKIAJAPYAQEFYCYSNL7Q secret_access_key: diff --git a/rebar.config b/rebar.config index 419a5f0..5d41406 100644 --- a/rebar.config +++ b/rebar.config @@ -12,9 +12,8 @@ {escript_emu_args, "%%! +sbtu +A0\n"}. %% escript_incl_extra is for internal rebar-private use only. %% Do not use outside rebar. Config interface is not stable. -{escript_incl_extra, [{"_build/default/lib/relx/priv/templates/*", "."}, - {"priv/templates/*", "."}, - {"rebar/include/*", "."}]}. +{escript_incl_extra, [{"relx/priv/templates/*", "_build/default/lib/"}, + {"rebar/priv/templates/*", "_build/default/lib/"}]}. {erl_opts, [{platform_define, "^[0-9]+", namespaced_types}, no_debug_info, |