make mad regular OTP application back

synrc · May 10, 2014 · fe1e953 · fe1e953
1 parent 4b1fcd0
commit fe1e953
Show file tree

Hide file tree

Showing 25 changed files with 10 additions and 13 deletions.
diff --git a/apps/mad/rebar.config b/apps/mad/rebar.config
diff --git a/apps/rebar.config b/apps/rebar.config
diff --git a/build b/build
@@ -10,7 +10,7 @@ main(_) ->
 
 files() ->
     [{filename:basename(F), read_file(F)}
-     || F <- filelib:wildcard(filename:join("apps/mad/ebin", "*")) ++
+     || F <- filelib:wildcard(filename:join("ebin", "*")) ++
             filelib:wildcard(filename:join(["deps", "*", "ebin", "*"]))].
 
 read_file(File) ->

diff --git a/mad b/mad
diff --git a/otp.mk b/otp.mk
@@ -7,7 +7,7 @@ ERL_LIBS := $(subst $(space),:,$(ROOTS))
 test: ct
 compile: get-deps
 get-deps compile clean:
-	./mad $@
+	rebar $@
 escript: compile
 	./build
 $(PLT_NAME):

diff --git a/rebar.config b/rebar.config
@@ -1,5 +1,4 @@
 {cache,"~/.mad/repos"}.
-{sub_dirs,["apps"]}.
 {deps_dir,"deps"}.
 {deps, [
         {getopt, ".*",   {git, "git://github.com/jcomellas/getopt.git", {tag, "v0.8.2"}}}

diff --git a/apps/mad/src/mad.app.src → src/mad.app.src b/apps/mad/src/mad.app.src → src/mad.app.src
diff --git a/apps/mad/src/mad.erl → src/mad.erl b/apps/mad/src/mad.erl → src/mad.erl
@@ -49,12 +49,14 @@ main(Args) ->
 
 %% compile dependencies and the app
 compile(Cwd, ConfigFile, Conf) ->
-    'compile-deps'(Cwd, ConfigFile, Conf),
-    'compile-apps'(Cwd, ConfigFile, Conf).
+    'compile-apps'(Cwd, ConfigFile, Conf),
+    'compile-deps'(Cwd, ConfigFile, Conf).
 
 'compile-apps'(Cwd, ConfigFile, Conf) ->
-    Dirs = mad_utils:sub_dirs(Cwd, ConfigFile, Conf),
-    mad_compile:deps(Cwd, Conf, ConfigFile, Dirs).
+    Dirs = get_value(sub_dirs, Conf, []),
+    case Dirs of
+        [] -> mad_compile:dep(Cwd, Conf, ConfigFile, Cwd);
+        Apps -> mad_compile:deps(Cwd, Conf, ConfigFile, Apps) end.
 
 'compile-deps'(Cwd, ConfigFile, Conf) ->
     mad_compile:deps(Cwd, Conf, ConfigFile, get_value(deps, Conf, [])).

diff --git a/apps/mad/src/mad_compile.erl → src/mad_compile.erl b/apps/mad/src/mad_compile.erl → src/mad_compile.erl
@@ -11,7 +11,7 @@
 deps(_, _, _, []) -> ok;
 deps(Cwd, Conf, ConfigFile, [H|T]) ->
     {Name, _} = mad_deps:name_and_repo(H),
-    case get(mad_utils:to_atom(Name)) of
+    case get(Name) of
         compiled -> ok;
         _ -> dep(Cwd, Conf, ConfigFile, Name) end,
     deps(Cwd, Conf, ConfigFile, T).
@@ -50,7 +50,7 @@ dep(Cwd, _Conf, ConfigFile, Name) ->
 
             dtl(DepPath,Conf1),
 
-            put(mad_utils:to_atom(Name), compiled),
+            put(Name, compiled),
             ok
     end.
 

diff --git a/apps/mad/src/mad_deps.erl → src/mad_deps.erl b/apps/mad/src/mad_deps.erl → src/mad_deps.erl
diff --git a/apps/mad/src/mad_utils.erl → src/mad_utils.erl b/apps/mad/src/mad_utils.erl → src/mad_utils.erl
diff --git a/apps/mad/test/helper.erl → test/helper.erl b/apps/mad/test/helper.erl → test/helper.erl
diff --git a/apps/mad/test/mad_compile_SUITE.erl → test/mad_compile_SUITE.erl b/apps/mad/test/mad_compile_SUITE.erl → test/mad_compile_SUITE.erl
diff --git a/..._compile_SUITE_data/include/three_inc.hrl → ..._compile_SUITE_data/include/three_inc.hrl b/..._compile_SUITE_data/include/three_inc.hrl → ..._compile_SUITE_data/include/three_inc.hrl
diff --git a/.../mad_compile_SUITE_data/src/three.app.src → .../mad_compile_SUITE_data/src/three.app.src b/.../mad_compile_SUITE_data/src/three.app.src → .../mad_compile_SUITE_data/src/three.app.src
diff --git a/...test/mad_compile_SUITE_data/src/three.erl → test/mad_compile_SUITE_data/src/three.erl b/...test/mad_compile_SUITE_data/src/three.erl → test/mad_compile_SUITE_data/src/three.erl
diff --git a/.../mad_compile_SUITE_data/src/three_src.hrl → .../mad_compile_SUITE_data/src/three_src.hrl b/.../mad_compile_SUITE_data/src/three_src.hrl → .../mad_compile_SUITE_data/src/three_src.hrl
diff --git a/apps/mad/test/mad_deps_SUITE.erl → test/mad_deps_SUITE.erl b/apps/mad/test/mad_deps_SUITE.erl → test/mad_deps_SUITE.erl
diff --git a/apps/mad/test/mad_utils_SUITE.erl → test/mad_utils_SUITE.erl b/apps/mad/test/mad_utils_SUITE.erl → test/mad_utils_SUITE.erl
diff --git a/...ad/test/mad_utils_SUITE_data/rebar.config → test/mad_utils_SUITE_data/rebar.config b/...ad/test/mad_utils_SUITE_data/rebar.config → test/mad_utils_SUITE_data/rebar.config
diff --git a/.../mad_utils_SUITE_data/rebar.config.script → .../mad_utils_SUITE_data/rebar.config.script b/.../mad_utils_SUITE_data/rebar.config.script → .../mad_utils_SUITE_data/rebar.config.script
diff --git a/...ad_utils_SUITE_data/sub_dir1/rebar.config → ...ad_utils_SUITE_data/sub_dir1/rebar.config b/...ad_utils_SUITE_data/sub_dir1/rebar.config → ...ad_utils_SUITE_data/sub_dir1/rebar.config
diff --git a/...d_utils_SUITE_data/sub_dir1/trap/.gitkeep → ...d_utils_SUITE_data/sub_dir1/trap/.gitkeep b/...d_utils_SUITE_data/sub_dir1/trap/.gitkeep → ...d_utils_SUITE_data/sub_dir1/trap/.gitkeep
diff --git a/...ad_utils_SUITE_data/sub_dir2/rebar.config → ...ad_utils_SUITE_data/sub_dir2/rebar.config b/...ad_utils_SUITE_data/sub_dir2/rebar.config → ...ad_utils_SUITE_data/sub_dir2/rebar.config
diff --git a/...SUITE_data/sub_dir2/time-machine/.gitkeep → ...SUITE_data/sub_dir2/time-machine/.gitkeep b/...SUITE_data/sub_dir2/time-machine/.gitkeep → ...SUITE_data/sub_dir2/time-machine/.gitkeep