Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Added: #1440 Pipeline projects for objects bnp

Browse Source 
--HG--
branch : build_pipeline_v3
hg/feature/build_pipeline_v3
kaetemi 12 years ago
parent a46cbdc332
commit 5e168b210a
10 changed files with 243 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
code/nel/tools/pipeline/service/module_pipeline_master.cpp
Unescape Escape View File

@ -430,6 +430,12 @@ public:
} }
PIPELINE::endedBuildReadyMaster(); PIPELINE::endedBuildReadyMaster();
nlinfo("#####################################");
nlinfo("#####################################");
nlinfo("! DONE !");
nlinfo("#####################################");
nlinfo("#####################################");
} }
} }
} }

8
code/nel/tools/pipeline/service/module_pipeline_slave.cpp
Unescape Escape View File

@ -685,7 +685,13 @@ public:
std::string filePath = unMacroPath(macroPath); std::string filePath = unMacroPath(macroPath);
// m_FileStatusInitializeMutex.enter(); // m_FileStatusInitializeMutex.enter();
nlassert(m_ActiveProcess->m_FileStatusInputCache.find(filePath) == m_ActiveProcess->m_FileStatusInputCache.end()); // for now don't allow depending on own output within process :) //nlassert(m_ActiveProcess->m_FileStatusInputCache.find(filePath) == m_ActiveProcess->m_FileStatusInputCache.end()); // for now don't allow depending on own output within process :)
if (m_ActiveProcess->m_FileStatusInputCache.find(filePath) != m_ActiveProcess->m_FileStatusInputCache.end())
{
nlwarning("*******************************");
nlwarning("Received twice the same file '%s'", filePath.c_str());
nlwarning("*******************************");
}
m_ActiveProcess->m_FileStatusInputCache[filePath] = fileStatus; m_ActiveProcess->m_FileStatusInputCache[filePath] = fileStatus;
// m_FileStatusInitializeMutex.leave(); // m_FileStatusInitializeMutex.leave();
} }

33
code/ryzom/common/data_leveldesign/leveldesign/pipeline/packages/objects.pipeline_package
Unescape Escape View File

@ -0,0 +1,33 @@
<?xml version="1.0"?>
<FORM Revision="$Revision$" State="modified">
<STRUCT>
<ARRAY Name="DependentProjects">
<ATOM Value="common_objects_generique.pipeline_project"/>
<ATOM Value="common_objects_fyros.pipeline_project"/>
<ATOM Value="common_objects_tryker.pipeline_project"/>
<ATOM Value="common_objects_matis.pipeline_project"/>
<ATOM Value="common_objects_zorai.pipeline_project"/>
<ATOM Value="common_objects_caravan.pipeline_project"/>
</ARRAY>
<ARRAY Name="Processes">
<ATOM Value="PackageBNP"/>
</ARRAY>
<STRUCT Name="Package">
<STRUCT Name="BNP">
<ARRAY Name="SrcDirectories">
<ATOM Value="[@common_objects_generique:Texture.DDS[0].DstDirectory]"/>
<ATOM Value="[@common_objects_fyros:Texture.DDS[0].DstDirectory]"/>
<ATOM Value="[@common_objects_tryker:Texture.DDS[0].DstDirectory]"/>
<ATOM Value="[@common_objects_matis:Texture.DDS[0].DstDirectory]"/>
<ATOM Value="[@common_objects_zorai:Texture.DDS[0].DstDirectory]"/>
<ATOM Value="[@common_objects_caravan:Texture.DDS[0].DstDirectory]"/>
</ARRAY>
<ATOM Name="DstFile" Value="[$PackageDirectory]/objects.bnp"/>
</STRUCT>
</STRUCT>
</STRUCT>
<STRUCT/>
<STRUCT/>
<STRUCT/>
<STRUCT/>
<LOG></LOG></FORM>

31
code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_caravan.pipeline_project
Unescape Escape View File

@ -0,0 +1,31 @@
<?xml version="1.0"?>
<FORM Revision="$Revision$" State="modified">
<STRUCT>
<ATOM Name="Description" Value="Common Objects: Caravan"/>
<ARRAY Name="Macros">
<STRUCT>
<ATOM Name="Name" Value="Culture"/>
<ATOM Name="Value" Value="caravan"/>
</STRUCT>
</ARRAY>
<ARRAY Name="Processes">
<ATOM Value="TextureDDS"/>
</ARRAY>
<STRUCT Name="Texture">
<ARRAY Name="DDS">
<STRUCT>
<ARRAY Name="SrcDirectories">
<ATOM Value="[$DatabaseDirectory]/stuff/[&amp;Culture]/agents/_textures/accessories"/>
</ARRAY>
<ATOM Name="DstDirectory" Value="[!OutputDirectory]/texture_dds"/>
<ATOM Name="CreateMipMap" Value="true"/>
</STRUCT>
</ARRAY>
</STRUCT>
</STRUCT>
<STRUCT/>
<STRUCT/>
<STRUCT/>
<STRUCT/>
<LOG></LOG>
</FORM>

31
code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_fyros.pipeline_project
Unescape Escape View File

@ -0,0 +1,31 @@
<?xml version="1.0"?>
<FORM Revision="$Revision$" State="modified">
<STRUCT>
<ATOM Name="Description" Value="Common Objects: Fyros"/>
<ARRAY Name="Macros">
<STRUCT>
<ATOM Name="Name" Value="Culture"/>
<ATOM Name="Value" Value="fyros"/>
</STRUCT>
</ARRAY>
<ARRAY Name="Processes">
<ATOM Value="TextureDDS"/>
</ARRAY>
<STRUCT Name="Texture">
<ARRAY Name="DDS">
<STRUCT>
<ARRAY Name="SrcDirectories">
<ATOM Value="[$DatabaseDirectory]/stuff/[&amp;Culture]/agents/_textures/accessories"/>
</ARRAY>
<ATOM Name="DstDirectory" Value="[!OutputDirectory]/texture_dds"/>
<ATOM Name="CreateMipMap" Value="true"/>
</STRUCT>
</ARRAY>
</STRUCT>
</STRUCT>
<STRUCT/>
<STRUCT/>
<STRUCT/>
<STRUCT/>
<LOG></LOG>
</FORM>

33
code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_generique.pipeline_project
Unescape Escape View File

@ -0,0 +1,33 @@
<?xml version="1.0"?>
<FORM Revision="$Revision$" State="modified">
<STRUCT>
<ATOM Name="Description" Value="Common Objects: Generique"/>
<ARRAY Name="Macros">
<STRUCT>
<ATOM Name="Name" Value="Culture"/>
<ATOM Name="Value" Value="generique"/>
</STRUCT>
</ARRAY>
<ARRAY Name="Processes">
<ATOM Value="TextureDDS"/>
</ARRAY>
<STRUCT Name="Texture">
<ARRAY Name="DDS">
<STRUCT>
<ARRAY Name="SrcDirectories">
<ATOM Value="[$DatabaseDirectory]/stuff/[&amp;Culture]/agents/_textures/accessories"/>
</ARRAY>
<ATOM Name="DstDirectory" Value="[!OutputDirectory]/texture_dds"/>
<ATOM Name="CreateMipMap" Value="true"/>
</STRUCT>
</ARRAY>
</STRUCT>
</STRUCT>
<STRUCT/>
<STRUCT/>
<STRUCT/>
<STRUCT/>
<LOG>Tue Aug 07 15:06:19 2012 (kaetemi) .Macros[0].Name = Civilisation
Tue Aug 07 15:06:19 2012 (kaetemi) .Macros[0].Value = generique
Tue Aug 07 15:06:19 2012 (kaetemi) formName Resized = 1</LOG>
</FORM>

31
code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_matis.pipeline_project
Unescape Escape View File

@ -0,0 +1,31 @@
<?xml version="1.0"?>
<FORM Revision="$Revision$" State="modified">
<STRUCT>
<ATOM Name="Description" Value="Common Objects: Matis"/>
<ARRAY Name="Macros">
<STRUCT>
<ATOM Name="Name" Value="Culture"/>
<ATOM Name="Value" Value="matis"/>
</STRUCT>
</ARRAY>
<ARRAY Name="Processes">
<ATOM Value="TextureDDS"/>
</ARRAY>
<STRUCT Name="Texture">
<ARRAY Name="DDS">
<STRUCT>
<ARRAY Name="SrcDirectories">
<ATOM Value="[$DatabaseDirectory]/stuff/[&amp;Culture]/agents/_textures/accessories"/>
</ARRAY>
<ATOM Name="DstDirectory" Value="[!OutputDirectory]/texture_dds"/>
<ATOM Name="CreateMipMap" Value="true"/>
</STRUCT>
</ARRAY>
</STRUCT>
</STRUCT>
<STRUCT/>
<STRUCT/>
<STRUCT/>
<STRUCT/>
<LOG></LOG>
</FORM>

31
code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_tryker.pipeline_project
Unescape Escape View File

@ -0,0 +1,31 @@
<?xml version="1.0"?>
<FORM Revision="$Revision$" State="modified">
<STRUCT>
<ATOM Name="Description" Value="Common Objects: Tryker"/>
<ARRAY Name="Macros">
<STRUCT>
<ATOM Name="Name" Value="Culture"/>
<ATOM Name="Value" Value="tryker"/>
</STRUCT>
</ARRAY>
<ARRAY Name="Processes">
<ATOM Value="TextureDDS"/>
</ARRAY>
<STRUCT Name="Texture">
<ARRAY Name="DDS">
<STRUCT>
<ARRAY Name="SrcDirectories">
<ATOM Value="[$DatabaseDirectory]/stuff/[&amp;Culture]/agents/_textures/accessories"/>
</ARRAY>
<ATOM Name="DstDirectory" Value="[!OutputDirectory]/texture_dds"/>
<ATOM Name="CreateMipMap" Value="true"/>
</STRUCT>
</ARRAY>
</STRUCT>
</STRUCT>
<STRUCT/>
<STRUCT/>
<STRUCT/>
<STRUCT/>
<LOG></LOG>
</FORM>

31
code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_zorai.pipeline_project
Unescape Escape View File

@ -0,0 +1,31 @@
<?xml version="1.0"?>
<FORM Revision="$Revision$" State="modified">
<STRUCT>
<ATOM Name="Description" Value="Common Objects: Zorai"/>
<ARRAY Name="Macros">
<STRUCT>
<ATOM Name="Name" Value="Culture"/>
<ATOM Name="Value" Value="zorai"/>
</STRUCT>
</ARRAY>
<ARRAY Name="Processes">
<ATOM Value="TextureDDS"/>
</ARRAY>
<STRUCT Name="Texture">
<ARRAY Name="DDS">
<STRUCT>
<ARRAY Name="SrcDirectories">
<ATOM Value="[$DatabaseDirectory]/stuff/[&amp;Culture]/agents/_textures/accessories"/>
</ARRAY>
<ATOM Name="DstDirectory" Value="[!OutputDirectory]/texture_dds"/>
<ATOM Name="CreateMipMap" Value="true"/>
</STRUCT>
</ARRAY>
</STRUCT>
</STRUCT>
<STRUCT/>
<STRUCT/>
<STRUCT/>
<STRUCT/>
<LOG></LOG>
</FORM>

11
code/ryzom/common/data_leveldesign/leveldesign/pipeline/ryzom_core.pipeline_workspace
Unescape Escape View File

@ -3,10 +3,17 @@
<STRUCT> <STRUCT>
<ATOM Name="Description" Value="Ryzom Core"/> <ATOM Name="Description" Value="Ryzom Core"/>
<ARRAY Name="Projects"> <ARRAY Name="Projects">
<ATOM Value="common_interface.pipeline_project"/>
<ATOM Value="interfaces.pipeline_package"/>
<ATOM Value="gamedev.pipeline_package"/> <ATOM Value="gamedev.pipeline_package"/>
<ATOM Value="data_common.pipeline_package"/> <ATOM Value="data_common.pipeline_package"/>
<ATOM Value="common_interface.pipeline_project"/>
<ATOM Value="interfaces.pipeline_package"/>
<ATOM Value="common_objects_generique.pipeline_project"/>
<ATOM Value="common_objects_fyros.pipeline_project"/>
<ATOM Value="common_objects_tryker.pipeline_project"/>
<ATOM Value="common_objects_matis.pipeline_project"/>
<ATOM Value="common_objects_zorai.pipeline_project"/>
<ATOM Value="common_objects_caravan.pipeline_project"/>
<ATOM Value="objects.pipeline_package"/>
</ARRAY> </ARRAY>
<ARRAY Name="Plugins"> <ARRAY Name="Plugins">
<ATOM Value="plugin_nel.pipeline_plugin"/> <ATOM Value="plugin_nel.pipeline_plugin"/>

Write Preview
Loading…
Cancel
Save