Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 754664c

Browse files
authored
Default generateversionsource to true (#31197)
* Default generatedefaultsource to true * Change option to skip versiongeneration for bootstrap script.
1 parent b221e5e commit 754664c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/Native/build-native.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ usage()
1818
echo "-staticLibLink - Optional argument to statically link any native library."
1919
echo "-portable - Optional argument to build native libraries portable over GLIBC based Linux distros."
2020
echo "-stripSymbols - Optional argument to strip native symbols during the build."
21-
echo "-generateversion - Pass this in to get a version on the build output."
21+
echo "-skipgenerateversion - Pass this in to skip getting a version on the build output."
2222
echo "-cmakeargs - user-settable additional arguments passed to CMake."
2323
exit 1
2424
}
@@ -112,7 +112,7 @@ prepare_native_build()
112112
__versionSourceFile=$__rootRepo/bin/obj/version.c
113113
if [ ! -e "${__versionSourceFile}" ]; then
114114
if [ $__generateversionsource == true ]; then
115-
$__rootRepo/Tools/msbuild.sh "$__rootRepo/build.proj" /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true /v:minimal
115+
$__rootRepo/run.sh build-managed -project:"$__rootRepo/build.proj" -- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true /v:minimal
116116
else
117117
__versionSourceLine="static char sccsid[] __attribute__((used)) = \"@(#)No version information produced\";"
118118
echo $__versionSourceLine > $__versionSourceFile
@@ -157,7 +157,7 @@ __rootbinpath="$__scriptpath/../../bin"
157157
# Set the various build properties here so that CMake and MSBuild can pick them up
158158
__CMakeExtraArgs=""
159159
__MakeExtraArgs=""
160-
__generateversionsource=false
160+
__generateversionsource=true
161161
__BuildArch=x64
162162
__BuildType=Debug
163163
__CMakeArgs=DEBUG
@@ -286,8 +286,8 @@ while :; do
286286
__PortableBuild=1
287287
fi
288288
;;
289-
generateversion|-generateversion)
290-
__generateversionsource=true
289+
skipgenerateversion|-skipgenerateversion)
290+
__generateversionsource=false
291291
;;
292292
--clang*)
293293
# clangx.y or clang-x.y

0 commit comments

Comments
 (0)