From bfd15ce03e9a197f0df68932ad9deb177b06c3fd Mon Sep 17 00:00:00 2001 From: Evgeny M Date: Tue, 9 Aug 2016 19:18:13 +0400 Subject: Ignore IntelliJ IDEA files This family of IDE with Erlang plugin is already quite popular. --- priv/templates/gitignore | 1 + 1 file changed, 1 insertion(+) (limited to 'priv/templates') diff --git a/priv/templates/gitignore b/priv/templates/gitignore index ced0c5e..121a4de 100644 --- a/priv/templates/gitignore +++ b/priv/templates/gitignore @@ -13,3 +13,4 @@ erl_crash.dump .rebar logs _build +.idea -- cgit v1.1 From 5b9bd7a10283fba4c3bac5a153b3937a73492752 Mon Sep 17 00:00:00 2001 From: Artem Teslenko Date: Sat, 10 Dec 2016 17:35:30 +0200 Subject: Add rebar3.crashdump to gitignore template --- priv/templates/gitignore | 1 + 1 file changed, 1 insertion(+) (limited to 'priv/templates') diff --git a/priv/templates/gitignore b/priv/templates/gitignore index 121a4de..468614d 100644 --- a/priv/templates/gitignore +++ b/priv/templates/gitignore @@ -14,3 +14,4 @@ erl_crash.dump logs _build .idea +rebar3.crashdump -- cgit v1.1 From ab63030cd7c3a4ab8043ee3eaf3489b83a3a38bd Mon Sep 17 00:00:00 2001 From: Fred Hebert Date: Sun, 14 May 2017 14:29:19 -0400 Subject: Match template license app to default license The default license created with rebar3 templates is a BSD 3 clause license. However the .app.src file generated do not include the license there. This adds the license type, fixing #1447. --- priv/templates/otp_app.app.src | 2 +- priv/templates/otp_lib.app.src | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'priv/templates') diff --git a/priv/templates/otp_app.app.src b/priv/templates/otp_app.app.src index c18f82c..1f6a818 100644 --- a/priv/templates/otp_app.app.src +++ b/priv/templates/otp_app.app.src @@ -11,6 +11,6 @@ {modules, []}, {maintainers, []}, - {licenses, []}, + {licenses, ["BSD"]}, {links, []} ]}. diff --git a/priv/templates/otp_lib.app.src b/priv/templates/otp_lib.app.src index 5b98a51..56ef8ad 100644 --- a/priv/templates/otp_lib.app.src +++ b/priv/templates/otp_lib.app.src @@ -10,6 +10,6 @@ {modules, []}, {maintainers, []}, - {licenses, []}, + {licenses, ["BSD"]}, {links, []} ]}. -- cgit v1.1 From 899b2d2689a6320717536e8c82e2fa043f863b8a Mon Sep 17 00:00:00 2001 From: Fred Hebert Date: Fri, 19 May 2017 21:38:27 -0400 Subject: Switch default license to Apache 2.0 --- priv/templates/LICENSE | 220 +++++++++++++++++++++++++++++++++++------ priv/templates/otp_app.app.src | 2 +- priv/templates/otp_lib.app.src | 2 +- 3 files changed, 193 insertions(+), 31 deletions(-) (limited to 'priv/templates') diff --git a/priv/templates/LICENSE b/priv/templates/LICENSE index 41588ab..59e1345 100644 --- a/priv/templates/LICENSE +++ b/priv/templates/LICENSE @@ -1,29 +1,191 @@ -Copyright (c) {{copyright_year}}, {{author_name}} <{{author_email}}>. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -* Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -* The names of its contributors may not be used to endorse or promote - products derived from this software without specific prior written - permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright {{copyright_year}}, {{author_name}} <{{author_email}}>. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/priv/templates/otp_app.app.src b/priv/templates/otp_app.app.src index 1f6a818..d694d87 100644 --- a/priv/templates/otp_app.app.src +++ b/priv/templates/otp_app.app.src @@ -11,6 +11,6 @@ {modules, []}, {maintainers, []}, - {licenses, ["BSD"]}, + {licenses, ["Apache 2.0"]}, {links, []} ]}. diff --git a/priv/templates/otp_lib.app.src b/priv/templates/otp_lib.app.src index 56ef8ad..aa31966 100644 --- a/priv/templates/otp_lib.app.src +++ b/priv/templates/otp_lib.app.src @@ -10,6 +10,6 @@ {modules, []}, {maintainers, []}, - {licenses, ["BSD"]}, + {licenses, ["Apache 2.0"]}, {links, []} ]}. -- cgit v1.1 From 42ae87965fae23434624cd2c92fc35806f641be4 Mon Sep 17 00:00:00 2001 From: aha-oretama Date: Mon, 3 Jul 2017 01:48:55 +0900 Subject: Ignore IntelliJ file --- priv/templates/gitignore | 1 + 1 file changed, 1 insertion(+) (limited to 'priv/templates') diff --git a/priv/templates/gitignore b/priv/templates/gitignore index 468614d..40ca652 100644 --- a/priv/templates/gitignore +++ b/priv/templates/gitignore @@ -14,4 +14,5 @@ erl_crash.dump logs _build .idea +*.iml rebar3.crashdump -- cgit v1.1 From 963c49f5eb9ab5b34e1843fb43305743720917ac Mon Sep 17 00:00:00 2001 From: Fred Hebert Date: Sun, 6 Aug 2017 07:26:21 -0400 Subject: Unicode support in all the places This is done through 3 main change groups: - replacing `~s` by `~ts` in format strings, so that strings that contain unicode are properly printed rather than crashing - adding the `unicode` argument to all function of the `re` module to ensure transformations on strings containing unicode data are valid instead of crashing (see issue #1302) - replacing `ec_cnv:to_binary/1` and `ec_cnv:to_list/1` with matching functions in `rebar_utils`. The last point has been done, rather than modifying and updating erlware commons, because binary and list conversions can be a contentious subject. For example, if what is being handled is actually bytes from a given binary stream, then forcing a byte-oriented interpretation of the data can corrupt it. As such, it does not appear safe to modify erlware commons' conversion functions since it may not be safe for all its users. Instead, rebar3 reimplements a subset of them (only converting atoms and chardata, ignoring numbers) with the explicit purpose of handling unicode string data. Tests were left as unchanged as possible. This may impact the ability to run rebar3's own suites in a unicode path, but respects a principle of least change for such a large patch. --- priv/templates/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'priv/templates') diff --git a/priv/templates/Makefile b/priv/templates/Makefile index d3c3767..5d490fd 100644 --- a/priv/templates/Makefile +++ b/priv/templates/Makefile @@ -6,9 +6,9 @@ BASEDIR := $(abspath $(CURDIR)/..) PROJECT ?= $(notdir $(BASEDIR)) PROJECT := $(strip $(PROJECT)) -ERTS_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s/erts-~s/include/\", [code:root_dir(), erlang:system_info(version)]).") -ERL_INTERFACE_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:lib_dir(erl_interface, include)]).") -ERL_INTERFACE_LIB_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:lib_dir(erl_interface, lib)]).") +ERTS_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~ts/erts-~ts/include/\", [code:root_dir(), erlang:system_info(version)]).") +ERL_INTERFACE_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~ts\", [code:lib_dir(erl_interface, include)]).") +ERL_INTERFACE_LIB_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~ts\", [code:lib_dir(erl_interface, lib)]).") C_SRC_DIR = $(CURDIR) C_SRC_OUTPUT ?= $(CURDIR)/../priv/$(PROJECT).so -- cgit v1.1 From 98354eb8548a304212b3be035a0658d3b4435ea2 Mon Sep 17 00:00:00 2001 From: Fred Hebert Date: Wed, 9 Aug 2017 20:08:36 -0400 Subject: Add an alias of 'release' template as 'umbrella' Gets in line with more common usage of the wording, as discussed in issue #1421 and https://www.reddit.com/r/erlang/comments/6sd01p/help_terribly_frustrated_with_the_erlang_build/ --- priv/templates/umbrella.template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 priv/templates/umbrella.template (limited to 'priv/templates') diff --git a/priv/templates/umbrella.template b/priv/templates/umbrella.template new file mode 100644 index 0000000..a2855d3 --- /dev/null +++ b/priv/templates/umbrella.template @@ -0,0 +1,15 @@ +{description, "OTP structure for executable programs (alias of 'release' template)"}. +{variables, [ + {name, "myapp", "Name of the OTP release. An app with this name will also be created."}, + {desc, "An OTP application", "Short description of the release's main app's purpose"} +]}. +{template, "app.erl", "{{name}}/{{apps_dir}}/{{name}}/src/{{name}}_app.erl"}. +{template, "sup.erl", "{{name}}/{{apps_dir}}/{{name}}/src/{{name}}_sup.erl"}. +{template, "otp_app.app.src", "{{name}}/{{apps_dir}}/{{name}}/src/{{name}}.app.src"}. +{template, "relx_rebar.config", "{{name}}/rebar.config"}. +{template, "sys.config", "{{name}}/config/sys.config"}. +{template, "vm.args", "{{name}}/config/vm.args"}. +{template, "gitignore", "{{name}}/.gitignore"}. +{template, "LICENSE", "{{name}}/LICENSE"}. +{template, "README.md", "{{name}}/README.md"}. + -- cgit v1.1 From c5ae9f3fed035d2ef8f072da53647c212f92db8b Mon Sep 17 00:00:00 2001 From: Grigory Starinkin Date: Tue, 8 May 2018 21:42:43 +0100 Subject: start at least one async thread in async thread pool fixes an issue when shell is terminated with an error "Bus error: 10", on attempt to run rebar shell with verbose logging --- priv/templates/escript_rebar.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'priv/templates') diff --git a/priv/templates/escript_rebar.config b/priv/templates/escript_rebar.config index ef498a8..3ed7150 100644 --- a/priv/templates/escript_rebar.config +++ b/priv/templates/escript_rebar.config @@ -5,7 +5,7 @@ [{{name}}]}. {escript_main_app, {{name}}}. {escript_name, {{name}}}. -{escript_emu_args, "%%! +sbtu +A0\n"}. +{escript_emu_args, "%%! +sbtu +A1\n"}. %% Profiles {profiles, [{test, -- cgit v1.1 From 6bcbbf7526a9ac426e627826f5304ed1c3051f2a Mon Sep 17 00:00:00 2001 From: Peter Saxton Date: Sun, 20 May 2018 15:50:48 +0100 Subject: Use maps for child spec example --- priv/templates/sup.erl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'priv/templates') diff --git a/priv/templates/sup.erl b/priv/templates/sup.erl index a2e7209..e2fa05e 100644 --- a/priv/templates/sup.erl +++ b/priv/templates/sup.erl @@ -26,7 +26,8 @@ start_link() -> %% Supervisor callbacks %%==================================================================== -%% Child :: {Id,StartFunc,Restart,Shutdown,Type,Modules} +%% Child :: #{id => Id, start => {M, F, A}} +%% Optional keys are restart, shutdown, type, modules. init([]) -> {ok, { {one_for_all, 0, 1}, []} }. -- cgit v1.1 From 0a0539ae2aad4f4d227927e0c205b8aef7ab9acc Mon Sep 17 00:00:00 2001 From: Fred Hebert Date: Sun, 20 May 2018 11:08:08 -0400 Subject: Auto-boot main app in OTP app project templates People are starting to expect these niceties! It's also easier to drop the config when you know it's there than add it when you don't know it exists. --- priv/templates/app.template | 2 +- priv/templates/app_rebar.config | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 priv/templates/app_rebar.config (limited to 'priv/templates') diff --git a/priv/templates/app.template b/priv/templates/app.template index d0bebd7..7d68b2c 100644 --- a/priv/templates/app.template +++ b/priv/templates/app.template @@ -6,7 +6,7 @@ {template, "app.erl", "{{name}}/src/{{name}}_app.erl"}. {template, "sup.erl", "{{name}}/src/{{name}}_sup.erl"}. {template, "otp_app.app.src", "{{name}}/src/{{name}}.app.src"}. -{template, "rebar.config", "{{name}}/rebar.config"}. +{template, "app_rebar.config", "{{name}}/rebar.config"}. {template, "gitignore", "{{name}}/.gitignore"}. {template, "LICENSE", "{{name}}/LICENSE"}. {template, "README.md", "{{name}}/README.md"}. diff --git a/priv/templates/app_rebar.config b/priv/templates/app_rebar.config new file mode 100644 index 0000000..203ce4a --- /dev/null +++ b/priv/templates/app_rebar.config @@ -0,0 +1,7 @@ +{erl_opts, [debug_info]}. +{deps, []}. + +{shell, [ + % {config, [{config, "config/sys.config"}]}, + {apps, [{{name}}]} +]}. -- cgit v1.1 From 1b02e78fae8a50b77a7b68544f00208353a23cb3 Mon Sep 17 00:00:00 2001 From: Peter Saxton Date: Sun, 20 May 2018 16:11:21 +0100 Subject: add tuple and comment for prior to OTP 18 --- priv/templates/sup.erl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'priv/templates') diff --git a/priv/templates/sup.erl b/priv/templates/sup.erl index e2fa05e..0db7155 100644 --- a/priv/templates/sup.erl +++ b/priv/templates/sup.erl @@ -28,6 +28,8 @@ start_link() -> %% Child :: #{id => Id, start => {M, F, A}} %% Optional keys are restart, shutdown, type, modules. +%% Before OTP 18 tuples must be used to specify a child. e.g. +%% Child :: {Id,StartFunc,Restart,Shutdown,Type,Modules} init([]) -> {ok, { {one_for_all, 0, 1}, []} }. -- cgit v1.1 From d538be3481e65a00f2817344f697f88b1b55f8c3 Mon Sep 17 00:00:00 2001 From: Fred Hebert Date: Fri, 5 Oct 2018 10:57:58 -0400 Subject: Bump bbmustache and fix templates (#1862) * bump bbmustache to version 1.6.0 * Use alternative bbmustache brackets in templates This fixes the problems where literal nested tuples (`{{a,b},c}` or `{{a,b}}`) would blow up and spaces needed to be inserted. --- priv/templates/otp_app.app.src | 7 ++++--- priv/templates/plugin_README.md | 13 +++++++------ priv/templates/relx_rebar.config | 5 +++-- priv/templates/sup.erl | 7 ++++--- priv/templates/sys.config | 3 ++- 5 files changed, 20 insertions(+), 15 deletions(-) (limited to 'priv/templates') diff --git a/priv/templates/otp_app.app.src b/priv/templates/otp_app.app.src index d694d87..6040089 100644 --- a/priv/templates/otp_app.app.src +++ b/priv/templates/otp_app.app.src @@ -1,8 +1,9 @@ -{application, {{name}}, - [{description, "{{desc}}"}, +{{=@@ @@=}} +{application, @@name@@, + [{description, "@@desc@@"}, {vsn, "0.1.0"}, {registered, []}, - {mod, { {{name}}_app, []}}, + {mod, {@@name@@_app, []}}, {applications, [kernel, stdlib diff --git a/priv/templates/plugin_README.md b/priv/templates/plugin_README.md index 7f9ba84..1176d95 100644 --- a/priv/templates/plugin_README.md +++ b/priv/templates/plugin_README.md @@ -1,7 +1,8 @@ -{{name}} +{{=@@ @@=}} +@@name@@ ===== -{{desc}} +@@desc@@ Build ----- @@ -14,13 +15,13 @@ Use Add the plugin to your rebar config: {plugins, [ - { {{name}}, ".*", {git, "git@host:user/{{name}}.git", {tag, "0.1.0"}}} + {@@name@@, {git, "https://host/user/@@name@@.git", {tag, "0.1.0"}}} ]}. Then just call your plugin directly in an existing application: - $ rebar3 {{name}} - ===> Fetching {{name}} - ===> Compiling {{name}} + $ rebar3 @@name@@ + ===> Fetching @@name@@ + ===> Compiling @@name@@ diff --git a/priv/templates/relx_rebar.config b/priv/templates/relx_rebar.config index 81b7dbe..30a629f 100644 --- a/priv/templates/relx_rebar.config +++ b/priv/templates/relx_rebar.config @@ -1,8 +1,9 @@ +{{=@@ @@=}} {erl_opts, [debug_info]}. {deps, []}. -{relx, [{release, { {{name}}, "0.1.0" }, - [{{name}}, +{relx, [{release, {@@name@@, "0.1.0"}, + [@@name@@, sasl]}, {sys_config, "./config/sys.config"}, diff --git a/priv/templates/sup.erl b/priv/templates/sup.erl index 0db7155..020021c 100644 --- a/priv/templates/sup.erl +++ b/priv/templates/sup.erl @@ -1,9 +1,10 @@ +{{=@@ @@=}} %%%------------------------------------------------------------------- -%% @doc {{name}} top level supervisor. +%% @doc @@name@@ top level supervisor. %% @end %%%------------------------------------------------------------------- --module({{name}}_sup). +-module(@@name@@_sup). -behaviour(supervisor). @@ -31,7 +32,7 @@ start_link() -> %% Before OTP 18 tuples must be used to specify a child. e.g. %% Child :: {Id,StartFunc,Restart,Shutdown,Type,Modules} init([]) -> - {ok, { {one_for_all, 0, 1}, []} }. + {ok, {{one_for_all, 0, 1}, []}}. %%==================================================================== %% Internal functions diff --git a/priv/templates/sys.config b/priv/templates/sys.config index d892fd6..983801f 100644 --- a/priv/templates/sys.config +++ b/priv/templates/sys.config @@ -1,3 +1,4 @@ +{{=@@ @@=}} [ - { {{name}}, []} + {@@name@@, []} ]. -- cgit v1.1 From f96dcbb342d585996b04bd5b6fff9cbc955440cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Boroska=20Andra=CC=81s?= Date: Sat, 27 Oct 2018 22:25:57 +0200 Subject: Fix misleading config in app template Uncommenting the sys.config shell setting in app template rebar.config works now as expected. --- priv/templates/app_rebar.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'priv/templates') diff --git a/priv/templates/app_rebar.config b/priv/templates/app_rebar.config index 203ce4a..a3f5b8c 100644 --- a/priv/templates/app_rebar.config +++ b/priv/templates/app_rebar.config @@ -2,6 +2,6 @@ {deps, []}. {shell, [ - % {config, [{config, "config/sys.config"}]}, + % {config, "config/sys.config"}, {apps, [{{name}}]} ]}. -- cgit v1.1 From f0826929de675d04f8cb81afa0f3e7a879984446 Mon Sep 17 00:00:00 2001 From: Niklas Johansson Date: Wed, 31 Oct 2018 19:30:18 +0100 Subject: templates/gitignore ignore emacs temp files emacs creates temp files that ends with tilde (~). These temp files should never be commited. It is therefore safe to ignore them. Signed-off-by: Niklas Johansson --- priv/templates/gitignore | 1 + 1 file changed, 1 insertion(+) (limited to 'priv/templates') diff --git a/priv/templates/gitignore b/priv/templates/gitignore index 40ca652..f1c4554 100644 --- a/priv/templates/gitignore +++ b/priv/templates/gitignore @@ -16,3 +16,4 @@ _build .idea *.iml rebar3.crashdump +*~ -- cgit v1.1