From 26a2a0fe5db374375e1188e0152aac1341a20279 Mon Sep 17 00:00:00 2001 From: Craig Everett Date: Thu, 4 Mar 2021 14:24:55 +0900 Subject: [PATCH] 0.12.3: Correct launch optimization, fix local file deletion bug on failed run start. --- : | 10 ++++ unix/get_zx | 2 +- unix/zx | 2 +- unix/zxh | 2 +- zomp/etc/version.txt | 2 +- zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/Emakefile | 0 zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/LICENSE | 0 .../otpr/zx/{0.12.2 => 0.12.3}/ebin/zx.app | 2 +- .../{0.12.2 => 0.12.3}/include/zx_logger.hrl | 0 .../otpr/zx/{0.12.2 => 0.12.3}/launcher.png | Bin zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/make_zx | 0 .../lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx.erl | 54 ++++++++++-------- .../zx/{0.12.2 => 0.12.3}/src/zx_auth.erl | 2 +- .../zx/{0.12.2 => 0.12.3}/src/zx_conn.erl | 2 +- .../zx/{0.12.2 => 0.12.3}/src/zx_conn_sup.erl | 2 +- .../zx/{0.12.2 => 0.12.3}/src/zx_daemon.erl | 2 +- .../otpr/zx/{0.12.2 => 0.12.3}/src/zx_key.erl | 2 +- .../otpr/zx/{0.12.2 => 0.12.3}/src/zx_lib.erl | 4 +- .../zx/{0.12.2 => 0.12.3}/src/zx_local.erl | 2 +- .../otpr/zx/{0.12.2 => 0.12.3}/src/zx_net.erl | 2 +- .../zx/{0.12.2 => 0.12.3}/src/zx_peer.erl | 2 +- .../zx/{0.12.2 => 0.12.3}/src/zx_peer_man.erl | 2 +- .../zx/{0.12.2 => 0.12.3}/src/zx_peer_sup.erl | 2 +- .../zx/{0.12.2 => 0.12.3}/src/zx_peers.erl | 2 +- .../zx/{0.12.2 => 0.12.3}/src/zx_proxy.erl | 2 +- .../otpr/zx/{0.12.2 => 0.12.3}/src/zx_sup.erl | 2 +- .../otpr/zx/{0.12.2 => 0.12.3}/src/zx_tty.erl | 2 +- .../zx/{0.12.2 => 0.12.3}/src/zx_userconf.erl | 2 +- .../otpr/zx/{0.12.2 => 0.12.3}/src/zx_zsp.erl | 2 +- .../zx/{0.12.2 => 0.12.3}/templates/Emakefile | 0 .../templates/boringlib/funfile.erl | 0 .../zx/{0.12.2 => 0.12.3}/templates/escript | 0 .../templates/example_server/appmod.erl | 0 .../templates/example_server/src/_client.erl | 0 .../example_server/src/_client_man.erl | 0 .../example_server/src/_client_sup.erl | 0 .../templates/example_server/src/_clients.erl | 0 .../templates/example_server/src/_sup.erl | 0 .../zx/{0.12.2 => 0.12.3}/templates/gitignore | 0 .../templates/hellowx/appmod.erl | 0 .../templates/hellowx/src/_con.erl | 0 .../templates/hellowx/src/_gui.erl | 0 .../templates/hellowx/src/_sup.erl | 0 .../templates/licenses/apache2.txt | 0 .../templates/licenses/bsd2.txt | 0 .../templates/licenses/bsd3.txt | 0 .../templates/licenses/cc0.txt | 0 .../templates/licenses/gpl3.txt | 0 .../templates/licenses/lgpl3.txt | 0 .../templates/licenses/mit.txt | 0 .../templates/licenses/mpl2.txt | 0 .../templates/simplecli.erl | 0 .../templates/swp/worker.erl | 0 .../templates/swp/worker_man.erl | 0 .../templates/swp/worker_sup.erl | 0 .../templates/swp/workers.erl | 0 zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/zomp.meta | 2 +- 57 files changed, 64 insertions(+), 48 deletions(-) create mode 100644 : rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/Emakefile (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/LICENSE (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/ebin/zx.app (95%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/include/zx_logger.hrl (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/launcher.png (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/make_zx (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx.erl (97%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx_auth.erl (99%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx_conn.erl (99%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx_conn_sup.erl (99%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx_daemon.erl (99%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx_key.erl (99%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx_lib.erl (99%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx_local.erl (99%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx_net.erl (99%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx_peer.erl (99%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx_peer_man.erl (99%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx_peer_sup.erl (99%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx_peers.erl (98%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx_proxy.erl (99%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx_sup.erl (99%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx_tty.erl (99%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx_userconf.erl (99%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/src/zx_zsp.erl (99%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/Emakefile (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/boringlib/funfile.erl (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/escript (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/example_server/appmod.erl (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/example_server/src/_client.erl (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/example_server/src/_client_man.erl (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/example_server/src/_client_sup.erl (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/example_server/src/_clients.erl (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/example_server/src/_sup.erl (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/gitignore (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/hellowx/appmod.erl (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/hellowx/src/_con.erl (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/hellowx/src/_gui.erl (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/hellowx/src/_sup.erl (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/licenses/apache2.txt (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/licenses/bsd2.txt (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/licenses/bsd3.txt (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/licenses/cc0.txt (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/licenses/gpl3.txt (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/licenses/lgpl3.txt (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/licenses/mit.txt (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/licenses/mpl2.txt (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/simplecli.erl (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/swp/worker.erl (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/swp/worker_man.erl (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/swp/worker_sup.erl (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/templates/swp/workers.erl (100%) rename zomp/lib/otpr/zx/{0.12.2 => 0.12.3}/zomp.meta (91%) diff --git a/: b/: new file mode 100644 index 0000000..59252be --- /dev/null +++ b/: @@ -0,0 +1,10 @@ +Ensure paths are set for local libs +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# +# ブランチ master +# Your branch is up to date with 'origin/master'. +# +# コミット予定の変更点: +# modified: zomp/lib/otpr/zx/0.12.2/src/zx.erl +# diff --git a/unix/get_zx b/unix/get_zx index 82b5291..24c7b1c 100755 --- a/unix/get_zx +++ b/unix/get_zx @@ -3,7 +3,7 @@ # A convenience script that will download the ZX installer, unpack it, and clean up. # For maximum portability this script uses the gzipped package version. -version=0.11.6 +version=0.12.3 zx="zx-$version" tarball="$zx.tar.gz" diff --git a/unix/zx b/unix/zx index 4451a56..1624ffa 100755 --- a/unix/zx +++ b/unix/zx @@ -11,7 +11,7 @@ export ZX_DIR="$ZOMP_DIR/lib/otpr/zx/$ZX_VERSION" start_dir="$PWD" cd "$ZX_DIR" -if [ ! -f ebin/zx.erl ] +if [ ! -f ebin/zx.beam ] then chmod +x make_zx ./make_zx diff --git a/unix/zxh b/unix/zxh index 2f17b8e..153e1af 100755 --- a/unix/zxh +++ b/unix/zxh @@ -11,7 +11,7 @@ export ZX_DIR="$ZOMP_DIR/lib/otpr/zx/$ZX_VERSION" start_dir="$PWD" cd "$ZX_DIR" -if [ ! -f ebin/zx.erl ] +if [ ! -f ebin/zx.beam ] then chmod +x make_zx ./make_zx diff --git a/zomp/etc/version.txt b/zomp/etc/version.txt index 34a8361..aa22d3c 100644 --- a/zomp/etc/version.txt +++ b/zomp/etc/version.txt @@ -1 +1 @@ -0.12.1 +0.12.3 diff --git a/zomp/lib/otpr/zx/0.12.2/Emakefile b/zomp/lib/otpr/zx/0.12.3/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/Emakefile rename to zomp/lib/otpr/zx/0.12.3/Emakefile diff --git a/zomp/lib/otpr/zx/0.12.2/LICENSE b/zomp/lib/otpr/zx/0.12.3/LICENSE similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/LICENSE rename to zomp/lib/otpr/zx/0.12.3/LICENSE diff --git a/zomp/lib/otpr/zx/0.12.2/ebin/zx.app b/zomp/lib/otpr/zx/0.12.3/ebin/zx.app similarity index 95% rename from zomp/lib/otpr/zx/0.12.2/ebin/zx.app rename to zomp/lib/otpr/zx/0.12.3/ebin/zx.app index df5fc27..3dc6926 100644 --- a/zomp/lib/otpr/zx/0.12.2/ebin/zx.app +++ b/zomp/lib/otpr/zx/0.12.3/ebin/zx.app @@ -1,6 +1,6 @@ {application,zx, [{description,"An Erlang development tool and Zomp user client"}, - {vsn,"0.12.2"}, + {vsn,"0.12.3"}, {applications,[stdlib,kernel]}, {modules,[zx,zx_auth,zx_conn,zx_conn_sup,zx_daemon,zx_key, zx_lib,zx_local,zx_net,zx_peer,zx_peer_man, diff --git a/zomp/lib/otpr/zx/0.12.2/include/zx_logger.hrl b/zomp/lib/otpr/zx/0.12.3/include/zx_logger.hrl similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/include/zx_logger.hrl rename to zomp/lib/otpr/zx/0.12.3/include/zx_logger.hrl diff --git a/zomp/lib/otpr/zx/0.12.2/launcher.png b/zomp/lib/otpr/zx/0.12.3/launcher.png similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/launcher.png rename to zomp/lib/otpr/zx/0.12.3/launcher.png diff --git a/zomp/lib/otpr/zx/0.12.2/make_zx b/zomp/lib/otpr/zx/0.12.3/make_zx similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/make_zx rename to zomp/lib/otpr/zx/0.12.3/make_zx diff --git a/zomp/lib/otpr/zx/0.12.2/src/zx.erl b/zomp/lib/otpr/zx/0.12.3/src/zx.erl similarity index 97% rename from zomp/lib/otpr/zx/0.12.2/src/zx.erl rename to zomp/lib/otpr/zx/0.12.3/src/zx.erl index f753834..4078694 100644 --- a/zomp/lib/otpr/zx/0.12.2/src/zx.erl +++ b/zomp/lib/otpr/zx/0.12.3/src/zx.erl @@ -24,7 +24,7 @@ %%% @end -module(zx). --vsn("0.12.2"). +-vsn("0.12.3"). -behavior(application). -author("Craig Everett "). -copyright("Craig Everett "). @@ -404,27 +404,28 @@ compatibility_check(Platforms) -> %% @equiv application:ensure_started(zx). start() -> - LogPath = - case init:get_plain_arguments() of - ["run", PackageString | _] -> - case zx_lib:package_id(PackageString) of - {ok, PackageID} -> zx_lib:new_logpath(PackageID); - Error -> done(Error) - end; - ["rundir", Path | _] -> - case zx_lib:read_project_meta(Path) of - {ok, #{package_id := PackageID}} -> zx_lib:new_logpath(PackageID); - Error -> done(Error) - end; - ["runlocal" | _] -> - case zx_lib:read_project_meta() of - {ok, #{package_id := PackageID}} -> zx_lib:new_logpath(PackageID); - Error -> done(Error) - end; - _ -> - {ok, Version} = zx_lib:string_to_version(os:getenv("ZX_VERSION")), - zx_lib:new_logpath({"otpr", "zx", Version}) - end, + case init:get_plain_arguments() of + ["run", PackageString | _] -> + case zx_lib:package_id(PackageString) of + {ok, PackID} -> start(zx_lib:new_logpath(PackID)); + Error -> done(Error) + end; + ["rundir", Path | _] -> + case zx_lib:read_project_meta(Path) of + {ok, #{package_id := PackID}} -> start(zx_lib:new_logpath(PackID)); + Error -> done(Error) + end; + ["runlocal" | _] -> + case zx_lib:read_project_meta() of + {ok, #{package_id := PackID}} -> start(zx_lib:new_logpath(PackID)); + Error -> done(Error) + end; + _ -> + {ok, Version} = zx_lib:string_to_version(os:getenv("ZX_VERSION")), + start(zx_lib:new_logpath({"otpr", "zx", Version})) + end. + +start(LogPath) -> ok = logger:remove_handler(default), LogDir = filename:dirname(LogPath), ok = trim_logs(LogDir), @@ -992,10 +993,15 @@ run_dir(TargetDir, RunArgs) -> RunArgs :: [string()]. run_project(ProjectDir, ExecDir, RunArgs) -> - {ok, Meta} = zx_lib:read_project_meta(), - {ok, Dir} = file:get_cwd(), + case zx_lib:read_project_meta() of + {ok, Meta} -> run_project(ProjectDir, ExecDir, RunArgs, Meta); + Error -> Error + end. + +run_project(ProjectDir, ExecDir, RunArgs, Meta) -> case pre_prep(Meta, RunArgs) of {Type, Deps, NewArgs} -> + {ok, Dir} = file:get_cwd(), PackageID = {_, Name, _} = maps:get(package_id, Meta), true = os:putenv(Name ++ "_include", filename:join(Dir, "include")), case prepare(Deps) of diff --git a/zomp/lib/otpr/zx/0.12.2/src/zx_auth.erl b/zomp/lib/otpr/zx/0.12.3/src/zx_auth.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.2/src/zx_auth.erl rename to zomp/lib/otpr/zx/0.12.3/src/zx_auth.erl index 6665ba0..2ff8a08 100644 --- a/zomp/lib/otpr/zx/0.12.2/src/zx_auth.erl +++ b/zomp/lib/otpr/zx/0.12.3/src/zx_auth.erl @@ -9,7 +9,7 @@ %%% @end -module(zx_auth). --vsn("0.12.2"). +-vsn("0.12.3"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.2/src/zx_conn.erl b/zomp/lib/otpr/zx/0.12.3/src/zx_conn.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.2/src/zx_conn.erl rename to zomp/lib/otpr/zx/0.12.3/src/zx_conn.erl index 79f5e9d..633cac2 100644 --- a/zomp/lib/otpr/zx/0.12.2/src/zx_conn.erl +++ b/zomp/lib/otpr/zx/0.12.3/src/zx_conn.erl @@ -7,7 +7,7 @@ %%% @end -module(zx_conn). --vsn("0.12.2"). +-vsn("0.12.3"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.2/src/zx_conn_sup.erl b/zomp/lib/otpr/zx/0.12.3/src/zx_conn_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.2/src/zx_conn_sup.erl rename to zomp/lib/otpr/zx/0.12.3/src/zx_conn_sup.erl index 77e91b7..3b09694 100644 --- a/zomp/lib/otpr/zx/0.12.2/src/zx_conn_sup.erl +++ b/zomp/lib/otpr/zx/0.12.3/src/zx_conn_sup.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_conn_sup). --vsn("0.12.2"). +-vsn("0.12.3"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.12.2/src/zx_daemon.erl b/zomp/lib/otpr/zx/0.12.3/src/zx_daemon.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.2/src/zx_daemon.erl rename to zomp/lib/otpr/zx/0.12.3/src/zx_daemon.erl index 8faf60c..5233be2 100644 --- a/zomp/lib/otpr/zx/0.12.2/src/zx_daemon.erl +++ b/zomp/lib/otpr/zx/0.12.3/src/zx_daemon.erl @@ -138,7 +138,7 @@ %%% @end -module(zx_daemon). --vsn("0.12.2"). +-vsn("0.12.3"). -behavior(gen_server). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.12.2/src/zx_key.erl b/zomp/lib/otpr/zx/0.12.3/src/zx_key.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.2/src/zx_key.erl rename to zomp/lib/otpr/zx/0.12.3/src/zx_key.erl index 3bc6962..3bc31a1 100644 --- a/zomp/lib/otpr/zx/0.12.2/src/zx_key.erl +++ b/zomp/lib/otpr/zx/0.12.3/src/zx_key.erl @@ -8,7 +8,7 @@ %%% @end -module(zx_key). --vsn("0.12.2"). +-vsn("0.12.3"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.2/src/zx_lib.erl b/zomp/lib/otpr/zx/0.12.3/src/zx_lib.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.2/src/zx_lib.erl rename to zomp/lib/otpr/zx/0.12.3/src/zx_lib.erl index 7971aef..6b87166 100644 --- a/zomp/lib/otpr/zx/0.12.2/src/zx_lib.erl +++ b/zomp/lib/otpr/zx/0.12.3/src/zx_lib.erl @@ -10,7 +10,7 @@ %%% @end -module(zx_lib). --vsn("0.12.2"). +-vsn("0.12.3"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). @@ -228,7 +228,7 @@ read_project_meta(Dir) -> Meta = maps:merge(zx_zsp:new_meta(), maps:from_list(Data)), {ok, Meta}; {error, enoent} -> - {error, "No project zomp.meta file. Wrong directory? Not initialized?", 2}; + {error, "No project zomp.meta file. Wrong directory? Not initialized?", 0}; Error -> ok = log(error, "Read from zomp.meta failed with: ~tw", [Error]), Error diff --git a/zomp/lib/otpr/zx/0.12.2/src/zx_local.erl b/zomp/lib/otpr/zx/0.12.3/src/zx_local.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.2/src/zx_local.erl rename to zomp/lib/otpr/zx/0.12.3/src/zx_local.erl index e889d4e..c10df96 100644 --- a/zomp/lib/otpr/zx/0.12.2/src/zx_local.erl +++ b/zomp/lib/otpr/zx/0.12.3/src/zx_local.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_local). --vsn("0.12.2"). +-vsn("0.12.3"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.2/src/zx_net.erl b/zomp/lib/otpr/zx/0.12.3/src/zx_net.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.2/src/zx_net.erl rename to zomp/lib/otpr/zx/0.12.3/src/zx_net.erl index 7a13520..481eadd 100644 --- a/zomp/lib/otpr/zx/0.12.2/src/zx_net.erl +++ b/zomp/lib/otpr/zx/0.12.3/src/zx_net.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_net). --vsn("0.12.2"). +-vsn("0.12.3"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.2/src/zx_peer.erl b/zomp/lib/otpr/zx/0.12.3/src/zx_peer.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.2/src/zx_peer.erl rename to zomp/lib/otpr/zx/0.12.3/src/zx_peer.erl index 4ffb807..ed09af3 100644 --- a/zomp/lib/otpr/zx/0.12.2/src/zx_peer.erl +++ b/zomp/lib/otpr/zx/0.12.3/src/zx_peer.erl @@ -8,7 +8,7 @@ %%% @end -module(zx_peer). --vsn("0.12.2"). +-vsn("0.12.3"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.2/src/zx_peer_man.erl b/zomp/lib/otpr/zx/0.12.3/src/zx_peer_man.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.2/src/zx_peer_man.erl rename to zomp/lib/otpr/zx/0.12.3/src/zx_peer_man.erl index 43c7cbe..d2d57ba 100644 --- a/zomp/lib/otpr/zx/0.12.2/src/zx_peer_man.erl +++ b/zomp/lib/otpr/zx/0.12.3/src/zx_peer_man.erl @@ -9,7 +9,7 @@ %%% @end -module(zx_peer_man). --vsn("0.12.2"). +-vsn("0.12.3"). -behavior(gen_server). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.12.2/src/zx_peer_sup.erl b/zomp/lib/otpr/zx/0.12.3/src/zx_peer_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.2/src/zx_peer_sup.erl rename to zomp/lib/otpr/zx/0.12.3/src/zx_peer_sup.erl index d18afd4..8371c0e 100644 --- a/zomp/lib/otpr/zx/0.12.2/src/zx_peer_sup.erl +++ b/zomp/lib/otpr/zx/0.12.3/src/zx_peer_sup.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_peer_sup). --vsn("0.12.2"). +-vsn("0.12.3"). -behaviour(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.12.2/src/zx_peers.erl b/zomp/lib/otpr/zx/0.12.3/src/zx_peers.erl similarity index 98% rename from zomp/lib/otpr/zx/0.12.2/src/zx_peers.erl rename to zomp/lib/otpr/zx/0.12.3/src/zx_peers.erl index 1ff1eb7..81cf1ec 100644 --- a/zomp/lib/otpr/zx/0.12.2/src/zx_peers.erl +++ b/zomp/lib/otpr/zx/0.12.3/src/zx_peers.erl @@ -10,7 +10,7 @@ %%% @end -module(zx_peers). --vsn("0.12.2"). +-vsn("0.12.3"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.12.2/src/zx_proxy.erl b/zomp/lib/otpr/zx/0.12.3/src/zx_proxy.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.2/src/zx_proxy.erl rename to zomp/lib/otpr/zx/0.12.3/src/zx_proxy.erl index bac77d1..0c29a0a 100644 --- a/zomp/lib/otpr/zx/0.12.2/src/zx_proxy.erl +++ b/zomp/lib/otpr/zx/0.12.3/src/zx_proxy.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_proxy). --vsn("0.12.2"). +-vsn("0.12.3"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.2/src/zx_sup.erl b/zomp/lib/otpr/zx/0.12.3/src/zx_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.2/src/zx_sup.erl rename to zomp/lib/otpr/zx/0.12.3/src/zx_sup.erl index 142e900..c5929a0 100644 --- a/zomp/lib/otpr/zx/0.12.2/src/zx_sup.erl +++ b/zomp/lib/otpr/zx/0.12.3/src/zx_sup.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_sup). --vsn("0.12.2"). +-vsn("0.12.3"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.12.2/src/zx_tty.erl b/zomp/lib/otpr/zx/0.12.3/src/zx_tty.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.2/src/zx_tty.erl rename to zomp/lib/otpr/zx/0.12.3/src/zx_tty.erl index c14c916..73306b5 100644 --- a/zomp/lib/otpr/zx/0.12.2/src/zx_tty.erl +++ b/zomp/lib/otpr/zx/0.12.3/src/zx_tty.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_tty). --vsn("0.12.2"). +-vsn("0.12.3"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.2/src/zx_userconf.erl b/zomp/lib/otpr/zx/0.12.3/src/zx_userconf.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.2/src/zx_userconf.erl rename to zomp/lib/otpr/zx/0.12.3/src/zx_userconf.erl index c426ddc..8667f4c 100644 --- a/zomp/lib/otpr/zx/0.12.2/src/zx_userconf.erl +++ b/zomp/lib/otpr/zx/0.12.3/src/zx_userconf.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_userconf). --vsn("0.12.2"). +-vsn("0.12.3"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.2/src/zx_zsp.erl b/zomp/lib/otpr/zx/0.12.3/src/zx_zsp.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.2/src/zx_zsp.erl rename to zomp/lib/otpr/zx/0.12.3/src/zx_zsp.erl index 03bb186..a3f06aa 100644 --- a/zomp/lib/otpr/zx/0.12.2/src/zx_zsp.erl +++ b/zomp/lib/otpr/zx/0.12.3/src/zx_zsp.erl @@ -7,7 +7,7 @@ %%% @end -module(zx_zsp). --vsn("0.12.2"). +-vsn("0.12.3"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.2/templates/Emakefile b/zomp/lib/otpr/zx/0.12.3/templates/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/Emakefile rename to zomp/lib/otpr/zx/0.12.3/templates/Emakefile diff --git a/zomp/lib/otpr/zx/0.12.2/templates/boringlib/funfile.erl b/zomp/lib/otpr/zx/0.12.3/templates/boringlib/funfile.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/boringlib/funfile.erl rename to zomp/lib/otpr/zx/0.12.3/templates/boringlib/funfile.erl diff --git a/zomp/lib/otpr/zx/0.12.2/templates/escript b/zomp/lib/otpr/zx/0.12.3/templates/escript similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/escript rename to zomp/lib/otpr/zx/0.12.3/templates/escript diff --git a/zomp/lib/otpr/zx/0.12.2/templates/example_server/appmod.erl b/zomp/lib/otpr/zx/0.12.3/templates/example_server/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/example_server/appmod.erl rename to zomp/lib/otpr/zx/0.12.3/templates/example_server/appmod.erl diff --git a/zomp/lib/otpr/zx/0.12.2/templates/example_server/src/_client.erl b/zomp/lib/otpr/zx/0.12.3/templates/example_server/src/_client.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/example_server/src/_client.erl rename to zomp/lib/otpr/zx/0.12.3/templates/example_server/src/_client.erl diff --git a/zomp/lib/otpr/zx/0.12.2/templates/example_server/src/_client_man.erl b/zomp/lib/otpr/zx/0.12.3/templates/example_server/src/_client_man.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/example_server/src/_client_man.erl rename to zomp/lib/otpr/zx/0.12.3/templates/example_server/src/_client_man.erl diff --git a/zomp/lib/otpr/zx/0.12.2/templates/example_server/src/_client_sup.erl b/zomp/lib/otpr/zx/0.12.3/templates/example_server/src/_client_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/example_server/src/_client_sup.erl rename to zomp/lib/otpr/zx/0.12.3/templates/example_server/src/_client_sup.erl diff --git a/zomp/lib/otpr/zx/0.12.2/templates/example_server/src/_clients.erl b/zomp/lib/otpr/zx/0.12.3/templates/example_server/src/_clients.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/example_server/src/_clients.erl rename to zomp/lib/otpr/zx/0.12.3/templates/example_server/src/_clients.erl diff --git a/zomp/lib/otpr/zx/0.12.2/templates/example_server/src/_sup.erl b/zomp/lib/otpr/zx/0.12.3/templates/example_server/src/_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/example_server/src/_sup.erl rename to zomp/lib/otpr/zx/0.12.3/templates/example_server/src/_sup.erl diff --git a/zomp/lib/otpr/zx/0.12.2/templates/gitignore b/zomp/lib/otpr/zx/0.12.3/templates/gitignore similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/gitignore rename to zomp/lib/otpr/zx/0.12.3/templates/gitignore diff --git a/zomp/lib/otpr/zx/0.12.2/templates/hellowx/appmod.erl b/zomp/lib/otpr/zx/0.12.3/templates/hellowx/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/hellowx/appmod.erl rename to zomp/lib/otpr/zx/0.12.3/templates/hellowx/appmod.erl diff --git a/zomp/lib/otpr/zx/0.12.2/templates/hellowx/src/_con.erl b/zomp/lib/otpr/zx/0.12.3/templates/hellowx/src/_con.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/hellowx/src/_con.erl rename to zomp/lib/otpr/zx/0.12.3/templates/hellowx/src/_con.erl diff --git a/zomp/lib/otpr/zx/0.12.2/templates/hellowx/src/_gui.erl b/zomp/lib/otpr/zx/0.12.3/templates/hellowx/src/_gui.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/hellowx/src/_gui.erl rename to zomp/lib/otpr/zx/0.12.3/templates/hellowx/src/_gui.erl diff --git a/zomp/lib/otpr/zx/0.12.2/templates/hellowx/src/_sup.erl b/zomp/lib/otpr/zx/0.12.3/templates/hellowx/src/_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/hellowx/src/_sup.erl rename to zomp/lib/otpr/zx/0.12.3/templates/hellowx/src/_sup.erl diff --git a/zomp/lib/otpr/zx/0.12.2/templates/licenses/apache2.txt b/zomp/lib/otpr/zx/0.12.3/templates/licenses/apache2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/licenses/apache2.txt rename to zomp/lib/otpr/zx/0.12.3/templates/licenses/apache2.txt diff --git a/zomp/lib/otpr/zx/0.12.2/templates/licenses/bsd2.txt b/zomp/lib/otpr/zx/0.12.3/templates/licenses/bsd2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/licenses/bsd2.txt rename to zomp/lib/otpr/zx/0.12.3/templates/licenses/bsd2.txt diff --git a/zomp/lib/otpr/zx/0.12.2/templates/licenses/bsd3.txt b/zomp/lib/otpr/zx/0.12.3/templates/licenses/bsd3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/licenses/bsd3.txt rename to zomp/lib/otpr/zx/0.12.3/templates/licenses/bsd3.txt diff --git a/zomp/lib/otpr/zx/0.12.2/templates/licenses/cc0.txt b/zomp/lib/otpr/zx/0.12.3/templates/licenses/cc0.txt similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/licenses/cc0.txt rename to zomp/lib/otpr/zx/0.12.3/templates/licenses/cc0.txt diff --git a/zomp/lib/otpr/zx/0.12.2/templates/licenses/gpl3.txt b/zomp/lib/otpr/zx/0.12.3/templates/licenses/gpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/licenses/gpl3.txt rename to zomp/lib/otpr/zx/0.12.3/templates/licenses/gpl3.txt diff --git a/zomp/lib/otpr/zx/0.12.2/templates/licenses/lgpl3.txt b/zomp/lib/otpr/zx/0.12.3/templates/licenses/lgpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/licenses/lgpl3.txt rename to zomp/lib/otpr/zx/0.12.3/templates/licenses/lgpl3.txt diff --git a/zomp/lib/otpr/zx/0.12.2/templates/licenses/mit.txt b/zomp/lib/otpr/zx/0.12.3/templates/licenses/mit.txt similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/licenses/mit.txt rename to zomp/lib/otpr/zx/0.12.3/templates/licenses/mit.txt diff --git a/zomp/lib/otpr/zx/0.12.2/templates/licenses/mpl2.txt b/zomp/lib/otpr/zx/0.12.3/templates/licenses/mpl2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/licenses/mpl2.txt rename to zomp/lib/otpr/zx/0.12.3/templates/licenses/mpl2.txt diff --git a/zomp/lib/otpr/zx/0.12.2/templates/simplecli.erl b/zomp/lib/otpr/zx/0.12.3/templates/simplecli.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/simplecli.erl rename to zomp/lib/otpr/zx/0.12.3/templates/simplecli.erl diff --git a/zomp/lib/otpr/zx/0.12.2/templates/swp/worker.erl b/zomp/lib/otpr/zx/0.12.3/templates/swp/worker.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/swp/worker.erl rename to zomp/lib/otpr/zx/0.12.3/templates/swp/worker.erl diff --git a/zomp/lib/otpr/zx/0.12.2/templates/swp/worker_man.erl b/zomp/lib/otpr/zx/0.12.3/templates/swp/worker_man.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/swp/worker_man.erl rename to zomp/lib/otpr/zx/0.12.3/templates/swp/worker_man.erl diff --git a/zomp/lib/otpr/zx/0.12.2/templates/swp/worker_sup.erl b/zomp/lib/otpr/zx/0.12.3/templates/swp/worker_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/swp/worker_sup.erl rename to zomp/lib/otpr/zx/0.12.3/templates/swp/worker_sup.erl diff --git a/zomp/lib/otpr/zx/0.12.2/templates/swp/workers.erl b/zomp/lib/otpr/zx/0.12.3/templates/swp/workers.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.2/templates/swp/workers.erl rename to zomp/lib/otpr/zx/0.12.3/templates/swp/workers.erl diff --git a/zomp/lib/otpr/zx/0.12.2/zomp.meta b/zomp/lib/otpr/zx/0.12.3/zomp.meta similarity index 91% rename from zomp/lib/otpr/zx/0.12.2/zomp.meta rename to zomp/lib/otpr/zx/0.12.3/zomp.meta index ff5cd59..c829b7f 100644 --- a/zomp/lib/otpr/zx/0.12.2/zomp.meta +++ b/zomp/lib/otpr/zx/0.12.3/zomp.meta @@ -9,7 +9,7 @@ {license,"MIT"}. {modules,[]}. {name,"zx"}. -{package_id,{"otpr","zx",{0,12,2}}}. +{package_id,{"otpr","zx",{0,12,3}}}. {prefix,"zx_"}. {repo_url,"https://gitlab.com/zxq9/zx"}. {tags,["tools","package manager","erlang"]}.