diff --git a/ebin/gmhive_client.app b/ebin/gmhive_client.app index b6e0b9f..cc0bafa 100644 --- a/ebin/gmhive_client.app +++ b/ebin/gmhive_client.app @@ -1,6 +1,6 @@ {application,gmhive_client, [{description,"Gajumaru Hive Client"}, - {vsn,"0.4.8"}, + {vsn,"0.5.1"}, {registered,[]}, {applications,[kernel,stdlib,sasl,gproc,inets,ssl,enoise, gmconfig,gmhive_protocol,gmhive_worker]}, diff --git a/rebar.config b/rebar.config index 2eecc54..35abaf3 100644 --- a/rebar.config +++ b/rebar.config @@ -10,7 +10,7 @@ {gmhive_protocol, {git, "https://git.qpq.swiss/QPQ-AG/gmhive_protocol.git", {ref, "818ce33"}}}, - {gmhive_worker, {git, "https://git.qpq.swiss/QPQ-AG/gmhive_worker", {ref, "fac460714f"}}}, + {gmhive_worker, {git, "https://git.qpq.swiss/QPQ-AG/gmhive_worker", {ref, "cabd104114"}}}, {gmconfig, {git, "https://git.qpq.swiss/QPQ-AG/gmconfig.git", {ref, "38620ff9e2"}}}, {gproc, "1.0.0"}, diff --git a/rebar.lock b/rebar.lock index 5358d60..bd78cfe 100644 --- a/rebar.lock +++ b/rebar.lock @@ -21,7 +21,7 @@ 0}, {<<"gmcuckoo">>, {git,"https://git.qpq.swiss/QPQ-AG/gmcuckoo.git", - {ref,"106e1cd2e4ff81286f6bc7d7c85f83bc20e14b82"}}, + {ref,"256e14e7c88043132245be902ff9756070d285b4"}}, 1}, {<<"gmhive_protocol">>, {git,"https://git.qpq.swiss/QPQ-AG/gmhive_protocol.git", @@ -29,7 +29,7 @@ 0}, {<<"gmhive_worker">>, {git,"https://git.qpq.swiss/QPQ-AG/gmhive_worker", - {ref,"fac460714fc228eb0b723a3f292a44aec77f094a"}}, + {ref,"cabd104114691edb925aacd7e04d431d47bac420"}}, 0}, {<<"gmserialization">>, {git,"https://git.qpq.swiss/QPQ-AG/gmserialization.git", diff --git a/src/gmhc_events.erl b/src/gmhc_events.erl index f5a3e49..64e2183 100644 --- a/src/gmhc_events.erl +++ b/src/gmhc_events.erl @@ -68,6 +68,7 @@ debug() -> subscribe(result), subscribe(error), subscribe(disconnected), + gmhive_worker:subscribe_returns(), loop() end). diff --git a/src/gmhive_client.app.src b/src/gmhive_client.app.src index 7a66063..e041ba3 100644 --- a/src/gmhive_client.app.src +++ b/src/gmhive_client.app.src @@ -1,7 +1,7 @@ %% -*- mode: erlang; erlang-indent-level: 4; indent-tabs-mode: nil -*- {application, gmhive_client, [{description, "Gajumaru Hive Client"}, - {vsn, "0.1.0"}, + {vsn, "zomp"}, {registered, []}, {applications, [ diff --git a/src/gmhive_client.app.src.script b/src/gmhive_client.app.src.script new file mode 100644 index 0000000..becbb46 --- /dev/null +++ b/src/gmhive_client.app.src.script @@ -0,0 +1,14 @@ +%% -*- erlang-mode; erlang-indent-level: 4; indent-tabs-mode: nil -*- + +[{application, Name, Opts}] = CONFIG. +case lists:keyfind(vsn, 1, Opts) of + {vsn, "zomp"} -> + ZompMetaF = filename:join(filename:dirname(filename:dirname(SCRIPT)), "zomp.meta"), + {ok, ZMeta} = file:consult(ZompMetaF), + {_, {_, _, {Vmaj,Vmin,Vpatch}}} = lists:keyfind(package_id, 1, ZMeta), + VsnStr = unicode:characters_to_list(io_lib:fwrite("~w.~w.~w", [Vmaj, Vmin, Vpatch])), + Opts1 = lists:keyreplace(vsn, 1, Opts, {vsn, VsnStr}), + [{application, Name, Opts1}]; + _ -> + CONFIG +end. diff --git a/zomp.meta b/zomp.meta index 2961dc0..4f8c8bd 100644 --- a/zomp.meta +++ b/zomp.meta @@ -2,11 +2,11 @@ {type,app}. {modules,[]}. {prefix,"gmhc"}. -{author,"Ulf Wiger, QPQ AG"}. {desc,"Gajumaru Hive Client"}. -{package_id,{"uwiger","gmhive_client",{0,4,8}}}. -{deps,[{"uwiger","gmhive_worker",{0,4,0}}, - {"uwiger","gmcuckoo",{1,2,3}}, +{author,"Ulf Wiger, QPQ AG"}. +{package_id,{"uwiger","gmhive_client",{0,5,1}}}. +{deps,[{"uwiger","gmhive_worker",{0,5,1}}, + {"uwiger","gmcuckoo",{1,2,4}}, {"otpr","eblake2",{1,0,1}}, {"otpr","base58",{0,1,1}}, {"otpr","gmserialization",{0,1,3}},