Commit graph

1359 commits

Author SHA1 Message Date
Dave Smith
a5be40c969 Merge branch 'xref_20130130' of git://github.com/spilgames/rebar into spg-xref
Conflicts:
	src/rebar_xref.erl
2013-06-17 16:31:09 -06:00
Dave Smith
d3c125de27 Merge pull request #47 from uwiger/master
rebar_eunit:reset_after_eunit/1 mustn't remove 'included_applications'
2013-06-17 15:21:11 -07:00
Dave Smith
3a9559651c Merge pull request #100 from josevalim/patch-1
External deps_dir should have higher priority than the config one
2013-06-17 15:05:10 -07:00
José Valim
e467642476 External deps_dir should have higher priority than the config one
The external deps_dir should have higher priority because
it is used by scripts and other build tools to set up the
location of the dependencies. This commit ensures that,
even if a project has set deps_dir in its config file has
lower preference than the command line one.
2013-06-18 00:28:52 +03:00
Philip Mueller
c79314593d remove superfluous string concat operator usage 2013-06-16 16:15:14 +02:00
Dave Smith
16eed82ae4 Merge pull request #60 from jcomellas/jc-getopt-0.7.0
Add latest version getopt that automatically wraps usage output lines
2013-06-16 06:24:37 -07:00
Dave Smith
c5e8671ef6 Merge pull request #53 from oferrigni/unit_test_file_handling_fix
Fix file handling on windows for tests
2013-06-16 06:23:54 -07:00
Dave Smith
baf2655343 Merge pull request #44 from nevar/fix_neotoma
Correct ext of neotoma output file
2013-06-16 06:21:59 -07:00
Dave Smith
2f4de5359c Merge pull request #37 from nox/force-registered
Ensure we always have a `registered` value in `.app` files
2013-06-16 06:14:48 -07:00
Dave Smith
76405da6d7 Merge pull request #24 from legoscia/master
Allow specifying eunit suite run order in 'suites'
2013-06-16 06:07:55 -07:00
Dave Smith
547552b5c2 Merge pull request #74 from DeadZen/dz-merged-overlay
Implement merged overlays
2013-06-14 05:52:42 -07:00
Dave Smith
94cf19438c Merge pull request #54 from mattonrails/simpleapp_sup_template_typo
Remove leading empty line from a template
2013-06-14 05:51:13 -07:00
Dave Smith
a94c968951 Merge pull request #97 from tuncer/simplenode-sync
Sync test/upgrade_project/rel/files with priv/templates
2013-06-12 08:05:53 -07:00
Tuncer Ayaz
500b62a890 Sync test/upgrade_project/rel/files with priv/templates 2013-06-12 17:01:57 +02:00
Dave Smith
ef0fd4089f Merge pull request #96 from olgeni/pwd-symlink-fix
Use "pwd -P" to get the current physical path.
2013-06-12 07:46:30 -07:00
Dave Smith
6cd982c897 Merge pull request #75 from rpt/master
Support for QuickCheck Mini
2013-06-12 06:18:16 -07:00
Dave Smith
e792a6426f Merge pull request #91 from syl20bnr/ping-command-for-windows
Add support for ping command on windows in the simple node runner
2013-06-12 06:17:21 -07:00
olgeni
505458eecb Use "pwd -P" to get the current physical path.
It is a portable version of the realpath(1) utility that you can find on
Mac OS X and FreeBSD (see also The Open Group Base Specifications Issue
6, IEEE Std 1003.1).

Without the -P flag, pwd(1) might return different values when the
current path contains one or more symlinks, depending on how you got
into the current directory.

In simplenode.runner, this may cause PIPE_DIR to have different values
on each use, which will make it impossible to connect to the running
node unless you guess the correct path yourself.
2013-06-10 22:15:49 +02:00
Dave Smith
638569acc2 Merge pull request #90 from Motiejus/dep_plugin
Fix searching for plugins
2013-05-21 05:22:43 -07:00
syl20bnr
89c8f931a5 Add support for ping command on windows in the simple node runner 2013-05-20 15:40:03 -04:00
Motiejus Jakštys
252b31f2a4 Fix searching for plugins
If a plugin is in a dependency, rebar didn't search for it carefully
enough.
2013-05-19 16:33:29 +03:00
Dave Smith
ae3323728f Merge branch 'master' of git://github.com/ferd/rebar into ferd-master 2013-05-15 10:07:02 -06:00
Dave Smith
d0a3f5246a Merge pull request #85 from ratelle/rebar-deps-dir-in-port-compiler
Add rebar-deps env to port compiler SharedEnv
2013-05-15 07:37:03 -07:00
Jeremie Lasalle Ratelle
c2fae0ca5c Add rebar-deps env to port compiler SharedEnv
REBAR_DEPS_DIR is often needed when a nif needs to be linked with a raw
dependency.
2013-05-06 11:15:06 -04:00
Dave Smith
65b183b020 Merge pull request #83 from rebar/travisci-fixes
Travisci fixes
2013-04-23 05:53:00 -07:00
Dave Smith
cbc832fe87 Adding R16B to travis build 2013-04-23 06:44:43 -06:00
Dave Smith
9ad0a4a185 Additional travisci fixes 2013-04-23 06:42:16 -06:00
Dave Smith
a3ce71e381 Adding user/email on created repos for travis CI 2013-04-22 13:45:41 -06:00
Dave Smith
6bbd79044d Further investigation into travis CI issues 2013-04-22 13:39:42 -06:00
Dave Smith
c1925d0de7 Add author to fix issue when compiling on travis 2013-04-22 11:48:44 -06:00
Dave Smith
d22c1b1ab2 Enable verbose output from retest 2013-04-22 08:55:36 -06:00
Dave Smith
e632b7b185 Merge pull request #80 from tuncer/nodetool-no_compile
Do not compile nodetool escript
2013-04-21 07:14:28 -07:00
Fred Hebert
bcc57e9b04 Handle ct_run exit codes in R15B02 and later
Since R15B02, ct_run returns a non-zero exit code when some tests
failed or were auto-skipped. (See ticket OTP-9865.)

This fix makes it so a non-0 code doesn't cause an instant failure, but
still prompts for log verification before doing so. Given the behaviour
was acceptable for pre-R15B02, it should be valid with it with
post-R15B02.

The fix should also be backwards compatible.
2013-04-18 22:45:46 -04:00
Tuncer Ayaz
a2f3207542 Do not compile nodetool escript
This removes the dependency on lib/compiler in an OTP release.
2013-04-12 20:52:26 +02:00
Dave Smith
1a083672b1 Merge pull request #81 from massemanet/patch-1
More error logging
2013-04-12 11:23:55 -07:00
mats cronqvist
63a69af04b More error logging
rebar throws away some error messages, e.g. the ones generated if the yecc compiler is broken.
2013-04-12 21:21:53 +03:00
Dave Smith
98d7ec931b Merge pull request #43 from tuncer/reltool-mod_cond
simplenode.reltool.config: use default sys-level mod_cond setting
2013-04-10 16:00:58 -07:00
Dave Smith
331c0809c8 Merge pull request #66 from tuncer/dialyzer-no_native
Makefile: call Dialyzer with -nn flag
2013-04-10 15:56:10 -07:00
Tuncer Ayaz
d28c92ff11 simplenode.reltool.config: use default sys-level mod_cond setting
As discussed here
http://erlang.org/pipermail/erlang-questions/2012-December/071135.html
change the reltool spec to use the default sys-level mod_cond setting.
2013-04-06 18:37:47 +02:00
Pedram Nimreezi
df7cfba71f Implement merged overlays
This allows overlay_vars to merge comma delimited var config files
2013-03-26 05:23:47 -04:00
Krzysztof Rutka
5dfb6d6351 Add support for QuickCheck Mini 2013-03-25 09:30:46 +01:00
Tuncer Ayaz
8b76d23aae Makefile: call Dialyzer with -nn flag
This speeds up 'make dialyzer' for the common case of Erlang/OTP built
without --enable-native-libs.
2013-03-04 17:16:00 +01:00
Dave Smith
720d71e47d Add travis target to make it easier to reproduce failures locally 2013-03-04 08:33:54 -07:00
Dave Smith
a9cb38e6d1 Merge pull request #68 from nevar/fix_unicode_promt
Fix unicode
2013-03-04 06:49:32 -08:00
Dave Smith
c77f8e13ca Fix missing call to cwd_predirs 2013-03-02 08:25:28 -07:00
Dave Smith
09c7e17e32 Remove hg from integration tests; git is defacto standard at this point 2013-03-02 08:22:09 -07:00
Dave Smith
21038d537c Merge pull request #38 from tuncer/fix-sub_dir-association
rebar_core: fix sub dir association
2013-03-02 07:04:41 -08:00
Dave Smith
eacfc1160a Merge pull request #69 from tuncer/repo-url
Update rebar repo urls
2013-03-02 06:52:57 -08:00
Dave Smith
c057c7771e Remove unnecessary bar 2013-03-02 07:51:26 -07:00
Dave Smith
f29e33cae0 Merge pull request #55 from jaredmorrow/jem-simplenode-multi-platform
Change simplenode template files to work on more platforms
2013-03-02 06:50:34 -08:00