From 750981197ce1aa77362d51a4f6827eb608a504ec Mon Sep 17 00:00:00 2001 From: Jan David Mol <mol@astron.nl> Date: Mon, 14 Mar 2016 18:48:10 +0000 Subject: [PATCH] Task #8437: Use more common .tmpl extention --- .gitattributes | 2 +- CEP/Pipeline/recipes/sip/CMakeLists.txt | 2 +- ...pipeline.cfg.CEP4.docker-template => pipeline.cfg.CEP4.tmpl} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename CEP/Pipeline/recipes/sip/{pipeline.cfg.CEP4.docker-template => pipeline.cfg.CEP4.tmpl} (100%) diff --git a/.gitattributes b/.gitattributes index e2359c94fd9..73ed20da7ce 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1614,7 +1614,7 @@ CEP/Pipeline/recipes/sip/nodes/selfcal_finalize.py eol=lf CEP/Pipeline/recipes/sip/nodes/setupparmdb.py eol=lf CEP/Pipeline/recipes/sip/nodes/setupsourcedb.py eol=lf CEP/Pipeline/recipes/sip/nodes/vdsmaker.py eol=lf -CEP/Pipeline/recipes/sip/pipeline.cfg.CEP4.docker-template -text +CEP/Pipeline/recipes/sip/pipeline.cfg.CEP4.tmpl -text CEP/Pipeline/recipes/sip/pipeline.cfg.in eol=lf CEP/Pipeline/recipes/sip/plugins/PipelineStep_addMapfile.py -text CEP/Pipeline/recipes/sip/plugins/PipelineStep_changeMapfile.py -text diff --git a/CEP/Pipeline/recipes/sip/CMakeLists.txt b/CEP/Pipeline/recipes/sip/CMakeLists.txt index dedd7ed4922..bf6eac9da74 100644 --- a/CEP/Pipeline/recipes/sip/CMakeLists.txt +++ b/CEP/Pipeline/recipes/sip/CMakeLists.txt @@ -131,7 +131,7 @@ configure_file( # Convert configuration files through docker-template foreach(_file ${CMAKE_CURRENT_SOURCE_DIR}/pipeline.cfg.CEP4) # _src -> _dst - set(_src ${CMAKE_CURRENT_SOURCE_DIR}/${_file}.in_docker-template) + set(_src ${CMAKE_CURRENT_SOURCE_DIR}/${_file}.tmpl) set(_dst ${CMAKE_CURRENT_BINARY_DIR}/${_file}) # add generating command, and (any) target to force the generation diff --git a/CEP/Pipeline/recipes/sip/pipeline.cfg.CEP4.docker-template b/CEP/Pipeline/recipes/sip/pipeline.cfg.CEP4.tmpl similarity index 100% rename from CEP/Pipeline/recipes/sip/pipeline.cfg.CEP4.docker-template rename to CEP/Pipeline/recipes/sip/pipeline.cfg.CEP4.tmpl -- GitLab