From cd57b6e2e5e75443402b191e4e1f0903074f45f4 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 2 Mar 2012 21:50:22 +0100 Subject: [PATCH] Changed: Simplified pipeline project configuration format. --HG-- branch : build_pipeline_v3 --- .../DFN/pipeline/pipeline_common_id_od.dfn | 10 ++ .../DFN/pipeline/pipeline_common_id_of.dfn | 11 ++ .../DFN/pipeline/pipeline_process.dfn | 12 -- .../pipeline/pipeline_process_interface.dfn | 12 +- .../DFN/pipeline/pipeline_project.dfn | 6 +- .../_parent.pipeline_process_interface | 13 -- .../pipeline/_parent.pipeline_process_nop | 11 -- .../_parent_tga.pipeline_process_interface | 15 -- .../common_interface.pipeline_project | 134 ++++++++++++++++++ .../common_interface.pipeline_project | 20 --- ...on_interface_v3.pipeline_process_interface | 18 --- ...erface_v3_login.pipeline_process_interface | 17 --- ...e_v3_outgame_ui.pipeline_process_interface | 17 --- 13 files changed, 164 insertions(+), 132 deletions(-) create mode 100644 code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_common_id_od.dfn create mode 100644 code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_common_id_of.dfn delete mode 100644 code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_process.dfn delete mode 100644 code/ryzom/common/data_leveldesign/leveldesign/pipeline/_parent.pipeline_process_interface delete mode 100644 code/ryzom/common/data_leveldesign/leveldesign/pipeline/_parent.pipeline_process_nop delete mode 100644 code/ryzom/common/data_leveldesign/leveldesign/pipeline/_parent_tga.pipeline_process_interface create mode 100644 code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface.pipeline_project delete mode 100644 code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface/common_interface.pipeline_project delete mode 100644 code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface/common_interface_v3.pipeline_process_interface delete mode 100644 code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface/common_interface_v3_login.pipeline_process_interface delete mode 100644 code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface/common_interface_v3_outgame_ui.pipeline_process_interface diff --git a/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_common_id_od.dfn b/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_common_id_od.dfn new file mode 100644 index 000000000..ae8714abf --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_common_id_od.dfn @@ -0,0 +1,10 @@ + + + + + Test 123 + 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:15 2012 (Kaetemi) Header Comments = Test 123 + diff --git a/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_common_id_of.dfn b/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_common_id_of.dfn new file mode 100644 index 000000000..59c1ac016 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_common_id_of.dfn @@ -0,0 +1,11 @@ + + + + + dfsd + 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/DFN/pipeline/pipeline_process.dfn b/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_process.dfn deleted file mode 100644 index 507b8c168..000000000 --- a/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_process.dfn +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - Sat Feb 18 13:29:48 2012 (Kaetemi) Dfn Structure = -Sat Feb 18 13:31:26 2012 (Kaetemi) Dfn Structure = -Sat Feb 18 13:34:37 2012 (Kaetemi) Dfn Structure = -Sat Feb 18 13:44:39 2012 (Kaetemi) Dfn Structure = -Sat Feb 18 15:29:12 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 029dff128..1767abbce 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,10 +1,8 @@ - - - - - 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 = + + + + + diff --git a/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_project.dfn b/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_project.dfn index 784cc8f47..c7cd1f84c 100644 --- a/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_project.dfn +++ b/code/ryzom/common/data_leveldesign/leveldesign/DFN/pipeline/pipeline_project.dfn @@ -3,9 +3,11 @@ - + + 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 = +Sat Feb 18 15:28:54 2012 (Kaetemi) Dfn Structure = +Fri Mar 02 21:21:25 2012 (Kaetemi) Dfn Structure = diff --git a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/_parent.pipeline_process_interface b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/_parent.pipeline_process_interface deleted file mode 100644 index bed09a3ad..000000000 --- a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/_parent.pipeline_process_interface +++ /dev/null @@ -1,13 +0,0 @@ - -
- - - - - - - - - Sat Feb 18 14:29:16 2012 (Kaetemi) .InterfaceTool = &&InterfaceTool -Sat Feb 18 14:29:16 2012 (Kaetemi) .Script = interface.lua - diff --git a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/_parent.pipeline_process_nop b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/_parent.pipeline_process_nop deleted file mode 100644 index b107ee44f..000000000 --- a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/_parent.pipeline_process_nop +++ /dev/null @@ -1,11 +0,0 @@ - -
- - - - - - - - Sat Feb 18 14:28:07 2012 (Kaetemi) .Script = nop.lua - diff --git a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/_parent_tga.pipeline_process_interface b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/_parent_tga.pipeline_process_interface deleted file mode 100644 index e7b33f996..000000000 --- a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/_parent_tga.pipeline_process_interface +++ /dev/null @@ -1,15 +0,0 @@ - -
- - - - - - - - - Sat Feb 18 14:39:16 2012 (Kaetemi) Form Parents = -Sat Feb 18 14:39:30 2012 (Kaetemi) .OutputFile = interfaces_{{Name}}.tga -Sat Feb 18 14:40:18 2012 (Kaetemi) .OutputFile = interfaces_{{ProcessName}}.tga -Sat Feb 18 14:49:56 2012 (Kaetemi) Form Parents = - diff --git a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface.pipeline_project b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface.pipeline_project new file mode 100644 index 000000000..f3efdfbce --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface.pipeline_project @@ -0,0 +1,134 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sat Feb 18 14:35:38 2012 (Kaetemi) .Name = common_interface +Sat Feb 18 14:35:38 2012 (Kaetemi) formName Resized = 1 +Sat Feb 18 14:55:42 2012 (Kaetemi) .Processes[0] = common_interface_v3.pipeline_process_interface +Sat Feb 18 14:55:42 2012 (Kaetemi) .Processes[1] = common_interface_v3_outgame_ui.pipeline_process_interface +Sat Feb 18 14:55:42 2012 (Kaetemi) .Processes[2] = common_interface_v3_login.pipeline_process_interface +Sat Feb 18 14:55:42 2012 (Kaetemi) formName Resized = 3 +Fri Mar 02 20:53:07 2012 (Kaetemi) formName Resized = 3 +Fri Mar 02 20:53:36 2012 (Kaetemi) .Processes[0] = CProcessInterface +Fri Mar 02 20:53:36 2012 (Kaetemi) formName Resized = 1 +Fri Mar 02 20:55:43 2012 (Kaetemi) .Interface[0].InputDirectories[0] = {{DatabaseDirectory}}/interfaces/v3 +Fri Mar 02 20:55:43 2012 (Kaetemi) .Interface[0].InputDirectories[1] = {{DatabaseDirectory}}/interfaces/r2_interface +Fri Mar 02 20:55:43 2012 (Kaetemi) .Interface[0].OutputFile = interfaces_v3.tga +Fri Mar 02 20:55:43 2012 (Kaetemi) formName Resized = 2 +Fri Mar 02 20:59:03 2012 (Kaetemi) .Interface[0].InputDirectories[0] = [[$DatabaseDirectory]]/interfaces/v3 +Fri Mar 02 20:59:03 2012 (Kaetemi) .Interface[0].InputDirectories[1] = [[$DatabaseDirectory]]/interfaces/r2_interface +Fri Mar 02 21:01:38 2012 (Kaetemi) .Processes[0] = CProcessInterface +Fri Mar 02 21:03:30 2012 (Kaetemi) .Interface[0].InputDirectories[0] = [$DatabaseDirectory]/interfaces/v3 +Fri Mar 02 21:03:30 2012 (Kaetemi) .Interface[0].InputDirectories[1] = [$DatabaseDirectory]/interfaces/r2_interface +Fri Mar 02 21:23:00 2012 (Kaetemi) .Interface.AtlasDxtc[0].OutputFile = [$OutputDirectory]/interface_atlasdxtc/texture_interfaces_dxtc.tga +Fri Mar 02 21:23:00 2012 (Kaetemi) formName Resized = 1 +Fri Mar 02 21:23:56 2012 (Kaetemi) .Interface.AtlasDxtc[0].InputDirectories[0] = [$DatabaseDirectory]/interfaces/v3_bricks +Fri Mar 02 21:23:56 2012 (Kaetemi) .Interface.AtlasDxtc[0].InputDirectories[1] = [$DatabaseDirectory]/interfaces/v3_items +Fri Mar 02 21:23:56 2012 (Kaetemi) .Interface.AtlasDxtc[0].OutputFile = [$OutputDirectory]/interface_atlas_dxtc/texture_interfaces_dxtc.tga +Fri Mar 02 21:23:56 2012 (Kaetemi) formName Resized = 3 +Fri Mar 02 21:24:14 2012 (Kaetemi) .Interface.AtlasDxtc[0].InputDirectories[2] = [$DatabaseDirectory]/interfaces/v3_dxtc_misc +Fri Mar 02 21:25:07 2012 (Kaetemi) .Interface.Atlas[0].OutputFile = [$OutputDirectory]/interface_atlas/texture_interfaces_v3.tga +Fri Mar 02 21:25:07 2012 (Kaetemi) formName Resized = 3 +Fri Mar 02 21:25:51 2012 (Kaetemi) .Interface.Atlas[0].InputDirectories[0] = [$DatabaseDirectory]/interfaces/v3 +Fri Mar 02 21:25:51 2012 (Kaetemi) .Interface.Atlas[0].InputDirectories[1] = [$DatabaseDirectory]/interfaces/r2_interface +Fri Mar 02 21:25:51 2012 (Kaetemi) formName Resized = 2 +Fri Mar 02 21:26:23 2012 (Kaetemi) .Interface.Atlas[1].InputDirectories[0] = [$DatabaseDirectory]/interfaces/v3_login +Fri Mar 02 21:26:23 2012 (Kaetemi) .Interface.Atlas[1].OutputFile = [$OutputDirectory]/interface_atlas/texture_interfaces_v3_login.tga +Fri Mar 02 21:26:23 2012 (Kaetemi) formName Resized = 1 +Fri Mar 02 21:27:01 2012 (Kaetemi) .Interface.Atlas[2].InputDirectories[0] = [$DatabaseDirectory]/interfaces/v3_outgame/ui +Fri Mar 02 21:27:01 2012 (Kaetemi) .Interface.Atlas[2].OutputFile = [$OutputDirectory]/interface_atlas/texture_interfaces_v3_outgame_ui.tga +Fri Mar 02 21:27:01 2012 (Kaetemi) formName Resized = 1 +Fri Mar 02 21:27:32 2012 (Kaetemi) formName Resized = 13 +Fri Mar 02 21:27:57 2012 (Kaetemi) .Interface.Fullscreen[0].OutputDirectory = [$DatabaseDirectory]/interfaces/v3_fullscreen +Fri Mar 02 21:30:15 2012 (Kaetemi) .Interface.Fullscreen.InputDirectories[0] = [$DatabaseDirectory]/interfaces/v3_fullscreen +Fri Mar 02 21:30:15 2012 (Kaetemi) .Interface.Fullscreen.InputDirectories[10] = [$DatabaseDirectory]/interfaces/v3_doc/graph/abilities_items +Fri Mar 02 21:30:15 2012 (Kaetemi) .Interface.Fullscreen.InputDirectories[11] = [$DatabaseDirectory]/interfaces/v3_quick_help/graph +Fri Mar 02 21:30:15 2012 (Kaetemi) .Interface.Fullscreen.InputDirectories[12] = [$DatabaseDirectory]/interfaces/r2_decals +Fri Mar 02 21:30:15 2012 (Kaetemi) .Interface.Fullscreen.InputDirectories[1] = [$DatabaseDirectory]/interfaces/v3_outgame/fullscreen +Fri Mar 02 21:30:15 2012 (Kaetemi) .Interface.Fullscreen.InputDirectories[2] = [$DatabaseDirectory]/interfaces/v3_doc/graph/abilities_items +Fri Mar 02 21:30:15 2012 (Kaetemi) .Interface.Fullscreen.InputDirectories[3] = [$DatabaseDirectory]/interfaces/v3_doc/graph/buy_sell +Fri Mar 02 21:30:15 2012 (Kaetemi) .Interface.Fullscreen.InputDirectories[4] = [$DatabaseDirectory]/interfaces/v3_doc/graph/camera_character +Fri Mar 02 21:30:15 2012 (Kaetemi) .Interface.Fullscreen.InputDirectories[5] = [$DatabaseDirectory]/interfaces/v3_doc/graph/create_perso +Fri Mar 02 21:30:15 2012 (Kaetemi) .Interface.Fullscreen.InputDirectories[6] = [$DatabaseDirectory]/interfaces/v3_doc/graph/fight +Fri Mar 02 21:30:15 2012 (Kaetemi) .Interface.Fullscreen.InputDirectories[7] = [$DatabaseDirectory]/interfaces/v3_doc/graph/MatisTown +Fri Mar 02 21:30:15 2012 (Kaetemi) .Interface.Fullscreen.InputDirectories[8] = [$DatabaseDirectory]/interfaces/v3_doc/graph/spell +Fri Mar 02 21:30:15 2012 (Kaetemi) .Interface.Fullscreen.InputDirectories[9] = [$DatabaseDirectory]/interfaces/v3_doc/graph/talk_bot +Fri Mar 02 21:30:15 2012 (Kaetemi) formName Resized = 13 +Fri Mar 02 21:30:40 2012 (Kaetemi) .Interface.Fullscreen.OutputDirectory = [$OutputDirectory]/interface_fullscreen_export +Fri Mar 02 21:30:46 2012 (Kaetemi) .Interface.Fullscreen.OutputDirectory = [$OutputDirectory]/interface_fullscreen +Fri Mar 02 21:31:37 2012 (Kaetemi) .Interface.3D.InputDirectories[0] = [$DatabaseDirectory]/interfaces/v3_outgame/3d +Fri Mar 02 21:31:37 2012 (Kaetemi) .Interface.3D.InputDirectories[1] = [$DatabaseDirectory]/interfaces/v3_doc/htm +Fri Mar 02 21:31:37 2012 (Kaetemi) .Interface.3D.InputDirectories[2] = [$DatabaseDirectory]/interfaces/v3_doc +Fri Mar 02 21:31:37 2012 (Kaetemi) .Interface.3D.InputDirectories[3] = [$DatabaseDirectory]/interfaces/v3_quick_help +Fri Mar 02 21:31:37 2012 (Kaetemi) .Interface.3D.InputDirectories[4] = [$DatabaseDirectory]/interfaces/r2_3d +Fri Mar 02 21:31:37 2012 (Kaetemi) formName Resized = 5 +Fri Mar 02 21:31:53 2012 (Kaetemi) .Interface.3D.OutputDirectory = [$OutputDirectory]/interface_3d + diff --git a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface/common_interface.pipeline_project b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface/common_interface.pipeline_project deleted file mode 100644 index 200440be5..000000000 --- a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface/common_interface.pipeline_project +++ /dev/null @@ -1,20 +0,0 @@ - -
- - - - - - - - - - - - Sat Feb 18 14:35:38 2012 (Kaetemi) .Name = common_interface -Sat Feb 18 14:35:38 2012 (Kaetemi) formName Resized = 1 -Sat Feb 18 14:55:42 2012 (Kaetemi) .Processes[0] = common_interface_v3.pipeline_process_interface -Sat Feb 18 14:55:42 2012 (Kaetemi) .Processes[1] = common_interface_v3_outgame_ui.pipeline_process_interface -Sat Feb 18 14:55:42 2012 (Kaetemi) .Processes[2] = common_interface_v3_login.pipeline_process_interface -Sat Feb 18 14:55:42 2012 (Kaetemi) formName Resized = 3 - diff --git a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface/common_interface_v3.pipeline_process_interface b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface/common_interface_v3.pipeline_process_interface deleted file mode 100644 index 514936f2b..000000000 --- a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface/common_interface_v3.pipeline_process_interface +++ /dev/null @@ -1,18 +0,0 @@ - -
- - - - - - - - - - - - Sat Feb 18 14:52:47 2012 (Kaetemi) Form Parents = -Sat Feb 18 14:53:27 2012 (Kaetemi) .InputDirectories[0] = interfaces/v3 -Sat Feb 18 14:53:27 2012 (Kaetemi) .InputDirectories[1] = interfaces/r2_interface -Sat Feb 18 14:53:27 2012 (Kaetemi) formName Resized = 2 - diff --git a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface/common_interface_v3_login.pipeline_process_interface b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface/common_interface_v3_login.pipeline_process_interface deleted file mode 100644 index a7b6617b1..000000000 --- a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface/common_interface_v3_login.pipeline_process_interface +++ /dev/null @@ -1,17 +0,0 @@ - -
- - - - - - - - - - - Sat Feb 18 14:52:47 2012 (Kaetemi) Form Parents = -Sat Feb 18 14:53:27 2012 (Kaetemi) .InputDirectories[0] = interfaces/v3 -Sat Feb 18 14:53:27 2012 (Kaetemi) .InputDirectories[1] = interfaces/r2_interface -Sat Feb 18 14:53:27 2012 (Kaetemi) formName Resized = 2 - diff --git a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface/common_interface_v3_outgame_ui.pipeline_process_interface b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface/common_interface_v3_outgame_ui.pipeline_process_interface deleted file mode 100644 index a418937ab..000000000 --- a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/common_interface/common_interface_v3_outgame_ui.pipeline_process_interface +++ /dev/null @@ -1,17 +0,0 @@ - -
- - - - - - - - - - - Sat Feb 18 14:52:47 2012 (Kaetemi) Form Parents = -Sat Feb 18 14:53:27 2012 (Kaetemi) .InputDirectories[0] = interfaces/v3 -Sat Feb 18 14:53:27 2012 (Kaetemi) .InputDirectories[1] = interfaces/r2_interface -Sat Feb 18 14:53:27 2012 (Kaetemi) formName Resized = 2 -