Merge branch 'master' of http://plmserver.cn:3000/jd/itk into zxk
# Conflicts: # HEZON_ITK/HEZON_ITK.vcxproj # HEZON_ITK/HEZON_ITK.vcxproj.filters # HEZON_ITK/bs_sap.cpp # HEZON_ITK/epm_handler_common.h # HEZON_ITK/epm_register_handler.cxx # HEZON_ITK/jd_check_wlms_len.cpp # HEZON_ITK/x64/Release/.NETFramework,Version=v4.0.AssemblyAttributes.asm # HEZON_ITK/x64/Release/HEZON_ITK.log # HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.command.1.tlog # HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.read.1.tlog # HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.write.1.tlog # HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.command.1.tlog # HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.read.1.tlog # HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.write.1.tlog # HEZON_ITK/x64/Release/HEZON_ITK.tlog/metagen.read.1.tlog # HEZON_ITK/x64/Release/HEZON_ITK.tlog/metagen.write.1.tlog # HEZON_ITK/x64/Release/vc140.pdb # x64/Release/HEZON_ITK.pdb # x64/Release/bs.exp 已解决main
zouxk
5 years ago
commit
bce2b87039
@ -0,0 +1,125 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<Filter Include="源文件">
|
||||
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="头文件">
|
||||
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
||||
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="资源文件">
|
||||
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
||||
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="common">
|
||||
<UniqueIdentifier>{d25e0aa0-8791-4277-b392-abc3943f925c}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="epm-handler">
|
||||
<UniqueIdentifier>{f8d4fa90-4363-4e0f-8f44-a2e02a224ad9}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="userservice">
|
||||
<UniqueIdentifier>{5f8496b0-ad7e-4c6c-b832-59575601b9f1}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="bmf">
|
||||
<UniqueIdentifier>{aa5fbb6b-b5ee-4f80-8b16-de99d912a542}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="ReadMe.txt" />
|
||||
<None Include="..\..\..\..\..\..\Program Files\Common Files\System\ado\msado15.dll" />
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="epm_register_handler.cxx">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="bs_signoff.cxx">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="bs_custom_main.cxx">
|
||||
<Filter>common</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="bs_bypass.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="bs_file_transfer.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="bs_sap.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="bs_sign_cad.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="bs_bom_check.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="bs_wl_check.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="bs_bom_save_check.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="util.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="jd_clear_field.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="jd_signoff.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="bs_test_release_check.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="jd_schedule_joint.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="jd_batch_process.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="jd_add_attachments.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="jd_check_99_bomyt.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="jd_send_mail.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="CSendMail.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="jd_get_target.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="jd_check_wlms_len.cpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="epm_register_handler.h">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="epm_handler_common.h">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="util.h">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="jd_clear_field.h">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="HTTPRequest.hpp">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="CSendMail.h">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="LogInfo.h">
|
||||
<Filter>epm-handler</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@ -1,4 +1,8 @@
|
||||
; Listing generated by Microsoft (R) Optimizing Compiler Version 19.00.24215.1
|
||||
|
||||
; Generated by VC++ for Common Language Runtime
|
||||
<<<<<<< HEAD
|
||||
.file "C:\Users\5rKB5bPlusD\AppData\Local\Temp\.NETFramework,Version=v4.0.AssemblyAttributes.cpp"
|
||||
=======
|
||||
.file "C:\Users\89512\AppData\Local\Temp\.NETFramework,Version=v4.0.AssemblyAttributes.cpp"
|
||||
>>>>>>> 9cec5b3be0639e60437e0ba1a3035139d8301c0a
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
#TargetFrameworkVersion=v4.0:PlatformToolSet=v140:EnableManagedIncrementalBuild=true:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1
|
||||
Release|x64|E:\work\vs_workspace\jditk\|
|
||||
Release|x64|C:\Users\89512\Documents\Visual Studio 2015\Projects\itk\|
|
||||
|
||||
Loading…
Reference in new issue