diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 937015ed66..5b5ffe1b00 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -841,6 +841,36 @@ + + + org.apache.maven.plugins + maven-antrun-plugin + 1.8 + + + validate + + run + + + true + + + + + + + + + Skip platform toolset version detection = ${skip.platformToolsetDetection} + + + + + org.codehaus.mojo exec-maven-plugin @@ -852,6 +882,7 @@ exec + ${skip.platformToolsetDetection} ${basedir}\..\..\dev-support\bin\win-vs-upgrade.cmd ${basedir}\src\main\winutils @@ -866,6 +897,7 @@ exec + ${skip.platformToolsetDetection} msbuild ${basedir}/src/main/winutils/winutils.sln @@ -878,6 +910,27 @@ + + compile-ms-winutils-using-build-tools + compile + + exec + + + ${skip.platformToolsetDetection.negated} + msbuild + + ${basedir}/src/main/winutils/winutils.sln + /nologo + /p:Configuration=Release + /p:OutDir=${project.build.directory}/bin/ + /p:IntermediateOutputPath=${project.build.directory}/winutils/ + /p:WsceConfigDir=${wsce.config.dir} + /p:WsceConfigFile=${wsce.config.file} + /p:PlatformToolset=${use.platformToolsetVersion} + + + convert-ms-native-dll generate-sources @@ -885,6 +938,7 @@ exec + ${skip.platformToolsetDetection} ${basedir}\..\..\dev-support\bin\win-vs-upgrade.cmd ${basedir}\src\main\native @@ -899,6 +953,7 @@ exec + ${skip.platformToolsetDetection} msbuild ${basedir}/src/main/native/native.sln @@ -919,6 +974,35 @@ + + compile-ms-native-dll-using-build-tools + compile + + exec + + + ${skip.platformToolsetDetection.negated} + msbuild + + ${basedir}/src/main/native/native.sln + /nologo + /p:Configuration=Release + /p:OutDir=${project.build.directory}/bin/ + /p:CustomZstdPrefix=${zstd.prefix} + /p:CustomZstdLib=${zstd.lib} + /p:CustomZstdInclude=${zstd.include} + /p:RequireZstd=${require.zstd} + /p:CustomOpensslPrefix=${openssl.prefix} + /p:CustomOpensslLib=${openssl.lib} + /p:CustomOpensslInclude=${openssl.include} + /p:RequireOpenssl=${require.openssl} + /p:RequireIsal=${require.isal} + /p:CustomIsalPrefix=${isal.prefix} + /p:CustomIsalLib=${isal.lib} + /p:PlatformToolset=${use.platformToolsetVersion} + + +