This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-153
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
The following commit(s) were added to refs/heads/FREEMARKER-153 by this push:
new 5400523 FREEMARKER-153 Use "./templates" as template root directory
instead of "."
5400523 is described below
commit 54005237289f842b4363868f2fe67459ea414bbb
Author: Siegfried Goeschl <[email protected]>
AuthorDate: Mon Aug 10 20:44:24 2020 +0200
FREEMARKER-153 Use "./templates" as template root directory instead of "."
---
freemarker-generator-cli/src/scripts/run-examples.bat | 4 ++--
freemarker-generator-cli/src/scripts/run-examples.sh | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/freemarker-generator-cli/src/scripts/run-examples.bat
b/freemarker-generator-cli/src/scripts/run-examples.bat
index 8671da0..2fb6f34 100644
--- a/freemarker-generator-cli/src/scripts/run-examples.bat
+++ b/freemarker-generator-cli/src/scripts/run-examples.bat
@@ -78,7 +78,7 @@ REM
=========================================================================
REM CSV to HTML & PDF
REM =========================================================================
-echo "templates\csv\html\transform.ftl"
+echo "examples\templates\csv\html\transform.ftl"
%FREEMARKER_CMD% -t examples\templates\csv\html\transactions.ftl
examples\data\csv\transactions.csv > target\out\transactions.html
REM =========================================================================
@@ -168,7 +168,7 @@ REM XML
REM =========================================================================
echo "examples\templates\xml\txt\recipients.ftl"
-%FREEMARKER_CMD% -t .\examples\templates\xml\txt\recipients.ftl
examples\data\xml\recipients.xml > target\out\recipients.txt
+%FREEMARKER_CMD% -t examples\templates\xml\txt\recipients.ftl
examples\data\xml\recipients.xml > target\out\recipients.txt
echo "Created the following sample files in .\target\out"
dir .\target\out
\ No newline at end of file
diff --git a/freemarker-generator-cli/src/scripts/run-examples.sh
b/freemarker-generator-cli/src/scripts/run-examples.sh
index 8bcb70b..3c37013 100755
--- a/freemarker-generator-cli/src/scripts/run-examples.sh
+++ b/freemarker-generator-cli/src/scripts/run-examples.sh
@@ -93,7 +93,7 @@ fi
# CSV to HTML & PDF
#############################################################################
-echo "templates/csv/html/transform.ftl"
+echo "examples/templates/csv/html/transform.ftl"
$FREEMARKER_CMD -t examples/templates/csv/html/transactions.ftl
examples/data/csv/transactions.csv > target/out/transactions.html || { echo >&2
"Test failed. Aborting."; exit 1; }
if hash wkhtmltopdf 2>/dev/null; then
@@ -122,7 +122,7 @@ $FREEMARKER_CMD -t
examples/templates/accesslog/combined-access.ftl examples/dat
echo "examples/templates/excel/dataframe/transform.ftl"
$FREEMARKER_CMD -t examples/templates/excel/dataframe/transform.ftl
examples/data/excel/test.xls > target/out/test.xls.dataframe.txt || { echo >&2
"Test failed. Aborting."; exit 1; }
-echo "templates/excel/html/transform.ftl"
+echo "examples/templates/excel/html/transform.ftl"
$FREEMARKER_CMD -t excel/html/transform.ftl examples/data/excel/test.xls >
target/out/test.xls.html || { echo >&2 "Test failed. Aborting."; exit 1; }
$FREEMARKER_CMD -t excel/html/transform.ftl examples/data/excel/test.xlsx >
target/out/test.xslx.html || { echo >&2 "Test failed. Aborting."; exit 1; }
$FREEMARKER_CMD -t excel/html/transform.ftl
examples/data/excel/test-multiple-sheets.xlsx >
target/out/test-multiple-sheets.xlsx.html || { echo >&2 "Test failed.
Aborting."; exit 1; }
@@ -188,7 +188,7 @@ $FREEMARKER_CMD -t yaml/json/transform.ftl
examples/data/yaml/swagger-spec.yaml
#############################################################################
echo "examples/templates/xml/txt/recipients.ftl"
-$FREEMARKER_CMD -t ./examples/templates/xml/txt/recipients.ftl
examples/data/xml/recipients.xml > target/out/recipients.txt || { echo >&2
"Test failed. Aborting."; exit 1; }
+$FREEMARKER_CMD -t examples/templates/xml/txt/recipients.ftl
examples/data/xml/recipients.xml > target/out/recipients.txt || { echo >&2
"Test failed. Aborting."; exit 1; }
echo "Created the following sample files in ./target/out"
ls -l ./target/out
\ No newline at end of file
