From 30f1c043252d4da3d527ee087a3fecfc7a4c3c73 Mon Sep 17 00:00:00 2001 From: Craig Everett Date: Mon, 31 Jan 2022 20:18:44 +0900 Subject: [PATCH] Runtime checks - Check for presence of WX when running a GUI app - Ensure current Erlang runtime matches bytecode on Linux --- unix/get_zx | 9 ++++- unix/zx | 23 ++++++++++-- unix/zxh | 23 ++++++++++-- zomp/etc/version.txt | 2 +- zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/Emakefile | 0 zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/LICENSE | 0 .../otpr/zx/{0.12.5 => 0.12.6}/ebin/zx.app | 2 +- .../{0.12.5 => 0.12.6}/include/zx_logger.hrl | 0 .../otpr/zx/{0.12.5 => 0.12.6}/launcher.png | Bin zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/make_zx | 0 .../lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx.erl | 33 +++++++++++++----- .../zx/{0.12.5 => 0.12.6}/src/zx_auth.erl | 2 +- .../zx/{0.12.5 => 0.12.6}/src/zx_conn.erl | 2 +- .../zx/{0.12.5 => 0.12.6}/src/zx_conn_sup.erl | 2 +- .../zx/{0.12.5 => 0.12.6}/src/zx_daemon.erl | 2 +- .../otpr/zx/{0.12.5 => 0.12.6}/src/zx_key.erl | 2 +- .../otpr/zx/{0.12.5 => 0.12.6}/src/zx_lib.erl | 2 +- .../zx/{0.12.5 => 0.12.6}/src/zx_local.erl | 2 +- .../otpr/zx/{0.12.5 => 0.12.6}/src/zx_net.erl | 2 +- .../zx/{0.12.5 => 0.12.6}/src/zx_peer.erl | 2 +- .../zx/{0.12.5 => 0.12.6}/src/zx_peer_man.erl | 2 +- .../zx/{0.12.5 => 0.12.6}/src/zx_peer_sup.erl | 2 +- .../zx/{0.12.5 => 0.12.6}/src/zx_peers.erl | 2 +- .../zx/{0.12.5 => 0.12.6}/src/zx_proxy.erl | 2 +- .../otpr/zx/{0.12.5 => 0.12.6}/src/zx_sup.erl | 2 +- .../otpr/zx/{0.12.5 => 0.12.6}/src/zx_tty.erl | 2 +- .../zx/{0.12.5 => 0.12.6}/src/zx_userconf.erl | 2 +- .../otpr/zx/{0.12.5 => 0.12.6}/src/zx_zsp.erl | 2 +- .../zx/{0.12.5 => 0.12.6}/templates/Emakefile | 0 .../templates/boringlib/funfile.erl | 0 .../zx/{0.12.5 => 0.12.6}/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.5 => 0.12.6}/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.5 => 0.12.6}/zomp.meta | 2 +- 56 files changed, 93 insertions(+), 35 deletions(-) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/Emakefile (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/LICENSE (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/ebin/zx.app (95%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/include/zx_logger.hrl (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/launcher.png (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/make_zx (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx.erl (98%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx_auth.erl (99%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx_conn.erl (99%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx_conn_sup.erl (99%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx_daemon.erl (99%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx_key.erl (99%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx_lib.erl (99%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx_local.erl (99%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx_net.erl (99%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx_peer.erl (99%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx_peer_man.erl (99%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx_peer_sup.erl (99%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx_peers.erl (98%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx_proxy.erl (99%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx_sup.erl (99%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx_tty.erl (99%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx_userconf.erl (99%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/src/zx_zsp.erl (99%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/Emakefile (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/boringlib/funfile.erl (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/escript (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/example_server/appmod.erl (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/example_server/src/_client.erl (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/example_server/src/_client_man.erl (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/example_server/src/_client_sup.erl (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/example_server/src/_clients.erl (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/example_server/src/_sup.erl (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/gitignore (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/hellowx/appmod.erl (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/hellowx/src/_con.erl (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/hellowx/src/_gui.erl (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/hellowx/src/_sup.erl (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/licenses/apache2.txt (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/licenses/bsd2.txt (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/licenses/bsd3.txt (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/licenses/cc0.txt (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/licenses/gpl3.txt (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/licenses/lgpl3.txt (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/licenses/mit.txt (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/licenses/mpl2.txt (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/simplecli.erl (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/swp/worker.erl (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/swp/worker_man.erl (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/swp/worker_sup.erl (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/templates/swp/workers.erl (100%) rename zomp/lib/otpr/zx/{0.12.5 => 0.12.6}/zomp.meta (91%) diff --git a/unix/get_zx b/unix/get_zx index 24c7b1c..a464b33 100755 --- a/unix/get_zx +++ b/unix/get_zx @@ -6,8 +6,15 @@ version=0.12.3 zx="zx-$version" tarball="$zx.tar.gz" +target="https://zxq9.com/projects/zomp/$tarball" + +if command -v wget &> /dev/null + then + wget -nv "$target" + else + curl -s "$target" --output "$tarball" +fi -wget -nv "https://zxq9.com/projects/zomp/$tarball" tar -zxf "$tarball" cd "$zx" chmod +x install diff --git a/unix/zx b/unix/zx index 1624ffa..3099d53 100755 --- a/unix/zx +++ b/unix/zx @@ -1,7 +1,7 @@ #! /bin/bash if [ -f "$HOME/.bash_profile" ] -then + then . "$HOME"/.bash_profile fi @@ -9,12 +9,29 @@ export ZOMP_DIR="${ZOMP_DIR:-$HOME/zomp}" export ZX_VERSION=$(cat "$ZOMP_DIR/etc/version.txt") export ZX_DIR="$ZOMP_DIR/lib/otpr/zx/$ZX_VERSION" +last_file="$ZOMP_DIR/last.erts" +if [[ -f "$last_file" ]] + then + last_erts=$(cat "$last_file") + else + last_erts="NONE" +fi + +curr_erts=$(erl -version 2>&1) +if [[ $last_erts != $curr_erts ]] + then + pushd "$ZOMP_DIR/lib" > /dev/null + find . -name "*.beam" -type f -delete + echo "$curr_erts" > "$last_file" + popd > /dev/null +fi + start_dir="$PWD" cd "$ZX_DIR" if [ ! -f ebin/zx.beam ] -then + then chmod +x make_zx - ./make_zx + ./make_zx 1>&2 fi cd "$start_dir" erl -noshell -pa "$ZX_DIR/ebin" -run zx do -extra $@ diff --git a/unix/zxh b/unix/zxh index 153e1af..abdc44e 100755 --- a/unix/zxh +++ b/unix/zxh @@ -1,7 +1,7 @@ #! /bin/bash if [ -f "$HOME/.bash_profile" ] -then + then . "$HOME"/.bash_profile fi @@ -9,12 +9,29 @@ export ZOMP_DIR="${ZOMP_DIR:-$HOME/zomp}" export ZX_VERSION=$(cat "$ZOMP_DIR/etc/version.txt") export ZX_DIR="$ZOMP_DIR/lib/otpr/zx/$ZX_VERSION" +last_file="$ZOMP_DIR/last.erts" +if [[ -f "$last_file" ]] + then + last_erts=$(cat "$last_file") + else + last_erts="NONE" +fi + +curr_erts=$(erl -version 2>&1) +if [[ $last_erts != $curr_erts ]] + then + pushd "$ZOMP_DIR/lib" > /dev/null + find . -name "*.beam" -type f -delete + echo "$curr_erts" > "$last_file" + popd > /dev/null +fi + start_dir="$PWD" cd "$ZX_DIR" if [ ! -f ebin/zx.beam ] -then + then chmod +x make_zx - ./make_zx + ./make_zx 1>&2 fi cd "$start_dir" erl -pa "$ZX_DIR/ebin" -run zx do -extra $@ diff --git a/zomp/etc/version.txt b/zomp/etc/version.txt index 43c2417..dabff2f 100644 --- a/zomp/etc/version.txt +++ b/zomp/etc/version.txt @@ -1 +1 @@ -0.12.5 +0.12.6 diff --git a/zomp/lib/otpr/zx/0.12.5/Emakefile b/zomp/lib/otpr/zx/0.12.6/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/Emakefile rename to zomp/lib/otpr/zx/0.12.6/Emakefile diff --git a/zomp/lib/otpr/zx/0.12.5/LICENSE b/zomp/lib/otpr/zx/0.12.6/LICENSE similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/LICENSE rename to zomp/lib/otpr/zx/0.12.6/LICENSE diff --git a/zomp/lib/otpr/zx/0.12.5/ebin/zx.app b/zomp/lib/otpr/zx/0.12.6/ebin/zx.app similarity index 95% rename from zomp/lib/otpr/zx/0.12.5/ebin/zx.app rename to zomp/lib/otpr/zx/0.12.6/ebin/zx.app index de964c3..b5a6d98 100644 --- a/zomp/lib/otpr/zx/0.12.5/ebin/zx.app +++ b/zomp/lib/otpr/zx/0.12.6/ebin/zx.app @@ -1,6 +1,6 @@ {application,zx, [{description,"An Erlang development tool and Zomp user client"}, - {vsn,"0.12.5"}, + {vsn,"0.12.6"}, {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.5/include/zx_logger.hrl b/zomp/lib/otpr/zx/0.12.6/include/zx_logger.hrl similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/include/zx_logger.hrl rename to zomp/lib/otpr/zx/0.12.6/include/zx_logger.hrl diff --git a/zomp/lib/otpr/zx/0.12.5/launcher.png b/zomp/lib/otpr/zx/0.12.6/launcher.png similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/launcher.png rename to zomp/lib/otpr/zx/0.12.6/launcher.png diff --git a/zomp/lib/otpr/zx/0.12.5/make_zx b/zomp/lib/otpr/zx/0.12.6/make_zx similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/make_zx rename to zomp/lib/otpr/zx/0.12.6/make_zx diff --git a/zomp/lib/otpr/zx/0.12.5/src/zx.erl b/zomp/lib/otpr/zx/0.12.6/src/zx.erl similarity index 98% rename from zomp/lib/otpr/zx/0.12.5/src/zx.erl rename to zomp/lib/otpr/zx/0.12.6/src/zx.erl index 6f0f3b9..c2854aa 100644 --- a/zomp/lib/otpr/zx/0.12.5/src/zx.erl +++ b/zomp/lib/otpr/zx/0.12.6/src/zx.erl @@ -24,7 +24,7 @@ %%% @end -module(zx). --vsn("0.12.5"). +-vsn("0.12.6"). -behavior(application). -author("Craig Everett "). -copyright("Craig Everett "). @@ -1173,11 +1173,11 @@ fetch2(ID) -> %% Gets all the target application's ducks in a row and launches them, then enters %% the exec_wait/1 loop to wait for any queries from the application. -execute(lib, PackageID, _, _, _) -> - Message = "Lib ~ts is available on the system, but is not a standalone app.", - {ok, PackageString} = zx_lib:package_string(PackageID), - ok = tell(Message, [PackageString]), - init:stop(); +execute(gui, PackageID, Meta, Dir, RunArgs) -> + case wx_available() of + true -> execute(PackageID, Meta, Dir, RunArgs); + false -> {error, "WX (GUI system) is not found. Aborting."} + end; execute(cli, PackageID, Meta, Dir, RunArgs) -> Name = element(2, PackageID), ok = zx_daemon:pass_meta(Meta, Dir, RunArgs), @@ -1190,15 +1190,32 @@ execute(cli, PackageID, Meta, Dir, RunArgs) -> Mod = list_to_atom(ModName), Mod:start(RunArgs) end; -execute(Type, PackageID, Meta, Dir, RunArgs) -> +execute(app, PackageID, Meta, Dir, RunArgs) -> + execute(PackageID, Meta, Dir, RunArgs); +execute(lib, PackageID, _, _, _) -> + Message = "Lib ~ts is available on the system, but is not a standalone app.", {ok, PackageString} = zx_lib:package_string(PackageID), - ok = tell("Starting ~p ~ts.", [Type, PackageString]), + ok = tell(Message, [PackageString]), + init:stop(). + +execute(PackageID, Meta, Dir, RunArgs) -> + {ok, PackageString} = zx_lib:package_string(PackageID), + ok = tell("Starting ~ts.", [PackageString]), Name = element(2, PackageID), ok = zx_daemon:pass_meta(Meta, Dir, RunArgs), AppTag = list_to_atom(Name), ok = ensure_all_started(AppTag, permanent), log(info, "Launcher complete."). +wx_available() -> + try + _ = wx:null(), + true + catch + error:undef -> + false + end. + -spec ensure_all_started(AppMod, Type) -> ok when AppMod :: module(), diff --git a/zomp/lib/otpr/zx/0.12.5/src/zx_auth.erl b/zomp/lib/otpr/zx/0.12.6/src/zx_auth.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.5/src/zx_auth.erl rename to zomp/lib/otpr/zx/0.12.6/src/zx_auth.erl index 122ad23..85d6bb5 100644 --- a/zomp/lib/otpr/zx/0.12.5/src/zx_auth.erl +++ b/zomp/lib/otpr/zx/0.12.6/src/zx_auth.erl @@ -9,7 +9,7 @@ %%% @end -module(zx_auth). --vsn("0.12.5"). +-vsn("0.12.6"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.5/src/zx_conn.erl b/zomp/lib/otpr/zx/0.12.6/src/zx_conn.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.5/src/zx_conn.erl rename to zomp/lib/otpr/zx/0.12.6/src/zx_conn.erl index afce9f0..f309f91 100644 --- a/zomp/lib/otpr/zx/0.12.5/src/zx_conn.erl +++ b/zomp/lib/otpr/zx/0.12.6/src/zx_conn.erl @@ -7,7 +7,7 @@ %%% @end -module(zx_conn). --vsn("0.12.5"). +-vsn("0.12.6"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.5/src/zx_conn_sup.erl b/zomp/lib/otpr/zx/0.12.6/src/zx_conn_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.5/src/zx_conn_sup.erl rename to zomp/lib/otpr/zx/0.12.6/src/zx_conn_sup.erl index 6b1cb5f..c07cb37 100644 --- a/zomp/lib/otpr/zx/0.12.5/src/zx_conn_sup.erl +++ b/zomp/lib/otpr/zx/0.12.6/src/zx_conn_sup.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_conn_sup). --vsn("0.12.5"). +-vsn("0.12.6"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.12.5/src/zx_daemon.erl b/zomp/lib/otpr/zx/0.12.6/src/zx_daemon.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.5/src/zx_daemon.erl rename to zomp/lib/otpr/zx/0.12.6/src/zx_daemon.erl index 05fdf29..8f99eec 100644 --- a/zomp/lib/otpr/zx/0.12.5/src/zx_daemon.erl +++ b/zomp/lib/otpr/zx/0.12.6/src/zx_daemon.erl @@ -138,7 +138,7 @@ %%% @end -module(zx_daemon). --vsn("0.12.5"). +-vsn("0.12.6"). -behavior(gen_server). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.12.5/src/zx_key.erl b/zomp/lib/otpr/zx/0.12.6/src/zx_key.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.5/src/zx_key.erl rename to zomp/lib/otpr/zx/0.12.6/src/zx_key.erl index 8b74ea4..e7838d4 100644 --- a/zomp/lib/otpr/zx/0.12.5/src/zx_key.erl +++ b/zomp/lib/otpr/zx/0.12.6/src/zx_key.erl @@ -8,7 +8,7 @@ %%% @end -module(zx_key). --vsn("0.12.5"). +-vsn("0.12.6"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.5/src/zx_lib.erl b/zomp/lib/otpr/zx/0.12.6/src/zx_lib.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.5/src/zx_lib.erl rename to zomp/lib/otpr/zx/0.12.6/src/zx_lib.erl index 2719538..bcd4fc1 100644 --- a/zomp/lib/otpr/zx/0.12.5/src/zx_lib.erl +++ b/zomp/lib/otpr/zx/0.12.6/src/zx_lib.erl @@ -10,7 +10,7 @@ %%% @end -module(zx_lib). --vsn("0.12.5"). +-vsn("0.12.6"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.5/src/zx_local.erl b/zomp/lib/otpr/zx/0.12.6/src/zx_local.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.5/src/zx_local.erl rename to zomp/lib/otpr/zx/0.12.6/src/zx_local.erl index 7aa1f59..472dd22 100644 --- a/zomp/lib/otpr/zx/0.12.5/src/zx_local.erl +++ b/zomp/lib/otpr/zx/0.12.6/src/zx_local.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_local). --vsn("0.12.5"). +-vsn("0.12.6"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.5/src/zx_net.erl b/zomp/lib/otpr/zx/0.12.6/src/zx_net.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.5/src/zx_net.erl rename to zomp/lib/otpr/zx/0.12.6/src/zx_net.erl index 23ecb4f..94d153c 100644 --- a/zomp/lib/otpr/zx/0.12.5/src/zx_net.erl +++ b/zomp/lib/otpr/zx/0.12.6/src/zx_net.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_net). --vsn("0.12.5"). +-vsn("0.12.6"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.5/src/zx_peer.erl b/zomp/lib/otpr/zx/0.12.6/src/zx_peer.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.5/src/zx_peer.erl rename to zomp/lib/otpr/zx/0.12.6/src/zx_peer.erl index 5be7a7e..3cb0ff7 100644 --- a/zomp/lib/otpr/zx/0.12.5/src/zx_peer.erl +++ b/zomp/lib/otpr/zx/0.12.6/src/zx_peer.erl @@ -8,7 +8,7 @@ %%% @end -module(zx_peer). --vsn("0.12.5"). +-vsn("0.12.6"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.5/src/zx_peer_man.erl b/zomp/lib/otpr/zx/0.12.6/src/zx_peer_man.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.5/src/zx_peer_man.erl rename to zomp/lib/otpr/zx/0.12.6/src/zx_peer_man.erl index 318845e..86a8040 100644 --- a/zomp/lib/otpr/zx/0.12.5/src/zx_peer_man.erl +++ b/zomp/lib/otpr/zx/0.12.6/src/zx_peer_man.erl @@ -9,7 +9,7 @@ %%% @end -module(zx_peer_man). --vsn("0.12.5"). +-vsn("0.12.6"). -behavior(gen_server). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.12.5/src/zx_peer_sup.erl b/zomp/lib/otpr/zx/0.12.6/src/zx_peer_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.5/src/zx_peer_sup.erl rename to zomp/lib/otpr/zx/0.12.6/src/zx_peer_sup.erl index 08c1249..240211c 100644 --- a/zomp/lib/otpr/zx/0.12.5/src/zx_peer_sup.erl +++ b/zomp/lib/otpr/zx/0.12.6/src/zx_peer_sup.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_peer_sup). --vsn("0.12.5"). +-vsn("0.12.6"). -behaviour(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.12.5/src/zx_peers.erl b/zomp/lib/otpr/zx/0.12.6/src/zx_peers.erl similarity index 98% rename from zomp/lib/otpr/zx/0.12.5/src/zx_peers.erl rename to zomp/lib/otpr/zx/0.12.6/src/zx_peers.erl index fa6ab25..7b42da7 100644 --- a/zomp/lib/otpr/zx/0.12.5/src/zx_peers.erl +++ b/zomp/lib/otpr/zx/0.12.6/src/zx_peers.erl @@ -10,7 +10,7 @@ %%% @end -module(zx_peers). --vsn("0.12.5"). +-vsn("0.12.6"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.12.5/src/zx_proxy.erl b/zomp/lib/otpr/zx/0.12.6/src/zx_proxy.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.5/src/zx_proxy.erl rename to zomp/lib/otpr/zx/0.12.6/src/zx_proxy.erl index 504591a..ed85c3c 100644 --- a/zomp/lib/otpr/zx/0.12.5/src/zx_proxy.erl +++ b/zomp/lib/otpr/zx/0.12.6/src/zx_proxy.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_proxy). --vsn("0.12.5"). +-vsn("0.12.6"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.5/src/zx_sup.erl b/zomp/lib/otpr/zx/0.12.6/src/zx_sup.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.5/src/zx_sup.erl rename to zomp/lib/otpr/zx/0.12.6/src/zx_sup.erl index 61c1c4e..e94e0e2 100644 --- a/zomp/lib/otpr/zx/0.12.5/src/zx_sup.erl +++ b/zomp/lib/otpr/zx/0.12.6/src/zx_sup.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_sup). --vsn("0.12.5"). +-vsn("0.12.6"). -behavior(supervisor). -author("Craig Everett "). -copyright("Craig Everett "). diff --git a/zomp/lib/otpr/zx/0.12.5/src/zx_tty.erl b/zomp/lib/otpr/zx/0.12.6/src/zx_tty.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.5/src/zx_tty.erl rename to zomp/lib/otpr/zx/0.12.6/src/zx_tty.erl index 0a4e635..b4bb29c 100644 --- a/zomp/lib/otpr/zx/0.12.5/src/zx_tty.erl +++ b/zomp/lib/otpr/zx/0.12.6/src/zx_tty.erl @@ -6,7 +6,7 @@ %%% @end -module(zx_tty). --vsn("0.12.5"). +-vsn("0.12.6"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.5/src/zx_userconf.erl b/zomp/lib/otpr/zx/0.12.6/src/zx_userconf.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.5/src/zx_userconf.erl rename to zomp/lib/otpr/zx/0.12.6/src/zx_userconf.erl index 66d010e..7328654 100644 --- a/zomp/lib/otpr/zx/0.12.5/src/zx_userconf.erl +++ b/zomp/lib/otpr/zx/0.12.6/src/zx_userconf.erl @@ -5,7 +5,7 @@ %%% @end -module(zx_userconf). --vsn("0.12.5"). +-vsn("0.12.6"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.5/src/zx_zsp.erl b/zomp/lib/otpr/zx/0.12.6/src/zx_zsp.erl similarity index 99% rename from zomp/lib/otpr/zx/0.12.5/src/zx_zsp.erl rename to zomp/lib/otpr/zx/0.12.6/src/zx_zsp.erl index 05c66a6..d6dd80c 100644 --- a/zomp/lib/otpr/zx/0.12.5/src/zx_zsp.erl +++ b/zomp/lib/otpr/zx/0.12.6/src/zx_zsp.erl @@ -7,7 +7,7 @@ %%% @end -module(zx_zsp). --vsn("0.12.5"). +-vsn("0.12.6"). -author("Craig Everett "). -copyright("Craig Everett "). -license("GPL-3.0"). diff --git a/zomp/lib/otpr/zx/0.12.5/templates/Emakefile b/zomp/lib/otpr/zx/0.12.6/templates/Emakefile similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/Emakefile rename to zomp/lib/otpr/zx/0.12.6/templates/Emakefile diff --git a/zomp/lib/otpr/zx/0.12.5/templates/boringlib/funfile.erl b/zomp/lib/otpr/zx/0.12.6/templates/boringlib/funfile.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/boringlib/funfile.erl rename to zomp/lib/otpr/zx/0.12.6/templates/boringlib/funfile.erl diff --git a/zomp/lib/otpr/zx/0.12.5/templates/escript b/zomp/lib/otpr/zx/0.12.6/templates/escript similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/escript rename to zomp/lib/otpr/zx/0.12.6/templates/escript diff --git a/zomp/lib/otpr/zx/0.12.5/templates/example_server/appmod.erl b/zomp/lib/otpr/zx/0.12.6/templates/example_server/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/example_server/appmod.erl rename to zomp/lib/otpr/zx/0.12.6/templates/example_server/appmod.erl diff --git a/zomp/lib/otpr/zx/0.12.5/templates/example_server/src/_client.erl b/zomp/lib/otpr/zx/0.12.6/templates/example_server/src/_client.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/example_server/src/_client.erl rename to zomp/lib/otpr/zx/0.12.6/templates/example_server/src/_client.erl diff --git a/zomp/lib/otpr/zx/0.12.5/templates/example_server/src/_client_man.erl b/zomp/lib/otpr/zx/0.12.6/templates/example_server/src/_client_man.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/example_server/src/_client_man.erl rename to zomp/lib/otpr/zx/0.12.6/templates/example_server/src/_client_man.erl diff --git a/zomp/lib/otpr/zx/0.12.5/templates/example_server/src/_client_sup.erl b/zomp/lib/otpr/zx/0.12.6/templates/example_server/src/_client_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/example_server/src/_client_sup.erl rename to zomp/lib/otpr/zx/0.12.6/templates/example_server/src/_client_sup.erl diff --git a/zomp/lib/otpr/zx/0.12.5/templates/example_server/src/_clients.erl b/zomp/lib/otpr/zx/0.12.6/templates/example_server/src/_clients.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/example_server/src/_clients.erl rename to zomp/lib/otpr/zx/0.12.6/templates/example_server/src/_clients.erl diff --git a/zomp/lib/otpr/zx/0.12.5/templates/example_server/src/_sup.erl b/zomp/lib/otpr/zx/0.12.6/templates/example_server/src/_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/example_server/src/_sup.erl rename to zomp/lib/otpr/zx/0.12.6/templates/example_server/src/_sup.erl diff --git a/zomp/lib/otpr/zx/0.12.5/templates/gitignore b/zomp/lib/otpr/zx/0.12.6/templates/gitignore similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/gitignore rename to zomp/lib/otpr/zx/0.12.6/templates/gitignore diff --git a/zomp/lib/otpr/zx/0.12.5/templates/hellowx/appmod.erl b/zomp/lib/otpr/zx/0.12.6/templates/hellowx/appmod.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/hellowx/appmod.erl rename to zomp/lib/otpr/zx/0.12.6/templates/hellowx/appmod.erl diff --git a/zomp/lib/otpr/zx/0.12.5/templates/hellowx/src/_con.erl b/zomp/lib/otpr/zx/0.12.6/templates/hellowx/src/_con.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/hellowx/src/_con.erl rename to zomp/lib/otpr/zx/0.12.6/templates/hellowx/src/_con.erl diff --git a/zomp/lib/otpr/zx/0.12.5/templates/hellowx/src/_gui.erl b/zomp/lib/otpr/zx/0.12.6/templates/hellowx/src/_gui.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/hellowx/src/_gui.erl rename to zomp/lib/otpr/zx/0.12.6/templates/hellowx/src/_gui.erl diff --git a/zomp/lib/otpr/zx/0.12.5/templates/hellowx/src/_sup.erl b/zomp/lib/otpr/zx/0.12.6/templates/hellowx/src/_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/hellowx/src/_sup.erl rename to zomp/lib/otpr/zx/0.12.6/templates/hellowx/src/_sup.erl diff --git a/zomp/lib/otpr/zx/0.12.5/templates/licenses/apache2.txt b/zomp/lib/otpr/zx/0.12.6/templates/licenses/apache2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/licenses/apache2.txt rename to zomp/lib/otpr/zx/0.12.6/templates/licenses/apache2.txt diff --git a/zomp/lib/otpr/zx/0.12.5/templates/licenses/bsd2.txt b/zomp/lib/otpr/zx/0.12.6/templates/licenses/bsd2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/licenses/bsd2.txt rename to zomp/lib/otpr/zx/0.12.6/templates/licenses/bsd2.txt diff --git a/zomp/lib/otpr/zx/0.12.5/templates/licenses/bsd3.txt b/zomp/lib/otpr/zx/0.12.6/templates/licenses/bsd3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/licenses/bsd3.txt rename to zomp/lib/otpr/zx/0.12.6/templates/licenses/bsd3.txt diff --git a/zomp/lib/otpr/zx/0.12.5/templates/licenses/cc0.txt b/zomp/lib/otpr/zx/0.12.6/templates/licenses/cc0.txt similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/licenses/cc0.txt rename to zomp/lib/otpr/zx/0.12.6/templates/licenses/cc0.txt diff --git a/zomp/lib/otpr/zx/0.12.5/templates/licenses/gpl3.txt b/zomp/lib/otpr/zx/0.12.6/templates/licenses/gpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/licenses/gpl3.txt rename to zomp/lib/otpr/zx/0.12.6/templates/licenses/gpl3.txt diff --git a/zomp/lib/otpr/zx/0.12.5/templates/licenses/lgpl3.txt b/zomp/lib/otpr/zx/0.12.6/templates/licenses/lgpl3.txt similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/licenses/lgpl3.txt rename to zomp/lib/otpr/zx/0.12.6/templates/licenses/lgpl3.txt diff --git a/zomp/lib/otpr/zx/0.12.5/templates/licenses/mit.txt b/zomp/lib/otpr/zx/0.12.6/templates/licenses/mit.txt similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/licenses/mit.txt rename to zomp/lib/otpr/zx/0.12.6/templates/licenses/mit.txt diff --git a/zomp/lib/otpr/zx/0.12.5/templates/licenses/mpl2.txt b/zomp/lib/otpr/zx/0.12.6/templates/licenses/mpl2.txt similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/licenses/mpl2.txt rename to zomp/lib/otpr/zx/0.12.6/templates/licenses/mpl2.txt diff --git a/zomp/lib/otpr/zx/0.12.5/templates/simplecli.erl b/zomp/lib/otpr/zx/0.12.6/templates/simplecli.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/simplecli.erl rename to zomp/lib/otpr/zx/0.12.6/templates/simplecli.erl diff --git a/zomp/lib/otpr/zx/0.12.5/templates/swp/worker.erl b/zomp/lib/otpr/zx/0.12.6/templates/swp/worker.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/swp/worker.erl rename to zomp/lib/otpr/zx/0.12.6/templates/swp/worker.erl diff --git a/zomp/lib/otpr/zx/0.12.5/templates/swp/worker_man.erl b/zomp/lib/otpr/zx/0.12.6/templates/swp/worker_man.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/swp/worker_man.erl rename to zomp/lib/otpr/zx/0.12.6/templates/swp/worker_man.erl diff --git a/zomp/lib/otpr/zx/0.12.5/templates/swp/worker_sup.erl b/zomp/lib/otpr/zx/0.12.6/templates/swp/worker_sup.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/swp/worker_sup.erl rename to zomp/lib/otpr/zx/0.12.6/templates/swp/worker_sup.erl diff --git a/zomp/lib/otpr/zx/0.12.5/templates/swp/workers.erl b/zomp/lib/otpr/zx/0.12.6/templates/swp/workers.erl similarity index 100% rename from zomp/lib/otpr/zx/0.12.5/templates/swp/workers.erl rename to zomp/lib/otpr/zx/0.12.6/templates/swp/workers.erl diff --git a/zomp/lib/otpr/zx/0.12.5/zomp.meta b/zomp/lib/otpr/zx/0.12.6/zomp.meta similarity index 91% rename from zomp/lib/otpr/zx/0.12.5/zomp.meta rename to zomp/lib/otpr/zx/0.12.6/zomp.meta index 9957de8..37643fc 100644 --- a/zomp/lib/otpr/zx/0.12.5/zomp.meta +++ b/zomp/lib/otpr/zx/0.12.6/zomp.meta @@ -9,7 +9,7 @@ {license,"MIT"}. {modules,[]}. {name,"zx"}. -{package_id,{"otpr","zx",{0,12,5}}}. +{package_id,{"otpr","zx",{0,12,6}}}. {prefix,"zx_"}. {repo_url,"https://gitlab.com/zxq9/zx"}. {tags,["tools","package manager","erlang"]}.