Skip to content

Commit db64765

Browse files
mrvuxmrvux
committed
Update changelog, fix deploy targets for assets, and make sure standard deploy does not include tests
1 parent eb2be96 commit db64765

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ ChangeLog
2222
* [Nodes] New node : AlphaToCoverage (DX11.RenderState) : allows to enable alpha to coverage for multisampling in an existing render state (without modifying other options)
2323
* [Nodes] New node : AlphaClip (DX11.Effect) : simple effect with texture that discards pixel if alpha is below a certain value
2424
* [Nodes] New node : DepthClip (DX11.RenderState) : allows to enable or disable depth clipping (near/far plane) in an existing render state (without modifying other options)
25+
* [Nodes] New node : Wireframe (DX11.RenderState) : allows to enable or disable wireframe in an existing render state (without modifying other options)
26+
* [Nodes] New node : CullMode (DX11.RenderState) : allows to enable or disable cull mode in an existing render state (without modifying other options)
2527
* [Core] : Texture FX Technique pin is now spreadable (means you can now use different effects for different slices, see girlpower\misc\texturefx_technique_spread folder for an example)
2628
* [Core] : Texture FX cache is now more efficient, no more penalty when switching techniques.
2729
* [Core] : Texture FX technique can now use a "wantmips" bool annotation, to build mips before the first pass (only if needed)

‎ci.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<Delete Files="Deploy\**\*.pdb" />
4848
<Exec WorkingDirectory="Deploy\Release\x86\packs\DX11\nodes\plugins\vlc\" Command="..\..\..\..\..\..\..\..\Tools\7zA.exe x ..\..\..\..\..\..\..\..\Dependencies\x86\vlc-plugins.zip" LogStandardErrorAsError="true" />
4949
<Copy SourceFiles="@(GirlPowerNodes)" DestinationFolder="Deploy\Release\x86\packs\dx11\nodes\%(GirlPowerNodes.RecursiveDir)" />
50-
<Copy SourceFiles="@(GirlPowerAssets)" DestinationFolder="Deploy\Release\x86\packs\dx11\nodes\%(GirlPowerAssets.RecursiveDir)" />
50+
<Copy SourceFiles="@(GirlPowerAssets)" DestinationFolder="Deploy\Release\x86\packs\dx11\assets\%(GirlPowerAssets.RecursiveDir)" />
5151
<Copy SourceFiles="@(GirlPower)" DestinationFolder="Deploy\Release\x86\packs\dx11\girlpower\%(GirlPower.RecursiveDir)" />
5252
<Exec WorkingDirectory="Deploy\Release\x86\" Command="..\..\..\Tools\7zA.exe a -tzip ..\..\..\Zip\vvvv-packs-dx11-x86.zip packs" LogStandardErrorAsError="true" />
5353
<Exec WorkingDirectory="Deploy\Release\x86\" Command="..\..\..\Tools\7zA.exe a -tzip ..\..\..\Zip\vvvv-packs-dx11-x86-lite.zip packs -xr!packs\dx11\nodes\plugins\kinect1 -xr!packs\dx11\nodes\plugins\kinect2 -xr!packs\dx11\nodes\plugins\vlc -xr!packs\dx11\nodes\plugins\bullet" LogStandardErrorAsError="true" />
@@ -58,7 +58,7 @@
5858
<Delete Files="Deploy\**\*.pdb" />
5959
<Exec WorkingDirectory="Deploy\Release\x64\packs\DX11\nodes\plugins\vlc\" Command="..\..\..\..\..\..\..\..\Tools\7zA.exe x ..\..\..\..\..\..\..\..\Dependencies\x64\vlc-plugins.zip" LogStandardErrorAsError="true" />
6060
<Copy SourceFiles="@(GirlPowerNodes)" DestinationFolder="Deploy\Release\x64\packs\dx11\nodes\%(GirlPowerNodes.RecursiveDir)" />
61-
<Copy SourceFiles="@(GirlPowerAssets)" DestinationFolder="Deploy\Release\x86\packs\dx11\nodes\%(GirlPowerAssets.RecursiveDir)" />
61+
<Copy SourceFiles="@(GirlPowerAssets)" DestinationFolder="Deploy\Release\x86\packs\dx11\assets\%(GirlPowerAssets.RecursiveDir)" />
6262
<Copy SourceFiles="@(GirlPower)" DestinationFolder="Deploy\Release\x64\packs\dx11\girlpower\%(GirlPower.RecursiveDir)" />
6363
<Copy SourceFiles="@(NuiDatabase)" DestinationFolder="Deploy\Release\x64\packs\dx11\nodes\plugins\kinect2\NuiDatabase\%(NuiDatabase.RecursiveDir)" />
6464
<Copy SourceFiles="@(vgbtechs)" DestinationFolder="Deploy\Release\x64\packs\dx11\nodes\plugins\kinect2\vgbtechs\%(vgbtechs.RecursiveDir)" />

‎deploy.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?xml version="1.0" encoding="utf-8"?><Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0" DefaultTargets="Build"> <ItemGroup> <DeployFolder Include="Deploy\**\*.*" /> </ItemGroup> <ItemGroup> <GirlPower Include="girlpower\girlpower\**\*.*" /> </ItemGroup> <ItemGroup> <NuiDatabase Include="$(KINECTSDK20_DIR)Redist\Face\x64\NuiDatabase\**\*.*" /> </ItemGroup> <ItemGroup> <vgbtechs Include="$(KINECTSDK20_DIR)Redist\VGB\x64\vgbtechs\**\*.*" /> </ItemGroup> <ItemGroup> <GirlPowerNodes Include="girlpower\nodes\**\*.*" /> </ItemGroup> <ItemGroup> <GirlPowerAssets Include="girlpower\assets\**\*.*" /> </ItemGroup> <Target Name="Clean-Deploy"> <Delete Files="@(DeployFolder)" /> </Target> <Target Name="Build-x86"> <MSBuild Projects="vvvv-dx11.sln" Properties="Configuration=Release;Platform=x86;DebugSymbols=false;DebugType=None" /> </Target> <Target Name="Build-x64"> <MSBuild Projects="vvvv-dx11.sln" Properties="Configuration=Release;Platform=x64;DebugSymbols=false;DebugType=None" /> </Target> <Target Name="Build"> <Delete Files="Deploy\**\*.*" /> <CallTarget Targets="Build-x86" /> <Exec WorkingDirectory="Deploy\Release\x86\packs\DX11\nodes\plugins\vlc\" Command="..\..\..\..\..\..\..\..\Tools\7zA.exe x ..\..\..\..\..\..\..\..\Dependencies\x86\vlc-plugins.zip" LogStandardErrorAsError="true" /> <Copy SourceFiles="@(GirlPowerNodes)" DestinationFolder="Deploy\Release\x86\packs\dx11\nodes\%(GirlPowerNodes.RecursiveDir)" /> <Copy SourceFiles="@(GirlPowerAssets)" DestinationFolder="Deploy\Release\x86\packs\dx11\nodes\%(GirlPowerAssets.RecursiveDir)" /> <Copy SourceFiles="@(GirlPower)" DestinationFolder="Deploy\Release\x86\packs\dx11\girlpower\%(GirlPower.RecursiveDir)" /> <Exec WorkingDirectory="Deploy\Release\x86\" Command="..\..\..\Tools\7zA.exe a -tzip ..\..\..\Zip\vvvv-packs-dx11-x86.zip packs" LogStandardErrorAsError="true" /> <Exec WorkingDirectory="Deploy\Release\x86\packs\dx11\core\" Command="..\..\..\..\..\..\Tools\7zA.exe a -tzip ..\..\..\..\..\..\Zip\vvvv-dx11-core-x86.zip -x!VVVV.DX11.Lib.dll" LogStandardErrorAsError="true" /> <CallTarget Targets="Build-x64" /> <Exec WorkingDirectory="Deploy\Release\x64\packs\DX11\nodes\plugins\vlc\" Command="..\..\..\..\..\..\..\..\Tools\7zA.exe x ..\..\..\..\..\..\..\..\Dependencies\x64\vlc-plugins.zip" LogStandardErrorAsError="true" /> <Copy SourceFiles="@(GirlPowerNodes)" DestinationFolder="Deploy\Release\x64\packs\dx11\nodes\%(GirlPowerNodes.RecursiveDir)" /> <Copy SourceFiles="@(GirlPowerAssets)" DestinationFolder="Deploy\Release\x64\packs\dx11\nodes\%(GirlPowerAssets.RecursiveDir)" /> <Copy SourceFiles="@(GirlPower)" DestinationFolder="Deploy\Release\x64\packs\dx11\girlpower\%(GirlPower.RecursiveDir)" /> <Copy SourceFiles="@(NuiDatabase)" DestinationFolder="Deploy\Release\x64\packs\dx11\nodes\plugins\kinect2\NuiDatabase\%(NuiDatabase.RecursiveDir)" /> <Copy SourceFiles="@(vgbtechs)" DestinationFolder="Deploy\Release\x64\packs\dx11\nodes\plugins\kinect2\vgbtechs\%(vgbtechs.RecursiveDir)" /> <Exec WorkingDirectory="Deploy\Release\x64\" Command="..\..\..\Tools\7zA.exe a -tzip ..\..\..\Zip\vvvv-packs-dx11-x64.zip packs" LogStandardErrorAsError="true" /> <Exec WorkingDirectory="Deploy\Release\x64\packs\dx11\core\" Command="..\..\..\..\..\..\Tools\7zA.exe a -tzip ..\..\..\..\..\..\Zip\vvvv-dx11-core-x64.zip -x!VVVV.DX11.Lib.dll" LogStandardErrorAsError="true" /> </Target></Project>
1+
<?xml version="1.0" encoding="utf-8"?><Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0" DefaultTargets="Build"> <ItemGroup> <DeployFolder Include="Deploy\**\*.*" /> </ItemGroup> <ItemGroup> <GirlPower Include="girlpower\girlpower\**\*.*" /> </ItemGroup> <ItemGroup> <NuiDatabase Include="$(KINECTSDK20_DIR)Redist\Face\x64\NuiDatabase\**\*.*" /> </ItemGroup> <ItemGroup> <vgbtechs Include="$(KINECTSDK20_DIR)Redist\VGB\x64\vgbtechs\**\*.*" /> </ItemGroup> <ItemGroup> <GirlPowerNodes Include="girlpower\nodes\**\*.*" /> </ItemGroup> <ItemGroup> <GirlPowerAssets Include="girlpower\assets\**\*.*" /> </ItemGroup> <Target Name="Clean-Deploy"> <Delete Files="@(DeployFolder)" /> </Target> <Target Name="Build-x86"> <MSBuild Projects="vvvv-dx11.sln" Properties="Configuration=Release;Platform=x86;DebugSymbols=false;DebugType=None" /> </Target> <Target Name="Build-x64"> <MSBuild Projects="vvvv-dx11.sln" Properties="Configuration=Release;Platform=x64;DebugSymbols=false;DebugType=None" /> </Target> <Target Name="Build"> <Delete Files="Deploy\**\*.*" /> <CallTarget Targets="Build-x86" /> <Exec WorkingDirectory="Deploy\Release\x86\packs\DX11\nodes\plugins\vlc\" Command="..\..\..\..\..\..\..\..\Tools\7zA.exe x ..\..\..\..\..\..\..\..\Dependencies\x86\vlc-plugins.zip" LogStandardErrorAsError="true" /> <Copy SourceFiles="@(GirlPowerNodes)" DestinationFolder="Deploy\Release\x86\packs\dx11\nodes\%(GirlPowerNodes.RecursiveDir)" /> <Copy SourceFiles="@(GirlPowerAssets)" DestinationFolder="Deploy\Release\x86\packs\dx11\assets\%(GirlPowerAssets.RecursiveDir)" /> <Copy SourceFiles="@(GirlPower)" DestinationFolder="Deploy\Release\x86\packs\dx11\girlpower\%(GirlPower.RecursiveDir)" /> <Exec WorkingDirectory="Deploy\Release\x86\" Command="..\..\..\Tools\7zA.exe a -tzip ..\..\..\Zip\vvvv-packs-dx11-x86.zip packs -x!packs\dx11\nodes\plugins\tests" LogStandardErrorAsError="true" /> <Exec WorkingDirectory="Deploy\Release\x86\packs\dx11\core\" Command="..\..\..\..\..\..\Tools\7zA.exe a -tzip ..\..\..\..\..\..\Zip\vvvv-dx11-core-x86.zip -x!VVVV.DX11.Lib.dll" LogStandardErrorAsError="true" /> <CallTarget Targets="Build-x64" /> <Exec WorkingDirectory="Deploy\Release\x64\packs\DX11\nodes\plugins\vlc\" Command="..\..\..\..\..\..\..\..\Tools\7zA.exe x ..\..\..\..\..\..\..\..\Dependencies\x64\vlc-plugins.zip" LogStandardErrorAsError="true" /> <Copy SourceFiles="@(GirlPowerNodes)" DestinationFolder="Deploy\Release\x64\packs\dx11\nodes\%(GirlPowerNodes.RecursiveDir)" /> <Copy SourceFiles="@(GirlPowerAssets)" DestinationFolder="Deploy\Release\x64\packs\dx11\assets\%(GirlPowerAssets.RecursiveDir)" /> <Copy SourceFiles="@(GirlPower)" DestinationFolder="Deploy\Release\x64\packs\dx11\girlpower\%(GirlPower.RecursiveDir)" /> <Copy SourceFiles="@(NuiDatabase)" DestinationFolder="Deploy\Release\x64\packs\dx11\nodes\plugins\kinect2\NuiDatabase\%(NuiDatabase.RecursiveDir)" /> <Copy SourceFiles="@(vgbtechs)" DestinationFolder="Deploy\Release\x64\packs\dx11\nodes\plugins\kinect2\vgbtechs\%(vgbtechs.RecursiveDir)" /> <Exec WorkingDirectory="Deploy\Release\x64\" Command="..\..\..\Tools\7zA.exe a -tzip ..\..\..\Zip\vvvv-packs-dx11-x64.zip packs -x!packs\dx11\nodes\plugins\tests" LogStandardErrorAsError="true" /> <Exec WorkingDirectory="Deploy\Release\x64\packs\dx11\core\" Command="..\..\..\..\..\..\Tools\7zA.exe a -tzip ..\..\..\..\..\..\Zip\vvvv-dx11-core-x64.zip -x!VVVV.DX11.Lib.dll" LogStandardErrorAsError="true" /> </Target></Project>

0 commit comments

Comments
 (0)