This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-149
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
The following commit(s) were added to refs/heads/FREEMARKER-149 by this push:
new 3d75865 FREEMARKER-149 Support multiple template transformation on
the command line
3d75865 is described below
commit 3d75865e6382d64c4093ad90fe35319b1072ad45
Author: Siegfried Goeschl <[email protected]>
AuthorDate: Wed Jul 1 08:01:18 2020 +0200
FREEMARKER-149 Support multiple template transformation on the command line
---
freemarker-generator-cli/README.md | 23 ++++---
freemarker-generator-cli/pom.xml | 2 +
.../markdown/cli/introduction/getting-started.md | 79 +++++++++++-----------
3 files changed, 54 insertions(+), 50 deletions(-)
diff --git a/freemarker-generator-cli/README.md
b/freemarker-generator-cli/README.md
index 097a4b5..404365f 100644
--- a/freemarker-generator-cli/README.md
+++ b/freemarker-generator-cli/README.md
@@ -12,22 +12,23 @@ Now you can have a look at the command line options
freemarker-cli -h
Usage: freemarker-cli (-t=<templates> [-t=<templates>]... |
-i=<interactiveTemplate>) [-hV] [--stdin] [-b=<baseDir>]
- [--config=<configFile>] [--data-source-exclude=<exclude>]
- [--data-source-include=<include>] [-e=<inputEncoding>]
- [-l=<locale>] [-o=<outputFile>]
+ [--config=<configFile>]
+ [--data-source-exclude=<dataSourceExcludePattern>]
+ [--data-source-include=<dataSourceIncludePattern>]
+ [-e=<inputEncoding>] [-l=<locale>]
[--output-encoding=<outputEncoding>] [--times=<times>]
[-D=<String=String>]... [-m=<dataModels>]...
- [-P=<String=String>]... [-s=<dataSources>]...
- [<sources>...]
+ [-o=<outputs>]... [-P=<String=String>]...
+ [-s=<dataSources>]... [<sources>...]
Apache FreeMarker CLI
[<sources>...] data source files and/or directories
- -b, --basedir=<baseDir> optional template base directory
+ -b, --basedir=<baseDir> additional template base directory
--config=<configFile> FreeMarker CLI configuration file
-D, --system-property=<String=String>
set system property
- --data-source-exclude=<exclude>
+ --data-source-exclude=<dataSourceExcludePattern>
file exclude pattern for data sources
- --data-source-include=<include>
+ --data-source-include=<dataSourceIncludePattern>
file include pattern for data sources
-e, --input-encoding=<inputEncoding>
encoding of data source
@@ -37,16 +38,16 @@ Apache FreeMarker CLI
-l, --locale=<locale> locale being used for the output, e.g. 'en_US'
-m, --data-model=<dataModels>
data model used for rendering
- -o, --output=<outputFile> output file or directory
+ -o, --output=<outputs> output files or directories
--output-encoding=<outputEncoding>
encoding of output, e.g. UTF-8
-P, --param=<String=String>
set parameter
-s, --data-source=<dataSources>
- data source used for redering
+ data source used for rendering
--stdin read data source from stdin
-t, --template=<templates>
- template to process
+ templates to process
--times=<times> re-run X times for profiling
-V, --version Print version information and exit.
```
diff --git a/freemarker-generator-cli/pom.xml b/freemarker-generator-cli/pom.xml
index 81ee0ac..20d7ce2 100644
--- a/freemarker-generator-cli/pom.xml
+++ b/freemarker-generator-cli/pom.xml
@@ -73,6 +73,8 @@
<target>
<copy file="CHANGELOG.md"
todir="./target/appassembler" />
<copy file="README.md"
todir="./target/appassembler" />
+ <copy file="LICENSE"
todir="./target/appassembler" />
+ <copy file="NOTICE"
todir="./target/appassembler" />
<copy
file="./src/main/scripts/run-examples.sh" todir="./target/appassembler" />
<copy todir="./target/appassembler/templates">
<fileset dir="templates" />
diff --git
a/freemarker-generator-cli/src/site/markdown/cli/introduction/getting-started.md
b/freemarker-generator-cli/src/site/markdown/cli/introduction/getting-started.md
index a288348..e2f0de4 100644
---
a/freemarker-generator-cli/src/site/markdown/cli/introduction/getting-started.md
+++
b/freemarker-generator-cli/src/site/markdown/cli/introduction/getting-started.md
@@ -36,45 +36,46 @@ version=0.1.0-SNAPSHOT, time=2020-06-25T21:48:02+0200,
commit=b320d00094be878908
```
> freemarker-cli -h
-Usage: freemarker-cli (-t=<templates> [-t=<templates>]... |
- -i=<interactiveTemplate>) [-hV] [--stdin] [-b=<baseDir>]
- [--config=<configFile>] [--data-source-exclude=<exclude>]
- [--data-source-include=<include>] [-e=<inputEncoding>]
- [-l=<locale>] [-o=<outputFile>]
- [--output-encoding=<outputEncoding>] [--times=<times>]
- [-D=<String=String>]... [-m=<dataModels>]...
- [-P=<String=String>]... [-s=<dataSources>]...
- [<sources>...]
-Apache FreeMarker CLI
- [<sources>...] data source files and/or directories
- -b, --basedir=<baseDir> optional template base directory
- --config=<configFile> FreeMarker CLI configuration file
- -D, --system-property=<String=String>
- set system property
- --data-source-exclude=<exclude>
- file exclude pattern for data sources
- --data-source-include=<include>
- file include pattern for data sources
- -e, --input-encoding=<inputEncoding>
- encoding of data source
- -h, --help Show this help message and exit.
- -i, --interactive=<interactiveTemplate>
- interactive template to process
- -l, --locale=<locale> locale being used for the output, e.g. 'en_US'
- -m, --data-model=<dataModels>
- data model used for rendering
- -o, --output=<outputFile> output file or directory
- --output-encoding=<outputEncoding>
- encoding of output, e.g. UTF-8
- -P, --param=<String=String>
- set parameter
- -s, --data-source=<dataSources>
- data source used for redering
- --stdin read data source from stdin
- -t, --template=<templates>
- template to process
- --times=<times> re-run X times for profiling
- -V, --version Print version information and exit.
+ Usage: freemarker-cli (-t=<templates> [-t=<templates>]... |
+ -i=<interactiveTemplate>) [-hV] [--stdin]
[-b=<baseDir>]
+ [--config=<configFile>]
+ [--data-source-exclude=<dataSourceExcludePattern>]
+ [--data-source-include=<dataSourceIncludePattern>]
+ [-e=<inputEncoding>] [-l=<locale>]
+ [--output-encoding=<outputEncoding>] [--times=<times>]
+ [-D=<String=String>]... [-m=<dataModels>]...
+ [-o=<outputs>]... [-P=<String=String>]...
+ [-s=<dataSources>]... [<sources>...]
+ Apache FreeMarker CLI
+ [<sources>...] data source files and/or directories
+ -b, --basedir=<baseDir> additional template base directory
+ --config=<configFile> FreeMarker CLI configuration file
+ -D, --system-property=<String=String>
+ set system property
+ --data-source-exclude=<dataSourceExcludePattern>
+ file exclude pattern for data sources
+ --data-source-include=<dataSourceIncludePattern>
+ file include pattern for data sources
+ -e, --input-encoding=<inputEncoding>
+ encoding of data source
+ -h, --help Show this help message and exit.
+ -i, --interactive=<interactiveTemplate>
+ interactive template to process
+ -l, --locale=<locale> locale being used for the output, e.g. 'en_US'
+ -m, --data-model=<dataModels>
+ data model used for rendering
+ -o, --output=<outputs> output files or directories
+ --output-encoding=<outputEncoding>
+ encoding of output, e.g. UTF-8
+ -P, --param=<String=String>
+ set parameter
+ -s, --data-source=<dataSources>
+ data source used for rendering
+ --stdin read data source from stdin
+ -t, --template=<templates>
+ templates to process
+ --times=<times> re-run X times for profiling
+ -V, --version Print version information and exit.
```
### The Info Template
