Преглед изворни кода

git-svn-id: http://10.4.3.168:50001/svn/Furnace@73 dbcde07d-dcf5-c148-8a84-ac3097b7778e

Zhangjian пре 1 месец
родитељ
комит
3256f90584
1 измењених фајлова са 31 додато и 13 уклоњено
  1. 31 13
      Furnace/FurnaceRT/FurnaceRT.csproj

+ 31 - 13
Furnace/FurnaceRT/FurnaceRT.csproj

@@ -69,9 +69,9 @@
     <Reference Include="log4net">
     <Reference Include="log4net">
       <HintPath>..\..\ThirdParty\dlls\log4net.dll</HintPath>
       <HintPath>..\..\ThirdParty\dlls\log4net.dll</HintPath>
     </Reference>
     </Reference>
-    <Reference Include="MECF.Framework.MyFA.Core, Version=1.0.9257.26145, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="MECF.Framework.FA.Core, Version=1.1.9006.31967, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>dependence\MECF.Framework.MyFA.Core.dll</HintPath>
+      <HintPath>..\..\ThirdParty\dlls\ClusterFACore\MECF.Framework.FA.Core.dll</HintPath>
     </Reference>
     </Reference>
     <Reference Include="Microsoft.DwayneNeed">
     <Reference Include="Microsoft.DwayneNeed">
       <HintPath>..\..\ThirdParty\dlls\Microsoft.DwayneNeed.dll</HintPath>
       <HintPath>..\..\ThirdParty\dlls\Microsoft.DwayneNeed.dll</HintPath>
@@ -112,7 +112,6 @@
     </Compile>
     </Compile>
     <Compile Include="Devices\DeviceStatus.cs" />
     <Compile Include="Devices\DeviceStatus.cs" />
     <Compile Include="Devices\IoBufferMotor.cs" />
     <Compile Include="Devices\IoBufferMotor.cs" />
-    <Compile Include="Devices\IOE84.cs" />
     <Compile Include="Devices\IoHeaterBand2.cs" />
     <Compile Include="Devices\IoHeaterBand2.cs" />
     <Compile Include="Devices\IoHeaterBand3.cs" />
     <Compile Include="Devices\IoHeaterBand3.cs" />
     <Compile Include="Devices\IoShutter.cs" />
     <Compile Include="Devices\IoShutter.cs" />
@@ -281,11 +280,21 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     </EmbeddedResource>
-    <None Include="Config\Bats\restartUI.bat" />
-    <None Include="Config\Bats\shutDownUI.bat" />
-    <None Include="Config\Bats\startFurnace.bat" />
-    <None Include="Config\Bats\stopFurnace.bat" />
-    <None Include="Config\Bats\创建快捷方式.bat" />
+    <None Include="Config\Bats\restartUI.bat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Config\Bats\shutDownUI.bat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Config\Bats\startFurnace.bat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Config\Bats\stopFurnace.bat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Config\Bats\创建快捷方式.bat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Config\ELK\System.sccfg" />
     <None Include="Config\ELK\System.sccfg" />
     <None Include="Config\NTP\System.sccfg" />
     <None Include="Config\NTP\System.sccfg" />
     <None Include="Config\SiBCN\System.sccfg" />
     <None Include="Config\SiBCN\System.sccfg" />
@@ -571,10 +580,6 @@
       <Project>{A25B907A-0BF8-49B5-9B42-50EC3FC50A34}</Project>
       <Project>{A25B907A-0BF8-49B5-9B42-50EC3FC50A34}</Project>
       <Name>RTEquipmentLibrary</Name>
       <Name>RTEquipmentLibrary</Name>
     </ProjectReference>
     </ProjectReference>
-    <ProjectReference Include="..\..\FrameworkLocal\UIClient\UIClient.csproj">
-      <Project>{1CE52879-0B94-4250-BE8A-5149E9396C54}</Project>
-      <Name>UIClient</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\FrameworkLocal\UICore\UICore.csproj">
     <ProjectReference Include="..\..\FrameworkLocal\UICore\UICore.csproj">
       <Project>{1333f7c8-3db2-4783-8a37-3840f1be0cb0}</Project>
       <Project>{1333f7c8-3db2-4783-8a37-3840f1be0cb0}</Project>
       <Name>UICore</Name>
       <Name>UICore</Name>
@@ -591,6 +596,15 @@ md "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\"
 echo 复制文件到安装目录,"$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\" 
 echo 复制文件到安装目录,"$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\" 
 xcopy /e "$(TargetDir)*.*" "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\" /q
 xcopy /e "$(TargetDir)*.*" "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\" /q
 
 
+
+
+
+if exist "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceBat" rd "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceBat"  /s /q
+md "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceBat\" 
+
+echo 复制文件到安装目录,"$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\Config\Bats" 
+xcopy /e "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\Config\Bats\*.*" "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceBat\" /q
+
 REM 配置文件Copy
 REM 配置文件Copy
 del "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\*.pdb"
 del "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\*.pdb"
 
 
@@ -598,6 +612,10 @@ if exist "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\Objects" del "$(Projec
 
 
 if exist "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\Logs" rd "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\Logs"  /s /q
 if exist "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\Logs" rd "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\Logs"  /s /q
 if exist "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\Recipes" rd "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\Recipes"  /s /q
 if exist "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\Recipes" rd "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\Recipes"  /s /q
-if exist "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\Parameters\Parameter" rd "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\Parameters\Parameter"  /s /q</PostBuildEvent>
+if exist "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\Parameters\Parameter" rd "$(ProjectDir)..\FurnaceSetup\Packages\FurnaceRT\Parameters\Parameter"  /s /q
+
+
+
+</PostBuildEvent>
   </PropertyGroup>
   </PropertyGroup>
 </Project>
 </Project>