From c5dcbde50bdc3d5e4d0f8aefc6e2775876db050b Mon Sep 17 00:00:00 2001 From: Craig Everett Date: Wed, 26 Aug 2020 19:51:22 +0900 Subject: [PATCH] Fix statically included 'example_server' atom --- zomp/lib/otpr/zx/0.11.4/src/zx_local.erl | 18 ++++++++++++------ .../0.11.4/templates/example_server/appmod.erl | 4 ++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/zomp/lib/otpr/zx/0.11.4/src/zx_local.erl b/zomp/lib/otpr/zx/0.11.4/src/zx_local.erl index d468dbd..b29730d 100644 --- a/zomp/lib/otpr/zx/0.11.4/src/zx_local.erl +++ b/zomp/lib/otpr/zx/0.11.4/src/zx_local.erl @@ -1485,7 +1485,8 @@ create_project(P = #project{id = {_, Name, Version}}) -> munge_sources(#project{type = lib, - name = Name, + id = {_, Name, _}, + name = ProjectName, license = Title, module = Module, author = Credit, @@ -1497,7 +1498,8 @@ munge_sources(#project{type = lib, ok = file:make_dir("ebin"), {ok, ProjectDir} = file:get_cwd(), Substitutions = - [{"〘\*PROJECT NAME\*〙", Name}, + [{"〘\*PROJECT NAME\*〙", ProjectName}, + {"〘\*NAME\*〙", Name}, {"〘\*MODULE\*〙", Module}, {"〘\*VERSION\*〙", VersionString}, {"〘\*AUTHOR\*〙", author(Credit, AEmail)}, @@ -1512,7 +1514,8 @@ munge_sources(#project{type = lib, ok = file:write_file(ModFile, CookedMod), file:set_cwd(ProjectDir); munge_sources(#project{type = cli, - name = Name, + id = {_, Name, _}, + name = ProjectName, license = Title, module = Module, author = Credit, @@ -1524,7 +1527,8 @@ munge_sources(#project{type = cli, ok = file:make_dir("ebin"), {ok, ProjectDir} = file:get_cwd(), Substitutions = - [{"〘\*PROJECT NAME\*〙", Name}, + [{"〘\*PROJECT NAME\*〙", ProjectName}, + {"〘\*NAME\*〙", Name}, {"〘\*MODULE\*〙", Module}, {"〘\*VERSION\*〙", VersionString}, {"〘\*AUTHOR\*〙", author(Credit, AEmail)}, @@ -1539,7 +1543,8 @@ munge_sources(#project{type = cli, ok = file:write_file(ModFile, CookedMod), file:set_cwd(ProjectDir); munge_sources(#project{type = Type, - name = Name, + id = {_, Name, _}, + name = ProjectName, license = License, prefix = Prefix, appmod = AppMod, @@ -1552,7 +1557,8 @@ munge_sources(#project{type = Type, ok = file:make_dir("ebin"), {ok, ProjectDir} = file:get_cwd(), Substitutions = - [{"〘\*PROJECT NAME\*〙", Name}, + [{"〘\*PROJECT NAME\*〙", ProjectName}, + {"〘\*NAME\*〙", Name}, {"〘\*VERSION\*〙", VersionString}, {"〘\*PREFIX\*〙", Prefix}, {"〘\*APP MOD\*〙", AppMod}, diff --git a/zomp/lib/otpr/zx/0.11.4/templates/example_server/appmod.erl b/zomp/lib/otpr/zx/0.11.4/templates/example_server/appmod.erl index 3f2cbc6..fb17cea 100644 --- a/zomp/lib/otpr/zx/0.11.4/templates/example_server/appmod.erl +++ b/zomp/lib/otpr/zx/0.11.4/templates/example_server/appmod.erl @@ -41,8 +41,8 @@ ignore() -> start() -> ok = application:ensure_started(sasl), - ok = application:start(example_server), - io:format("Starting es..."). + ok = application:start(〘*NAME*〙), + io:format("Starting..."). -spec start(PortNum) -> ok