From d028101e9216699c399ab043ae79a9b319af4fa3 Mon Sep 17 00:00:00 2001 From: AlexBonazzi Date: Fri, 3 Aug 2018 16:02:12 +0200 Subject: [PATCH] Patch level : 12.0 614 Files correlati : fp, ve Commento : Aggiunto compilatore per ve0300a.src --- build/CampoRules.props | 25 ++++++----- build/CampoRules.rules | 9 ++-- build/CampoRules.targets | 79 +++++++++++++++++----------------- build/CampoRules.xml | 30 ++++++------- build/ini32.bat | 8 +++- build/ini32r.bat | 5 ++- build/profiles.vcxproj.filters | 21 +++++---- build/tp0.vcxproj | 2 +- build/ve0.vcxproj | 1 + build/ve0.vcxproj.filters | 3 ++ build/ve_maskrighe.vcxproj | 2 + 11 files changed, 101 insertions(+), 84 deletions(-) diff --git a/build/CampoRules.props b/build/CampoRules.props index b5f4cddff..69c496a4a 100644 --- a/build/CampoRules.props +++ b/build/CampoRules.props @@ -269,27 +269,21 @@ - ini32 %(FullPath) $(TargetDir)%(Filename).ini + call ini32 %(FullPath) $(TargetDir)%(Filename).ini $(TargetDir)%(Filename).ini Compiling %(Filename) to $(TargetDir) - - - Midl - CustomBuild - - - _SelectedFiles;$(SrcNEWCompilerDependsOn) + + _SelectedFiles;$(SrcSimpleCompilerDependsOn) - - ini32r %(FullPath) $(TargetDir)%(Filename).ini + + call ini32r %(FullPath) $(TargetDir)%(Filename).ini $(TargetDir)%(Filename).ini Compiling %(Filename) to $(TargetDir) - + @@ -307,4 +301,9 @@ Copia di %(Filename) in $(TargetDir)sql\$(ProjectName)\ + + + + + \ No newline at end of file diff --git a/build/CampoRules.rules b/build/CampoRules.rules index 4ef4e585b..b228a3987 100644 --- a/build/CampoRules.rules +++ b/build/CampoRules.rules @@ -185,7 +185,7 @@ - _SrcCompiler - + + - _SrcNEWCompiler + Include="SrcSimpleCompiler"> + _SrcSimpleCompiler @@ -183,9 +184,8 @@ AssemblyName="Microsoft.Build.Tasks.v4.0"> $(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml - $(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml @@ -196,6 +196,7 @@ AssemblyName="Microsoft.Build.Tasks.v4.0"> $(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml + - + Name="_SrcSimpleCompiler" + BeforeTargets="$(SrcSimpleCompilerBeforeTargets)" + AfterTargets="$(SrcSimpleCompilerAfterTargets)" + Condition="'@(SrcSimpleCompiler)' != ''" + DependsOnTargets="$(SrcSimpleCompilerDependsOn);ComputeSrcSimpleCompilerOutput" + Outputs="%(SrcSimpleCompiler.Outputs)" + Inputs="%(SrcSimpleCompiler.Identity);%(SrcDebugCompiler.AdditionalDependencies);$(MSBuildProjectFile)"> - - - @(SrcNEWCompiler, '|') - + + @(SrcSimpleCompiler, '|') + + Text="%(SrcSimpleCompiler.ExecutionDescription)" /> - + Lines="^%(SrcSimpleCompiler_tlog.Source);@(SrcSimpleCompiler_tlog->'%(Fullpath)')" /> + $(ComputeLinkInputsTargets); - ComputeSrcNEWCompilerOutput; + ComputeSrcSimpleCompilerOutput; $(ComputeLibInputsTargets); - ComputeSrcNEWCompilerOutput; + ComputeSrcSimpleCompilerOutput; + Name="ComputeSrcSimpleCompilerOutput" + Condition="'@(SrcSimpleCompiler)' != ''"> - + + Directories="@(SrcSimpleCompilerDirsToMake->'%(RootDir)%(Directory)')" /> + \ No newline at end of file diff --git a/build/CampoRules.xml b/build/CampoRules.xml index b40b9380d..6c31a9583 100644 --- a/build/CampoRules.xml +++ b/build/CampoRules.xml @@ -2108,16 +2108,15 @@ Name="SrcCompiler" DisplayName="Profile Debug Compiler" ItemType="SrcCompiler" /> - + ItemType="SrcSimpleCompiler" /> @@ -2152,7 +2151,7 @@ Visible="False" IncludeInCommandLine="False" /> @@ -2165,7 +2164,7 @@ + Value="^SrcSimpleCompilerBeforeTargets|^Compute" /> @@ -2187,7 +2186,7 @@ + Value="^SrcSimpleCompilerAfterTargets|^Compute" /> + Name="SrcSimpleCompiler" + DisplayName="Profile Compiler Ini32r" /> + ContentType="SrcSimpleCompiler" /> + Name="SrcSimpleCompiler" + DisplayName="Profile Compiler Ini32r" + ItemType="SrcSimpleCompiler" /> + \ No newline at end of file diff --git a/build/ini32.bat b/build/ini32.bat index 5f78d1b17..6bbdf570e 100644 --- a/build/ini32.bat +++ b/build/ini32.bat @@ -4,7 +4,11 @@ echo Generating %1 ini file set oldinc=%include set include=..\src\include;..\src\xvaga;..\src\ve;%~p1 -srcini %1 %2 +call srcini32 %1 %2 + cd %~p2 echo Generating %2 msk file -ve0 -3 %2 -f /uADMIN \ No newline at end of file +ve0 -3 %2 -f /uADMIN + +set include=%oldinc +set oldinc= \ No newline at end of file diff --git a/build/ini32r.bat b/build/ini32r.bat index efbc17bb3..7388e55d2 100644 --- a/build/ini32r.bat +++ b/build/ini32r.bat @@ -4,4 +4,7 @@ echo Generating %1 ini file set oldinc=%include set include=..\src\include;..\src\xvaga;..\src\ve;%~p1 -srcini %1 %2 \ No newline at end of file +call srcini32 %1 %2 + +set include=%oldinc +set oldinc= diff --git a/build/profiles.vcxproj.filters b/build/profiles.vcxproj.filters index e56974874..ee1f40b34 100644 --- a/build/profiles.vcxproj.filters +++ b/build/profiles.vcxproj.filters @@ -8,6 +8,9 @@ {37b2ae10-489f-4bdb-b43e-2ade94ddca5d} + + {4d816024-06a3-4d7c-963b-7dd4af001f48} + @@ -35,18 +38,10 @@ Sources - - - Dat - - Sources - - Dat - Sources @@ -56,4 +51,14 @@ Sources + + + Dat + + + + + Src + + \ No newline at end of file diff --git a/build/tp0.vcxproj b/build/tp0.vcxproj index 7cf2d85a3..ab04f74c3 100644 --- a/build/tp0.vcxproj +++ b/build/tp0.vcxproj @@ -41,7 +41,7 @@ <_ProjectFileVersion>10.0.30319.1 - ..\exed\ + ..\exe\ $(Configuration)\$(ProjectName)\ true ..\exe\ diff --git a/build/ve0.vcxproj b/build/ve0.vcxproj index 822aeaa07..09c1bdae5 100644 --- a/build/ve0.vcxproj +++ b/build/ve0.vcxproj @@ -202,6 +202,7 @@ + diff --git a/build/ve0.vcxproj.filters b/build/ve0.vcxproj.filters index 04b5ea032..85ddc8e8e 100644 --- a/build/ve0.vcxproj.filters +++ b/build/ve0.vcxproj.filters @@ -90,6 +90,9 @@ Headers + + Headers + diff --git a/build/ve_maskrighe.vcxproj b/build/ve_maskrighe.vcxproj index d52b922f0..b9b30bfbd 100644 --- a/build/ve_maskrighe.vcxproj +++ b/build/ve_maskrighe.vcxproj @@ -141,6 +141,8 @@ Document + + Document