Skip to content

Commit

Permalink
Opt, 删除用户数量几乎为0的ARM版本(同时避免CI缺少ARM环境而构建失败)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mingkuang-Chuyu
mingkuang-Chuyu committed Nov 27, 2024
1 parent 17bf7fb commit 25222ac
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 82 deletions.
16 changes: 8 additions & 8 deletions Build.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@

<Copy SourceFiles="$(UniversalCRTSdkDir)Redist\$(WindowsTargetPlatformVersion)\ucrt\DLLs\x86\ucrtbase.dll" DestinationFiles="$(SolutionDir)Redist\x86\CRT\ucrtbase.dll" />
<Copy SourceFiles="$(UniversalCRTSdkDir)Redist\$(WindowsTargetPlatformVersion)\ucrt\DLLs\x64\ucrtbase.dll" DestinationFiles="$(SolutionDir)Redist\x64\CRT\ucrtbase.dll" />
<Copy SourceFiles="$(UniversalCRTSdkDir)Redist\$(WindowsTargetPlatformVersion)\ucrt\DLLs\arm\ucrtbase.dll" DestinationFiles="$(SolutionDir)Redist\arm\CRT\ucrtbase.dll" Condition="Exists('$(UniversalCRTSdkDir)Redist\$(WindowsTargetPlatformVersion)\ucrt\DLLs\arm\ucrtbase.dll')"/>
<!--<Copy SourceFiles="$(UniversalCRTSdkDir)Redist\$(WindowsTargetPlatformVersion)\ucrt\DLLs\arm\ucrtbase.dll" DestinationFiles="$(SolutionDir)Redist\arm\CRT\ucrtbase.dll" Condition="Exists('$(UniversalCRTSdkDir)Redist\$(WindowsTargetPlatformVersion)\ucrt\DLLs\arm\ucrtbase.dll')"/>-->
<Copy SourceFiles="$(UniversalCRTSdkDir)Redist\$(WindowsTargetPlatformVersion)\ucrt\DLLs\arm64\ucrtbase.dll" DestinationFiles="$(SolutionDir)Redist\arm64\CRT\ucrtbase.dll" Condition="Exists('$(UniversalCRTSdkDir)Redist\$(WindowsTargetPlatformVersion)\ucrt\DLLs\arm64\ucrtbase.dll')"/>

<ItemGroup>
Expand All @@ -128,7 +128,7 @@

<Copy SourceFiles="@(CRTx86)" DestinationFolder="$(SolutionDir)Redist\x86\CRT"/>
<Copy SourceFiles="@(CRTx64)" DestinationFolder="$(SolutionDir)Redist\x64\CRT"/>
<Copy SourceFiles="@(CRTarm)" DestinationFolder="$(SolutionDir)Redist\arm\CRT"/>
<!--<Copy SourceFiles="@(CRTarm)" DestinationFolder="$(SolutionDir)Redist\arm\CRT"/>-->
<Copy SourceFiles="@(CRTarm64)" DestinationFolder="$(SolutionDir)Redist\arm64\CRT"/>

<ItemGroup>
Expand All @@ -140,7 +140,7 @@

<Copy SourceFiles="@(CXXAMPx86)" DestinationFolder="$(SolutionDir)Redist\x86\CXXAMP" />
<Copy SourceFiles="@(CXXAMPx64)" DestinationFolder="$(SolutionDir)Redist\x64\CXXAMP" />
<Copy SourceFiles="@(CXXAMParm)" DestinationFolder="$(SolutionDir)Redist\arm\CXXAMP" />
<!--<Copy SourceFiles="@(CXXAMParm)" DestinationFolder="$(SolutionDir)Redist\arm\CXXAMP" />-->
<Copy SourceFiles="@(CXXAMParm64)" DestinationFolder="$(SolutionDir)Redist\arm64\CXXAMP" />


Expand All @@ -153,7 +153,7 @@

<Copy SourceFiles="@(OPENMPx86)" DestinationFolder="$(SolutionDir)Redist\x86\OPENMP" />
<Copy SourceFiles="@(OPENMPx64)" DestinationFolder="$(SolutionDir)Redist\x64\OPENMP" />
<Copy SourceFiles="@(OPENMParm)" DestinationFolder="$(SolutionDir)Redist\arm\OPENMP" />
<!--<Copy SourceFiles="@(OPENMParm)" DestinationFolder="$(SolutionDir)Redist\arm\OPENMP" />-->
<Copy SourceFiles="@(OPENMParm64)" DestinationFolder="$(SolutionDir)Redist\arm64\OPENMP" />


Expand All @@ -166,7 +166,7 @@

<Copy SourceFiles="@(MFCx86)" DestinationFolder="$(SolutionDir)Redist\x86\MFC" />
<Copy SourceFiles="@(MFCx64)" DestinationFolder="$(SolutionDir)Redist\x64\MFC" />
<Copy SourceFiles="@(MFCarm)" DestinationFolder="$(SolutionDir)Redist\arm\MFC" />
<!--<Copy SourceFiles="@(MFCarm)" DestinationFolder="$(SolutionDir)Redist\arm\MFC" />-->
<Copy SourceFiles="@(MFCarm64)" DestinationFolder="$(SolutionDir)Redist\arm64\MFC" />

<ItemGroup>
Expand All @@ -178,7 +178,7 @@

<Copy SourceFiles="@(MFCLOCx86)" DestinationFolder="$(SolutionDir)Redist\x86\MFCLOC" />
<Copy SourceFiles="@(MFCLOCx64)" DestinationFolder="$(SolutionDir)Redist\x64\MFCLOC" />
<Copy SourceFiles="@(MFCLOCarm)" DestinationFolder="$(SolutionDir)Redist\arm\MFCLOC" />
<!--<Copy SourceFiles="@(MFCLOCarm)" DestinationFolder="$(SolutionDir)Redist\arm\MFCLOC" />-->
<Copy SourceFiles="@(MFCLOCarm64)" DestinationFolder="$(SolutionDir)Redist\arm64\MFCLOC" />


Expand All @@ -194,9 +194,9 @@
</Target>

<Target Name="_GetProjectAllConfiguration" Returns="@(AllProjectReferenceConfigurations)">
<!--故意过滤Debug配置-->
<!--故意过滤Debug配置 与 ARM配置，因为ARM的人实在是太少了。-->
<CreateItem
Condition="'%(ProjectConfiguration.Configuration)' != 'Debug'"
Condition="'%(ProjectConfiguration.Configuration)' != 'Debug' and '%(ProjectConfiguration.Platform)' != 'ARM'"
Include="$(MSBuildProjectFullPath)"
AdditionalMetadata="Configuration=%(ProjectConfiguration.Configuration);Platform=%(ProjectConfiguration.Platform);WindowsTargetPlatformMinVersion=%(ProjectConfiguration.WindowsTargetPlatformMinVersion);AdditionalProperties=Configuration=%(ProjectConfiguration.Configuration)%3BPlatform=%(ProjectConfiguration.Platform)%3BWindowsTargetPlatformMinVersion=%(ProjectConfiguration.WindowsTargetPlatformMinVersion)">
<Output TaskParameter="Include" ItemName="AllProjectReferenceConfigurations"/>
Expand Down
128 changes: 64 additions & 64 deletions UnitTest/UnitTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,14 +330,14 @@ namespace UnitTest
);


TestLib(
VCToolsInstallDir LR"(lib\arm\vcruntime.lib)",
L"vcruntime",
L"arm",
{ L"Dynamic", L"Static" },
{ L"6.2.9200.0" },
Info
);
//TestLib(
// VCToolsInstallDir LR"(lib\arm\vcruntime.lib)",
// L"vcruntime",
// L"arm",
// { L"Dynamic", L"Static" },
// { L"6.2.9200.0" },
// Info
// );
}

TEST_METHOD(vcruntime_msvcrt_Debug模式所有符号可以被链接)
Expand Down Expand Up @@ -368,14 +368,14 @@ namespace UnitTest
);


TestLib(
VCToolsInstallDir LR"(lib\arm\vcruntimed.lib)",
L"vcruntime",
L"arm",
{ L"DDynamic", L"DStatic" },
{ L"6.2.9200.0" },
Info
);
//TestLib(
// VCToolsInstallDir LR"(lib\arm\vcruntimed.lib)",
// L"vcruntime",
// L"arm",
// { L"DDynamic", L"DStatic" },
// { L"6.2.9200.0" },
// Info
// );
}

TEST_METHOD(vcruntime_ucrt模式所有符号可以被链接)
Expand Down Expand Up @@ -403,14 +403,14 @@ namespace UnitTest
Info
);

TestLib(
VCToolsInstallDir LR"(lib\arm\vcruntime.lib)",
L"vcruntime",
L"arm",
{ L"Dynamic", L"Static" },
{ L"10.0.10240.0", L"10.0.19041.0" },
Info
);
//TestLib(
// VCToolsInstallDir LR"(lib\arm\vcruntime.lib)",
// L"vcruntime",
// L"arm",
// { L"Dynamic", L"Static" },
// { L"10.0.10240.0", L"10.0.19041.0" },
// Info
// );

TestLib(
VCToolsInstallDir LR"(lib\arm64\vcruntime.lib)",
Expand Down Expand Up @@ -448,14 +448,14 @@ namespace UnitTest
Info
);

TestLib(
VCToolsInstallDir LR"(lib\arm\vcruntimed.lib)",
L"vcruntime",
L"arm",
{ L"DDynamic", L"DStatic" },
{ L"10.0.10240.0", L"10.0.19041.0" },
Info
);
//TestLib(
// VCToolsInstallDir LR"(lib\arm\vcruntimed.lib)",
// L"vcruntime",
// L"arm",
// { L"DDynamic", L"DStatic" },
// { L"10.0.10240.0", L"10.0.19041.0" },
// Info
// );

TestLib(
VCToolsInstallDir LR"(lib\arm64\vcruntimed.lib)",
Expand Down Expand Up @@ -495,14 +495,14 @@ namespace UnitTest
);


TestLib(
CurrentUniversalCRTSdkDir LR"(ucrt\arm\ucrt.lib)",
L"ucrt",
L"arm",
{ L"Dynamic", L"Static" },
{ L"6.2.9200.0" },
Info
);
//TestLib(
// CurrentUniversalCRTSdkDir LR"(ucrt\arm\ucrt.lib)",
// L"ucrt",
// L"arm",
// { L"Dynamic", L"Static" },
// { L"6.2.9200.0" },
// Info
// );
}

TEST_METHOD(ucrt_msvcrt_Debug模式所有符号可以被链接)
Expand Down Expand Up @@ -532,14 +532,14 @@ namespace UnitTest
);


TestLib(
CurrentUniversalCRTSdkDir LR"(ucrt\arm\ucrtd.lib)",
L"ucrt",
L"arm",
{ L"DDynamic", L"DStatic" },
{ L"6.2.9200.0" },
Info
);
//TestLib(
// CurrentUniversalCRTSdkDir LR"(ucrt\arm\ucrtd.lib)",
// L"ucrt",
// L"arm",
// { L"DDynamic", L"DStatic" },
// { L"6.2.9200.0" },
// Info
// );
}

TEST_METHOD(ucrt_ucrt模式所有符号可以被链接)
Expand Down Expand Up @@ -567,14 +567,14 @@ namespace UnitTest
Info
);

TestLib(
CurrentUniversalCRTSdkDir LR"(ucrt\arm\ucrt.lib)",
L"ucrt",
L"arm",
{ L"Dynamic", L"Static" },
{ L"10.0.10240.0", L"10.0.19041.0" },
Info
);
//TestLib(
// CurrentUniversalCRTSdkDir LR"(ucrt\arm\ucrt.lib)",
// L"ucrt",
// L"arm",
// { L"Dynamic", L"Static" },
// { L"10.0.10240.0", L"10.0.19041.0" },
// Info
// );

TestLib(
CurrentUniversalCRTSdkDir LR"(ucrt\arm64\ucrt.lib)",
Expand Down Expand Up @@ -613,14 +613,14 @@ namespace UnitTest
Info
);

TestLib(
CurrentUniversalCRTSdkDir LR"(ucrt\arm\ucrtd.lib)",
L"ucrt",
L"arm",
{ L"DDynamic", L"DStatic" },
{ L"10.0.10240.0", L"10.0.19041.0" },
Info
);
//TestLib(
// CurrentUniversalCRTSdkDir LR"(ucrt\arm\ucrtd.lib)",
// L"ucrt",
// L"arm",
// { L"DDynamic", L"DStatic" },
// { L"10.0.10240.0", L"10.0.19041.0" },
// Info
// );

TestLib(
CurrentUniversalCRTSdkDir LR"(ucrt\arm64\ucrtd.lib)",
Expand Down
20 changes: 10 additions & 10 deletions UnitTest/detect_mismatch_UnitTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ namespace UnitTest
BuildProperty
);

RunTest(
pTestCode,
cbTestCode,
DetectName,
L"arm",
{ L"Dynamic", L"Static", L"DDynamic", L"DStatic" },
{ L"6.2.9200.0", L"10.0.10240.0", L"10.0.19041.0" },
BuildProperty
);
//RunTest(
// pTestCode,
// cbTestCode,
// DetectName,
// L"arm",
// { L"Dynamic", L"Static", L"DDynamic", L"DStatic" },
// { L"6.2.9200.0", L"10.0.10240.0", L"10.0.19041.0" },
// BuildProperty
//);

RunTest(
pTestCode,
Expand Down Expand Up @@ -103,4 +103,4 @@ namespace UnitTest
}
}
};
}
}

0 comments on commit 25222ac

Please sign in to comment.