remove LING and VX profiles

include/mad.hrl

@@ -1 +1 @@
--define(VERSION,"8be144").
+-define(VERSION,"180e54").

src/mad_release.erl

@@ -1,13 +1,10 @@
 -module(mad_release).
 -compile(export_all).
 
-release([])              -> release(["script"]);
-release(["depot"])       -> release(["depot", "sample"]);
+release(["beam",N])      -> mad_systools:beam_release(N);
+release(["script",N])    -> mad_escript:main(N);
 release(["beam"])        -> release(["beam",  "sample"]);
-release(["ling"])        -> release(["ling",  "sample"]);
 release(["script"])      -> release(["script","sample"]);
-release(["ling",N])      -> mad_ling:ling(N);
-release(["script",N])    -> mad_escript:main(N);
-release(["beam",N])      -> mad_systools:beam_release(N);
-release(["depot",N])     -> mad_synrc:depot_release(N);
+release([])              -> release(["script"]);
 release([X])             -> release(["script",X]).
+

src/package/mad_ling.erl

@@ -1,138 +0,0 @@
--module(mad_ling).
--description("LING Erlang Virtual Machine Bundle Packaging").
--copyright('Cloudozer, LLP').
--compile(export_all).
--define(ARCH, list_to_atom( case os:getenv("ARCH") of false -> "posix"; A -> A end)).
-
-ling(Params) ->
-    mad_resolve:main(),
-    _App = filename:basename(case Params of [] ->   mad_utils:cwd(); E -> E end),
-    mad:info("ARCH: ~p~n",         [?ARCH]),
-    mad:info("Bundle Name: ~p~n",  [mad_repl:local_app()]),
-    mad:info("System: ~p~n",       [mad_repl:system()]),
-    mad:info("Apps: ~p~n",         [mad_repl:applist()]),
-%    mad:info("Overlay: ~p~n",      [[{filename:basename(N),size(B)}||{N,B} <- mad_bundle:overlay()]]),
-%    mad:info("Files: ~p~n",        [[{filename:basename(N),size(B)}||{N,B} <- bundle()]]),
-    mad:info("Overlay: ~p~n",      [[filename:basename(N)||{N,_B} <- mad_bundle:overlay()]]),
-    add_apps(),
-    {ok,_App}.
-
-cache_dir()       -> ".madaline/".
-local_map(Bucks)  -> list_to_binary(lists:map(fun({B,M,_}) -> io_lib:format("~s /~s\n",[M,B]) end,Bucks)).
-bundle()          -> lists:flatten([ mad_bundle:X() || X <- [beams,privs,system_files,overlay] ]).
-library(Filename) -> case filename:split(Filename) of
-    ["deps","ling","apps",Lib|_] -> list_to_atom(Lib);
-                      ["ebin"|_] -> mad_repl:local_app();
-                      ["priv"|_] -> mad_repl:local_app();
-           A when length(A) >= 3 -> list_to_atom(hd(string:tokens(lists:nth(3,lists:reverse(A)),"-")));
-                  ["apps",Lib|_] -> list_to_atom(Lib);
-                  ["deps",Lib|_] -> list_to_atom(Lib);
-                               _ -> mad_repl:local_app() end.
-
-apps(Ordered) ->
-    Overlay = [ {filename:basename(N),B} || {N,B} <- mad_bundle:overlay() ],
-    lists:foldl(fun({N,B},Acc) ->
-        A = library(N),
-        Base = filename:basename(N),
-        Body = case lists:keyfind(Base,1,Overlay) of
-                    false -> B;
-                    {Base,Bin} -> 'overlay', Bin end,
-         case lists:keyfind(A,1,Acc) of
-              false -> [{A,[{A,Base,Body}]}|Acc];
-              {A,Files} -> lists:keyreplace(A,1,Acc,{A,[{A,Base,Body}|Files]}) end
-    end,lists:zip(Ordered,lists:duplicate(length(Ordered),[])),bundle()).
-
-lib({App,Files}) ->
-    { App, lists:concat(["/erlang/lib/",App,"/ebin"]), Files }.
-
-boot(Ordered) ->
-    BootCode = element(2,file:read_file(lists:concat([code:root_dir(),"/bin/start.boot"]))),
-    { script, Erlang, Boot } = binary_to_term(BootCode),
-    AutoLaunch = {script,Erlang,Boot++[{apply,{application,start,[App]}} || App <- Ordered]},
-    mad:info("Boot Code: ~p~n",[AutoLaunch]),
-    { boot, "start.boot", term_to_binary(AutoLaunch) }.
-
-add_apps() ->
-    {ok,Ordered} = mad_resolve:orderapps(),
-    Bucks = [{boot,"/boot",[local_map, boot(Ordered)]}] ++ [ lib(E) || E <- apps(Ordered) ],
-    %mad:info("Bucks: ~p~n",[[{App,Mount,[{filename:basename(F),size(Bin)}||{_,F,Bin}<-Files]}||{App,Mount,Files}<-Bucks]]),
-    mad:info("Bucks: ~p~n",[[{App,Mount,length(Files)}||{App,Mount,Files}<-Bucks]]),
-    filelib:ensure_dir(cache_dir()),
-    EmbedFsPath = lists:concat([cache_dir(),"/embed.fs"]),
-    mad:info("Initializing EMBED.FS:"),
-    Res = embed_fs(EmbedFsPath,Bucks),
-	{ok, EmbedFsObject} = embedfs_object(EmbedFsPath),
-	Oneliner = ld() ++
-               ["../deps/ling/core/vmling.o"] ++
-               ["-lm", "-lpthread", "-ldl"] ++
-               [EmbedFsObject, "-o", "../" ++ atom_to_list(mad_repl:local_app()) ++ ".img"],
-    mad:info("LD: ~p~n",[Oneliner]),
-	Res = case sh:oneliner(Oneliner,cache_dir()) of
-	           {_,0,_} -> ok;
-	           {_,_,M} -> binary_to_list(M) end,
-    mad:info("Linking Image: ~p~n",[Res]).
-
-embed_fs(EmbedFsPath,Bucks)  ->
-    {ok, EmbedFs} = file:open(EmbedFsPath, [write]),
-    BuckCount = length(Bucks),
-    BinCount = lists:foldl(fun({_,_,Bins},Count) -> Count + length(Bins) end,0,Bucks),
-    file:write(EmbedFs, <<BuckCount:32>>),
-	file:write(EmbedFs, <<BinCount:32>>),
-    lists:foreach(fun({Buck,_,Bins}) ->
-          BuckName = binary:list_to_bin(atom_to_list(Buck)),
-          BuckNameSize = size(BuckName),
-          BuckBinCount = length(Bins),
-          file:write(EmbedFs, <<BuckNameSize, BuckName/binary, BuckBinCount:32>>),
-          lists:foreach(fun
-                    (local_map) -> LocalMap = local_map(Bucks),
-                                   mad:info("~nMount View:~n ~s",[LocalMap]),
-                                   write_bin(EmbedFs, "local.map", LocalMap);
-                  ({_App,F,Bin}) -> write_bin(EmbedFs, filename:basename(F), Bin)
-          end,Bins)
-    end,Bucks),
-    file:close(EmbedFs),
-	ok.
-
-embedfs_object(EmbedFsPath) ->
-	EmbedCPath  = filename:join(filename:absname(cache_dir()), "embedfs.c"),
-	OutPath     = filename:join(filename:absname(cache_dir()), "embedfs.o"),
-	{ok, Embed} = file:read_file(EmbedFsPath),
-	mad:info("Creating EMBED.FS C file: ..."),
-	Res = bfd_objcopy:blob_to_src(EmbedCPath, "_binary_embed_fs", Embed),
-    mad:info("~p~n",[Res]),
-	mad:info("Compilation of Filesystem object: ..."),
-	Res = case sh:oneliner(cc() ++ ["-o", OutPath, "-c", EmbedCPath]) of
-	           {_,0,_} -> ok;
-	           {_,_,M} -> binary_to_list(M) end,
-	mad:info("~p~n",[Res]),
-	mad:info("Out Path: ~p~n",[OutPath]),
-	{ok, OutPath}.
-
-write_bin(Dev, F, Bin) ->
-    {ListName,Data} = case filename:extension(F) of
-        ".beam" ->  { filename:rootname(F) ++ ".ling", beam_to_ling(Bin) };
-              _ ->  { F, Bin } end,
-    Name = binary:list_to_bin(ListName),
-    NameSize = size(Name),
-    DataSize = size(Data),
-    file:write(Dev, <<NameSize, Name/binary, DataSize:32, Data/binary>>).
-
-beam_to_ling(B) ->
-    ling_lib:specs_to_binary(element(2,ling_code:ling_to_specs(element(2,ling_code:beam_to_ling(B))))).
-
-gold() -> gold("ld").
-gold(Prog) -> [Prog, "-T", "ling.lds", "-nostdlib"].
-
-ld() -> ld(?ARCH).
-ld(arm) -> gold("arm-none-eabi-ld");
-ld(xen_x86) -> case os:type() of {unix, darwin} -> ["x86_64-pc-linux-ld"]; _ -> gold() end;
-ld(posix) -> case os:type() of {unix, darwin} ->
-    ["clang","-image_base","0x8000","-pagezero_size","0x8000","-arch","x86_64"];
-	_ -> gold() end;
-ld(_) -> gold().
-
-cc() -> cc(?ARCH).
-cc(arm) -> ["arm-none-eabi-gcc", "-mfpu=vfp", "-mfloat-abi=hard"];
-cc(xen_x86) -> case os:type() of {unix, darwin} -> ["x86_64-pc-linux-gcc"]; _ -> ["cc"] end;
-cc(_) -> ["cc"].
-

src/profile/mad_vz.erl

@@ -1,15 +0,0 @@
--module(mad_vz).
--compile(export_all).
-
-compile(Params)   -> mad_compile:compile(Params).
-app(Params)       -> mad_static:app(Params).
-clean(Params)     -> mad_vz:clean(Params).
-start(Params)     -> mad_vz:start(Params).
-attach(Params)    -> mad_vz:attach(Params).
-stop(Params)      -> mad_vz:stop(Params).
-release(Params)   -> mad_release:release(Params).
-resolve(Params)   -> mad_resolve:main(Params).
-sh(_Params)       -> {error,'N/A'}.
-deps(Params)      -> mad_synrc:deps(Params).
-up(Params)        -> mad_synrc:up(Params).
-fetch(Params)     -> mad_synrc:fetch(Params).

src/provision/mad_vz.erl

@@ -1,25 +0,0 @@
--module(mad_vz).
--compile(export_all).
-
-create(App,_) -> create(App).
-create(App) ->
-    Name = filename:basename(App,".tgz"),
-    mad:info("Unpack Container: ~p~n",[Name]),
-    {ok,Bin} = file:read_file(App),
-    erl_tar:extract({binary,zlib:gunzip(Bin)},[{cwd,lists:concat(["apps/",Name])}]).
-
-start(App) ->
-    mad:info("App: ~p~n",[App]),
-    {ok,Bin}  = file:read_file(lists:concat(["apps/",App,"/config.json"])),
-    {Json   } = jsone:decode(Bin),
-    {Process} = proplists:get_value(<<"process">>,Json),
-    Args      = proplists:get_value(<<"args">>,Process),
-    Concat    = string:join(lists:map(fun(X) -> binary_to_list(X) end,Args)," "),
-    {_,R,S}   = sh:run(Concat,<<"log">>,lists:concat(["apps/",App])),
-    mad:info("Oneliner: ~p~n",[Concat]),
-    {ret(R),S}.
-
-stop(_App) -> ok.
-
-ret(0) -> ok;
-ret(_) -> error.

src/sources/mad_git.erl

@@ -40,8 +40,7 @@ get_repo([Name|_]) ->
     end,
     case Res of
          {error,X} -> {error,X};
-         {ok,Name,Uri} -> fetch_dep(Cwd,Conf,File,Name,"git",Uri,[],deps_fetch,[]);
-         {ok,N,Uri} -> io:format("skip: ~p~n",[N]), {ok,skip}
+         {ok,N,Uri} -> fetch_dep(Cwd,Conf,File,N,"git",Uri,[],deps_fetch,[])
     end.
 
 git_clone(Uri,Fast,TrunkPath,Rev) when Rev == "head"   orelse Rev == "HEAD"

src/sources/mad_synrc.erl

@@ -1,33 +0,0 @@
--module(mad_synrc).
--compile(export_all).
-
-deps(_Params) ->
-    { Cwd, ConfigFile, Conf } = mad_utils:configs(),
-    case mad_utils:get_value(deps, Conf, []) of
-        [] -> {ok,[]};
-        Deps -> file:make_dir(mad_utils:get_value(deps_dir, Conf, ["deps"])),
-                (mad:profile()):fetch([Cwd, Conf, ConfigFile, Deps]) end.
-
-contains(X,String,Acc) ->
-    case string:str(String,atom_to_list(X)) > 0 of true -> [{X}|Acc]; _ -> [] end.
-
-wildcards(Depot,X,Pattern) ->
-    mad_repl:wildcards([Depot++atom_to_list(X)++Pattern]).
-
-atomlist(TARGETS) ->
-    string:join(lists:map(fun(X) -> atom_to_list(X) end,TARGETS),",").
-
-depot_release(Name) ->
-    mad_resolve:main([]),
-    TARGETS   = [beam,ling],
-    HOSTS     = [mac,bsd,windows],
-    Depot     = "/Users/5HT/depot/synrc/synrc.com/apps/",
-    {ok,Apps} = file:consult(Depot++"index.txt"),
-    Files     = lists:flatten([[
-                    lists:foldl(fun(A,Acc) -> [{A}|Acc] end,
-                        [], wildcards(Depot,X,lists:concat(["/ebin/**/*.{app,",atomlist(TARGETS),"}"]))),
-                    lists:foldl(fun(B,Acc)->[contains(P,B,Acc)||P<-HOSTS] end,
-                        [], wildcards(Depot,X,"/{bin,priv}/**/*")) ]
-    || {_,[X],_} <- lists:flatten(Apps) ]),
-    io:format("DEPOT Apps: ~p~n",[Files]),
-    {ok,Name}.