Commit graph

54 commits

Author SHA1 Message Date
Dave Smith
d896fbffa7 Merge pull request #325 from saleyn/reltool
Fix return value of rebar_overlay
2012-10-20 12:06:04 -07:00
serge
2d5bd56605 Fix return value of rebar:overlay/2
When 'rebar overlay' is run rebar_core got a wrong result
{Config, ok} from rebar_reltool instead of {ok, Config}.
2012-10-20 13:32:30 +04:00
serge
3de9167d99 Add hostname variable to reltool overlay templates 2012-10-20 03:05:42 +04:00
joewilliams
29492dd0e8 Correctly use release_handler:create_RELEASES 2012-09-04 18:43:22 +02:00
Tuncer Ayaz
3cc8fb2855 rebar_reltool: remove blank lines 2012-08-30 22:20:02 +02:00
Dmitriy Kargapolov
9c7259d8a2 Add dynamic .script support for overlay vars file 2012-08-30 22:18:09 +02:00
Tuncer Ayaz
636c02f0be Fix R13B03 build (Reported-by: Sergey Nartimov) 2012-07-28 19:51:57 +02:00
Steven Gravell
093f160be5 relative libs in RELEASES file 2012-07-26 13:40:36 +02:00
Tuncer Ayaz
252757c753 Do not use application:set_env 2012-07-23 13:17:11 +02:00
Tuncer Ayaz
3c56fbab6f Restore old reltool vsn check
reltool is missing an app resource file before R14A.
Therefore, restore the old check and add TODO.
2012-07-22 12:41:55 +02:00
Tuncer Ayaz
86c69bc253 Fix Dialyzer warning 2012-07-21 17:56:53 +02:00
Ulf Wiger
6996cd4fcc Use a more appropriate method to check reltool's vsn
If running e.g. rebar generate using an OTP development build,
rebar will complain that reltool has the version "", which is
less than the required "0.5.2". This is because rebar_reltool
simply checks the path returned by code:which(reltool), which
doesn't yield version information if used in a development build.

This patch substitutes a more robust method (load reltool and
fetch the info from application:loaded_applications()).

As it happens, this will not be enough to make things work,
but now Reltool will explain that it cannot generate a spec
from a system that is not installed, giving a better hint
as to what needs to be done.
2012-07-21 17:52:01 +02:00
Tuncer Ayaz
e185e86bff Remove shared state 2012-07-13 15:21:56 +02:00
Daniel Luna
d560ccda0d Use ~p for file:consult/1 {error, Reason} printout 2012-06-29 21:39:20 +02:00
Dave Smith
c86c99940d Remove ?FAIL in favor of ?ABORT 2012-06-08 07:06:15 -06:00
Tuncer Ayaz
f7d9a9bf8b Fix whitespace errors 2012-06-01 11:45:56 +02:00
Yurin Slava
e4bc95500c Fix #232 (rebar_reltool:mk_target_dir) 2012-06-01 11:38:23 +02:00
Yurin Slava
5a640a92fd Remove unused include_lib directive 2012-02-04 11:28:12 +01:00
Tuncer Ayaz
e4c85d4548 Remove trailing whitespace in rebar_reltool 2011-12-19 19:17:42 +01:00
smithwinston
1eaf88d1d0 Add root_dir option to reltool.config
When generating a node using rebar generate, rebar always used
code:root_dir() to find the Erlang installation to clone into the node
tree.  However, for anyone wishing to build a cross-compiled node, there
was no way to override this.  This patch adds a new option to
reltool.config file to allow an alternate root_dir to be specified, for
example:

{root_dir, "/tmp/otp_R14B03_armv7l"}

This assumes that the contents of /tmp/otp_R14B03_armv7l has been
generated using the instructions found in the xcomp directory in your
$ERL_TOP structure.  NOTE: you may have to add additional filters to
exclude files not present in the xcomp version, such as the .smp files
if you have disabled that.
2011-11-26 10:38:27 +01:00
Steven Gravell
3c7a5804e9 Add overlay command to run overlays only
required for building on a different machine to what your live
config is kept on. This way you can build on one machine,
distribute to new machine, then run overlays against a live
config to prevent accidently running code against a live
config in a development or ci environment.
2011-10-20 16:33:19 +02:00
joewilliams
cb5056b2e3 Get rid of app.config
app.config has been a long standing erroneous file in rebar. Erlang/OTP
documentation suggests a sys.config file instead. This file is stored in
the releases/VSN directory. This does a few things but most importantly
it ensures your config (contained in the application environment)
survives a hot upgrade. It also has the advantage of allowing the
configuration of the application to be versioned along side the
application code. This patch flips rebar to use sys.config rather than
app.config.

Additionally it makes this flip to vm.args as well, making them
versioned just like sys.config.

This patch also includes runner script changes to support the old
etc/app.config config file location and support for Windows.

Thanks to mokele for the initial work and kick in the pants to make this
finially happen.
2011-09-20 09:44:41 -07:00
Steven Gravell
0f5e393292 look for new and old versions in the target parent
The target_dir config in reltool allows you to put your release in
a directory other than in ./NAME, so we should look in the parent
directory of that to find the new and old versions instead of
simply looking in ./

Move untaring and retaring into a temporary path instead of in ./
to prevent name collisions with "releases" and "lib" that might
exist already. Having a subdirectory rel/releases/ can be useful.
2011-07-01 18:04:32 +01:00
Tuncer Ayaz
1e342faee8 Apply Tidier suggestions 2011-06-02 22:09:11 +02:00
Max Lapshin
8666d57d78 Expand variables in replace overlay 2011-04-29 14:58:31 +04:00
Dave Smith
bda6ee0e48 Centralize variable resolution; add target_dir variable 2011-04-10 16:12:50 -06:00
Dave Smith
3e2baf1a07 Add support for template_wildcarding; allows files from many directories to be templated. 2011-04-10 16:12:50 -06:00
Dave Smith
b7111dce85 Refactor overlay_vars to enable overrides from command-line 2011-04-10 16:12:50 -06:00
Tuncer Ayaz
63de05d914 Clean up code 2011-02-06 17:41:04 +01:00
Tuncer Ayaz
c466076ffb Clean up emacs file local variables 2011-01-31 17:55:36 +01:00
Tuncer Ayaz
e4036cbe56 Apply Tidier suggestions 2011-01-13 17:39:14 +01:00
Juhani Rankimies
fd5ebe69a4 Port rebar_file_utils to Windows
Modify rm_rf and cp_r to work when {win32,_} = os:type().
Simplify rm_rf to only accept one filename, directoryname or wildcard.
Add unit tests to ensure a similar behaviour on windows and unix.

Thanks to tuncer for guidance and feedback.
2010-10-27 11:39:12 -06:00
Kostis Sagonas
7dc76d578e Tidier improvements 2010-10-26 00:38:51 +02:00
Kostis Sagonas
e024778599 Dialyzer related cleanups 2010-10-10 14:11:13 -06:00
Dave Smith
1f3c49cae7 Move version check/enforcement for reltool into rebar_reltool; rebar should work (excepting reltool support) with anything as far back as R12, once you've compiled it 2010-06-22 14:13:39 -06:00
Dave Smith
c32d26f509 Enable target_dir to be passed as command-line parameter 2010-06-22 10:25:42 -06:00
Dave Smith
127483f32b Make sure to apply any file perms when doing a templated file 2010-06-21 15:08:30 -06:00
Dave Smith
f3039c7a87 Escape backslashes prior to escaping the quotes 2010-06-21 14:48:37 -06:00
Klas Johansson
aea3184139 Fix compiler warnings 2010-06-19 15:46:57 +02:00
Andy Gross
b5d6fed2f6 fix call to dict:new (should be dict:from_list) 2010-06-16 22:57:01 -04:00
Dave Smith
68c0def250 Fix missing parameter when invoking rebar_utils:sh 2010-06-15 14:49:03 -06:00
Dave Smith
4a12b13939 Refactor of overlay support in reltool extension; adding support for templating overlay files
--HG--
extra : rebase_source : f042bd65d63dbaf4177f444f66033883bf7522a5
2010-06-14 18:16:26 -06:00
Dave Smith
96e9a2a521 Look for dirs named erts-vsn when setting up spec for copying files 2010-01-14 07:46:00 -05:00
Tuncer Ayaz
0817dec7ca Rolled back getopt to restore custom variables 2010-01-01 00:08:00 +01:00
Tuncer Ayaz
9a8015f2d7 Added vi modeline/emacs local variables to file headers 2009-12-31 19:42:53 +01:00
Tuncer Ayaz
940f9c232b Enhanced option parsing with new getopt and made rebar more user friendly 2009-12-31 18:00:02 +01:00
Tuncer Ayaz
8c85021c1e Deleted trailing whitespace 2009-12-30 13:13:39 +01:00
Dave Smith
4d3c7e60d6 Make sure to append overlay files to end of spec; otherwise might be overwritten by canonical install 2009-12-16 10:26:50 -05:00
Dave Smith
c3f0f2565b Adding support for overlays 2009-12-14 19:30:51 -05:00
Dave Smith
e86f82f10d Fixing warning 2009-12-14 09:29:24 -05:00