Fred Hebert
ae7a7aae18
Revert "Merge branch 'kittee-ct_appconfig_fix'"
...
This reverts commit 3c0f420c2a
, reversing
changes made to 8f64e13184
.
2014-12-21 15:25:00 -05:00
Fred Hebert
3c0f420c2a
Merge branch 'kittee-ct_appconfig_fix'
2014-12-21 15:17:12 -05:00
Fred Hebert
440d73825b
Merge branch 'ct_appconfig_fix' of https://github.com/kittee/rebar into kittee-ct_appconfig_fix
...
Conflicts:
THANKS
2014-12-21 15:17:03 -05:00
Fred Hebert
8f64e13184
Merge pull request #408 from lrascao/fix/remove_duplicate_console_message
...
Fix/remove duplicate console message
2014-12-21 15:03:27 -05:00
Fred Hebert
81063d33f0
Merge pull request #386 from tomas-abrahamsson/gpb-recompilation-detection
...
Recompile .proto files with gpb also with prefix/suffix
2014-12-21 15:03:05 -05:00
Fred Hebert
6584defdda
Merge pull request #406 from stwind/master
...
Fix deps path check in rebar_ct:collect_glob/3
2014-12-21 15:02:39 -05:00
Luis Rascao
5bb7b2963f
gpb_compiler: remove duplicate compiling message
...
It's unnecessary to print "Compiling..." since base_compiler already prints a
message to the effect.
2014-12-21 16:08:04 +00:00
Fred Hebert
3a0c547089
Merge branch 'coolchevy-fix-dtl-target-path'
2014-12-16 13:04:09 -05:00
Fred Hebert
3900724cec
Remove no longer valid comment
2014-12-16 13:03:44 -05:00
Fred Hebert
ede6666961
Merge branch 'fix-dtl-target-path' of https://github.com/coolchevy/rebar into coolchevy-fix-dtl-target-path
2014-12-16 12:49:47 -05:00
Fred Hebert
49a96a6318
Merge pull request #405 from tuncer/erlgrind
...
Generate cachegrind file if erlgrind is available
2014-12-16 12:48:55 -05:00
stwind
a83c80d4c0
Fix deps path check in rebar_ct:collect_glob/3
...
Since rebar_deps:get_deps_dir/1 returns an absolute path,
lists:member(Deps, Parts2) will always return false, thus .test.spec
files in deps/ will not be ignored.
2014-12-11 11:59:40 +08:00
Tuncer Ayaz
39ab4e13fb
Generate cachegrind file if erlgrind is available
2014-12-08 23:09:20 +01:00
Fred Hebert
01ef314951
Merge pull request #404 from tuncer/consistent-export-attributes
...
Consistently format export attributes
2014-12-04 10:51:48 -05:00
Fred Hebert
d6f4fd1c28
Merge pull request #338 from vladdu/app_src_script
...
Processing .app.src.script expects a single value to be returned.
2014-12-04 10:26:26 -05:00
Tuncer Ayaz
c7a611d22d
Consistently format export attributes
2014-12-03 23:25:46 +01:00
Vlad Dumitrescu
d17b254662
add tests for processing .app.src{.script} files
2014-12-03 18:39:29 +01:00
Vlad Dumitrescu
7d55c9986f
Fix detection and processing of .app.src.script
...
Loading .app, .app.src or .app.src.script returns now the value as per
the documentation (was wrapped in a list in some cases).
More places in the code detect .app.src.script and handle it.
2014-12-03 18:39:17 +01:00
Fred Hebert
b7960656e7
Merge pull request #400 from vladdu/headers
...
add Emacs/vi header to non-dummy test modules
2014-12-03 11:34:10 -05:00
Fred Hebert
16a7a95dc1
Merge pull request #403 from sdepold/patch-1
...
Update reference to installation notes
2014-12-03 08:05:54 -05:00
Sascha Depold
f94e50bc5d
Update reference to installation notes
2014-12-03 12:37:05 +01:00
Vitalii Kulchevych
34a713d88a
fix target dir without subdir for erlydtl templates
2014-12-02 16:51:36 +02:00
Vlad Dumitrescu
aa5b8ac772
add Emacs/vi header to non-dummy test modules
2014-12-02 10:52:45 +01:00
Tuncer Ayaz
b44b4f4199
Fix detection of .app.src.script (Reported-by: Vlad Dumitrescu)
...
rebar_app_utils:is_app_dir/1 failed to search for .app.src.script when
looking for an app file in src/.
While at it, fix inconsistent module export list.
2014-12-02 10:00:50 +01:00
Tristan Sloughter
47dba1bbc3
Merge pull request #399 from tomas-abrahamsson/gpb-inttest-timeout
...
Increase the timeout for the inttest/proto_gpb
2014-12-01 20:14:23 -06:00
Tomas Abrahamsson
f1ef90b9df
Increase the timeout for the inttest/proto_gpb
...
On my slow old netbook with a 1.6GHz CPU, this inttest
takes about 40 seconds to run, of which network activity
is about 3s, the default timeout of retest is 30s.
Add a generous margin to avoid unnecessary timeouts.
2014-12-01 23:47:45 +01:00
Igor Savchuk
bc46b501d0
Fix app.config argument passing when using ct_run
...
ct_run has changed its config key from -ct_config to -config,
thus, -config key, used to specify app.config now must be
placed after -erl_args
2014-11-28 16:48:47 +03:00
Fred Hebert
d42ed46835
Normalize log level as WARN to ERROR in new patch
2014-11-27 15:34:52 -05:00
Fred Hebert
167e2a12b8
Merge pull request #322 from tuncer/fix-319
...
Treat vsn mismatch as warning if -k/--keep-going
2014-11-27 14:47:26 -05:00
Tuncer Ayaz
a4c5f3357f
Treat vsn mismatch as warning if -k/--keep-going
...
Fixes #319 .
2014-11-25 18:44:21 +01:00
Fred Hebert
899d60cdb0
Merge branch 'terrencehan-fix_upgrade_error'
2014-11-21 10:11:53 -05:00
Fred Hebert
c54d496030
Additional fixes and modification
...
- Updating documentation to be more accurate
- Style fixes
- More precise error messages
2014-11-21 10:11:13 -05:00
Fred Hebert
b41086ba98
Merge branch 'fix_upgrade_error' of https://github.com/terrencehan/rebar into terrencehan-fix_upgrade_error
2014-11-21 09:59:46 -05:00
Fred Hebert
4ba8f74787
Revert "Merge branch 'platinumthinker-color_in_logs'"
...
This reverts commit 49930fe566
, reversing
changes made to 6e6b0fd43f
.
2014-11-21 09:57:49 -05:00
Fred Hebert
49930fe566
Merge branch 'platinumthinker-color_in_logs'
2014-11-21 09:46:31 -05:00
Fred Hebert
733d3771fa
Merge branch 'color_in_logs' of https://github.com/platinumthinker/rebar into platinumthinker-color_in_logs
...
Conflicts:
THANKS
2014-11-21 09:46:10 -05:00
Andrey Teplyashin
cc3f54b008
Fix verbose level in global rebar config
...
Replace application:set_env on erlang:put
2014-11-20 00:22:26 +06:00
Andrey Teplyashin
c01cf5902b
Add colored logs
2014-11-19 23:44:55 +06:00
Tomas Abrahamsson
51b34a6e52
Recompile .proto files with gpb also with prefix/suffix
...
For protocol buffer files, when there were gpb options to alter the
module name with prefix or suffix, recompilation was not properly
detected. This is now fixed. (Issue #384 ).
Properly detecting change meant moving from rebar_base_compiler, so it
also meant processing protocol buffer files in sequence instead of in
parallel.
2014-11-05 00:31:52 +01:00
Fred Hebert
6e6b0fd43f
Merge pull request #385 from tuncer/dialyzer-warning
...
Fix Dialyzer warning introduced in 0caf047f
2014-11-03 15:09:05 -05:00
Tuncer Ayaz
3cae9d83cd
Fix Dialyzer warning introduced in 0caf047f
2014-11-03 20:39:19 +01:00
Tristan Sloughter
26c5a6e872
Merge pull request #382 from tuncer/update-dialyzer
...
Adapt dialyzer_reference to ba466e2d
changes
2014-11-02 14:02:00 -06:00
Tuncer Ayaz
faa074da91
distclean: do not remove plt
2014-11-02 14:23:13 +01:00
Tuncer Ayaz
c72fb997da
Adapt dialyzer_reference to ba466e2d
changes
2014-11-02 14:00:15 +01:00
Fred Hebert
17e0b14d1d
Merge pull request #203 from tomas-abrahamsson/pluggable-proto-compilers-gpb
...
Pluggable proto compilers gpb
2014-10-31 09:32:13 -04:00
Fred Hebert
5f7a5afa75
Merge pull request #337 from tuncer/eflame
...
Implement eflame -p/--profile support
2014-10-30 11:54:20 -04:00
Tomas Abrahamsson
9f057f29c5
Add inttest for default proto compiler (protobuffs)
...
This borrows heavily from the inttest for gpb, many thanks
to Luis Rascão for providing a most useful example.
2014-10-29 23:46:01 +01:00
Luis Rascão
144cb8c156
Add proto compiler gpb inttest
...
exercises rebar/gpb integration
The bulk of these tests are written by Luis Rascão, hence he is the
author of this commit. As the committer, I have cherry-picked his two
commits 4c87bcd and ebb8182, from the feature/support_gpb_protobuf
branch in the git://github.com/lrascao/rebar repo, and have slightly
adapted it to fit this pluggable-proto-compilers-gpb branch.
Update the THANKS file
2014-10-29 23:46:01 +01:00
Tomas Abrahamsson
1b367a8b24
Add support for compiling proto files using gpb
...
This adds the config option {proto_compiler,gpb} for selecting gpb
as the compiler for protocol buffer files. When gpb is used as
compiler, it reads the gpb_opts config item for options.
2014-10-29 23:45:35 +01:00
Tomas Abrahamsson
0caf047fc3
Introduce pluggable protocol buffer compilers
...
Make it possible for plug in alternative protocol buffer compilers.
The compilers are picked up based on if they export all of the
functions key/0, proto_compile/3, proto_clean/3 and proto_info/2.
The set of compiler modules to choose from, is fetched from the rebar
application environment, from the app_dir modules.
A new config option, {proto_compiler,Compiler}, specifies which of
the available protocol buffer compilers to use. The 'protobuffs'
compiler is now one such compiler (the only one), and it is also the
default, for backwards compatibility.
2014-10-29 23:45:35 +01:00