Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:Ledest:erlang:19
erlydtl
erlydtl-0.10.0-merl-shipped-with-Erlang-OTP-as-...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File erlydtl-0.10.0-merl-shipped-with-Erlang-OTP-as-of-v18.0.patch of Package erlydtl
diff -Ndur erlydtl-0.10.0/Makefile erlydtl-0.10.0-merl-shipped-with-Erlang-OTP-as-of-v18.0/Makefile --- erlydtl-0.10.0/Makefile 2014-12-21 00:45:25.000000000 +0200 +++ erlydtl-0.10.0-merl-shipped-with-Erlang-OTP-as-of-v18.0/Makefile 2015-09-27 22:25:49.083852817 +0300 @@ -37,7 +37,7 @@ tools webtool hipe inets eunit clean: - @echo "Clean merl..." ; $(MAKE) -C deps/merl clean + @[ ! -d deps/merl ] || { echo "Clean merl..." ; $(MAKE) -C deps/merl clean ;} @$(REBAR) -C rebar-slex.config clean rm -fv erl_crash.dump diff -Ndur erlydtl-0.10.0/rebar.config erlydtl-0.10.0-merl-shipped-with-Erlang-OTP-as-of-v18.0/rebar.config --- erlydtl-0.10.0/rebar.config 2014-12-21 00:45:25.000000000 +0200 +++ erlydtl-0.10.0-merl-shipped-with-Erlang-OTP-as-of-v18.0/rebar.config 2015-09-27 22:38:03.717803118 +0300 @@ -18,21 +18,12 @@ ]}. {deps, - [{merl, ".*", - {git, "git://github.com/erlydtl/merl.git", "28e5b3829168199e8475fa91b997e0c03b90d280"}, - [raw]}, - {eunit_formatters, ".*", - {git, "git://github.com/seancribbs/eunit_formatters", "7f79fa3fb953b94990bd9b41e92cef7cfecf91ef"}} + [{eunit_formatters, ".*", + {git, "git://github.com/seancribbs/eunit_formatters", {branch, "master"}}} ]}. {pre_hooks, - [{"(linux|darwin|solaris)", compile, "make -C \"$REBAR_DEPS_DIR/merl\" all -W test"}, - {"(freebsd|netbsd|openbsd)", compile, "gmake -C \"$REBAR_DEPS_DIR/merl\" all"}, - {"win32", compile, "make -C \"%REBAR_DEPS_DIR%/merl\" all -W test"}, - {eunit, + [{eunit, "erlc -I include/erlydtl_preparser.hrl -o test" - " test/erlydtl_extension_testparser.yrl"}, - {"(linux|darwin|solaris)", eunit, "make -C \"$REBAR_DEPS_DIR/merl\" test"}, - {"(freebsd|netbsd|openbsd)", eunit, "gmake -C \"$REBAR_DEPS_DIR/merl\" test"}, - {"win32", eunit, "make -C \"%REBAR_DEPS_DIR%/merl\" test"} + " test/erlydtl_extension_testparser.yrl"} ]}. diff -Ndur erlydtl-0.10.0/rebar.config.script erlydtl-0.10.0-merl-shipped-with-Erlang-OTP-as-of-v18.0/rebar.config.script --- erlydtl-0.10.0/rebar.config.script 1970-01-01 03:00:00.000000000 +0300 +++ erlydtl-0.10.0-merl-shipped-with-Erlang-OTP-as-of-v18.0/rebar.config.script 2015-09-27 22:25:49.083852817 +0300 @@ -0,0 +1,31 @@ +%% -*- mode: erlang -*- + +Patch = fun (Key, Value, Config) -> + case lists:keysearch(Key, 1, Config) of + {value, {_, Org}} -> + lists:keyreplace(Key, 1, Config, {Key, Org ++ Value}); + false -> + [{Key, Value}|Config] + end + end, + +application:load(syntax_tools), +case application:get_key(syntax_tools, vsn) of + {ok, Vsn} when "1.7" > Vsn -> + Deps = [{merl, ".*", + {git, "git://github.com/erlydtl/merl.git", {branch, "erlydtl"}}, + [raw]}], + PreHooks = + [{"(linux|darwin|solaris)", compile, "make -C \"$REBAR_DEPS_DIR/merl\" all -W test"}, + {"(freebsd|netbsd|openbsd)", compile, "gmake -C \"$REBAR_DEPS_DIR/merl\" all"}, + {"win32", compile, "make -C \"%REBAR_DEPS_DIR%/merl\" all -W test"}, + {"(linux|darwin|solaris)", eunit, "make -C \"$REBAR_DEPS_DIR/merl\" test"}, + {"(freebsd|netbsd|openbsd)", eunit, "gmake -C \"$REBAR_DEPS_DIR/merl\" test"}, + {"win32", eunit, "make -C \"%REBAR_DEPS_DIR%/merl\" test"}], + lists:foldl(fun ({K, V}, C) -> Patch(K, V, C) end, CONFIG, + [{deps, Deps}, + {pre_hooks, PreHooks}, + {erl_opts, [{d, 'MERL_DEP'}]}]); + _ -> + CONFIG +end. diff -Ndur erlydtl-0.10.0/rebar-slex.config erlydtl-0.10.0-merl-shipped-with-Erlang-OTP-as-of-v18.0/rebar-slex.config --- erlydtl-0.10.0/rebar-slex.config 2014-12-21 00:45:25.000000000 +0200 +++ erlydtl-0.10.0-merl-shipped-with-Erlang-OTP-as-of-v18.0/rebar-slex.config 2015-09-27 22:30:53.561832218 +0300 @@ -1,8 +1,9 @@ %% -*- mode: erlang -*- {deps, - [{slex, ".*", {git, "git://github.com/erlydtl/slex.git", {tag, "0.2.1"}}}, - {merl, ".*", {git, "git://github.com/erlydtl/merl.git", "28e5b3829168199e8475fa91b997e0c03b90d280"}, [raw]} + [ %% uncomment merl dep in not building on OTP 18.0 or later.. + %% {merl, ".*", {git, "git://github.com/erlydtl/merl.git", {branch, "erlydtl"}}, [raw]}, + {slex, ".*", {git, "git://github.com/erlydtl/slex.git", {branch, "master"}}} ] }. diff -Ndur erlydtl-0.10.0/src/erlydtl_beam_compiler.erl erlydtl-0.10.0-merl-shipped-with-Erlang-OTP-as-of-v18.0/src/erlydtl_beam_compiler.erl --- erlydtl-0.10.0/src/erlydtl_beam_compiler.erl 2014-12-21 00:45:25.000000000 +0200 +++ erlydtl-0.10.0-merl-shipped-with-Erlang-OTP-as-of-v18.0/src/erlydtl_beam_compiler.erl 2015-09-27 22:25:49.084852816 +0300 @@ -67,7 +67,11 @@ load_library/4, shorten_filename/2, push_auto_escape/2, pop_auto_escape/1, token_pos/1, is_stripped_token_empty/1]). +-ifdef(MERL_DEP). -include_lib("merl/include/merl.hrl"). +-else. +-include_lib("syntax_tools/include/merl.hrl"). +-endif. -include("erlydtl_ext.hrl"). diff -Ndur erlydtl-0.10.0/test/erlydtl_eunit_testrunner.erl erlydtl-0.10.0-merl-shipped-with-Erlang-OTP-as-of-v18.0/test/erlydtl_eunit_testrunner.erl --- erlydtl-0.10.0/test/erlydtl_eunit_testrunner.erl 2014-12-21 00:45:25.000000000 +0200 +++ erlydtl-0.10.0-merl-shipped-with-Erlang-OTP-as-of-v18.0/test/erlydtl_eunit_testrunner.erl 2015-09-27 22:31:52.551828228 +0300 @@ -58,8 +58,14 @@ T#test.module, compile_opts(T)) of - {ok, M, W} -> + {ok, M, W0} -> ?assertEqual(T#test.module, M), + %% ignore useless_building warnings + W = lists:flatten( + [case W1 of + {_, [{_, sys_core_fold, useless_building}]} -> []; + _ -> W1 + end || W1 <- W0]), ?assertEqual(T#test.warnings, W); {error, E, W} -> ?assertEqual(T#test.errors, E), diff -Ndur erlydtl-0.10.0/.travis.yml erlydtl-0.10.0-merl-shipped-with-Erlang-OTP-as-of-v18.0/.travis.yml --- erlydtl-0.10.0/.travis.yml 2014-12-21 00:45:25.000000000 +0200 +++ erlydtl-0.10.0-merl-shipped-with-Erlang-OTP-as-of-v18.0/.travis.yml 2015-09-27 22:27:10.331847320 +0300 @@ -1,4 +1,5 @@ language: erlang +sudo: false otp_release: # Test on all supported releases accepted by the `require_otp_vsn` in rebar.config - 17.3 @@ -12,8 +13,9 @@ - R15B02 # since Travis is naughty and calls rebar get-deps behind our backs, -# we'll have to clean it up and build merl our selves.. -script: "make -C deps/merl && make tests" +# we'll have to clean it up and build merl our selves.. (pre OTP 18.0) +script: + - "[ ! -d deps/merl ] || make -C deps/merl && make check" notifications: irc: "chat.freenode.net#erlydtl"
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
