diff --git a/code/nel/tools/pipeline/service/pipeline_project.cpp b/code/nel/tools/pipeline/service/pipeline_project.cpp index e1efde897..84a4f5867 100644 --- a/code/nel/tools/pipeline/service/pipeline_project.cpp +++ b/code/nel/tools/pipeline/service/pipeline_project.cpp @@ -278,10 +278,10 @@ void CPipelineProject::parseValue(std::string &result, const std::string &value) { ss << getOutputDirectory(); } - else if (tagName == "TempDirectory") + /*else if (tagName == "TempDirectory") { ss << getTempDirectory(); - } + }*/ else { nlwarning("Unknown special project value '%s' in '%s'", tagName.c_str(), m_Form->getFilename().c_str()); @@ -304,6 +304,8 @@ void CPipelineProject::parseValue(std::string &result, const std::string &value) } break; case '@': // WORKSPACE PROJECT VALUE + // [@common_interface&DstInterfaceAtlas] // macro + // [@common_interface: // TODO // break; case '#': // LEVELDESIGN SHEET VALUE diff --git a/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_package.dfn b/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_package.dfn new file mode 100644 index 000000000..89aa481f3 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_package.dfn @@ -0,0 +1,15 @@ + + + + + + + + Sat Feb 18 13:35:41 2012 (Kaetemi) Dfn Structure = +Sat Feb 18 13:36:45 2012 (Kaetemi) Dfn Structure = +Sat Feb 18 13:44:45 2012 (Kaetemi) Dfn Structure = +Sat Feb 18 15:28:54 2012 (Kaetemi) Dfn Structure = +Fri Mar 02 21:21:25 2012 (Kaetemi) Dfn Structure = +Sat Mar 03 13:31:41 2012 (Kaetemi) Dfn Structure = +Sat Aug 04 15:24:52 2012 (kaetemi) Dfn Structure = + diff --git a/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_process_interface.dfn b/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_process_interface.dfn index 8cd51f12a..94f39a9fc 100644 --- a/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_process_interface.dfn +++ b/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_process_interface.dfn @@ -1,6 +1,5 @@ - diff --git a/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_process_package.dfn b/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_process_package.dfn new file mode 100644 index 000000000..ef3c11e3f --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_process_package.dfn @@ -0,0 +1,5 @@ + + + + + diff --git a/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_process_package_bnp.dfn b/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_process_package_bnp.dfn new file mode 100644 index 000000000..ca5b90619 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_process_package_bnp.dfn @@ -0,0 +1,12 @@ + + + + + + + Sat Feb 18 13:50:40 2012 (Kaetemi) Dfn Parents = +Sat Feb 18 13:58:21 2012 (Kaetemi) Dfn Structure = +Sat Feb 18 14:19:17 2012 (Kaetemi) Dfn Structure = +Fri Mar 02 21:20:17 2012 (Kaetemi) Header Comments = dfsd +Fri Mar 02 21:20:22 2012 (Kaetemi) Header State = 1 + diff --git a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/packages/interfaces.pipeline_package b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/packages/interfaces.pipeline_package new file mode 100644 index 000000000..25d1381e8 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/packages/interfaces.pipeline_package @@ -0,0 +1,27 @@ + +
+ + + + + + + + + + + + + + + + + + + + + Sat Aug 04 20:06:04 2012 (kaetemi) .Package.BNP.DstFile = interfaces.bnp +Sat Aug 04 20:06:04 2012 (kaetemi) formName Resized = 1 +Sat Aug 04 20:16:14 2012 (kaetemi) .Package.BNP.SrcDirectories[5] = [@common_interface&DstInterfaceAtlas] +Sat Aug 04 20:16:14 2012 (kaetemi) formName Resized = 6 + diff --git a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface.pipeline_project b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_interface.pipeline_project similarity index 90% rename from code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface.pipeline_project rename to code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_interface.pipeline_project index 6f1741f8b..4201f18da 100644 --- a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface.pipeline_project +++ b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_interface.pipeline_project @@ -42,16 +42,6 @@ - - - - - - - - - -