summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorJeremy Koritzinsky <jekoritz@microsoft.com>2019-05-10 16:24:42 -0700
committerGitHub <noreply@github.com>2019-05-10 16:24:42 -0700
commite985b20260631c98a09f08cb67e93d690a6ffd0b (patch)
treef78350febda1071e413382c879726f111bd62c36 /build.sh
parent0dd7c86c8573f257cfd3b4b6374b7415fd3a9131 (diff)
downloadcoreclr-e985b20260631c98a09f08cb67e93d690a6ffd0b.tar.gz
coreclr-e985b20260631c98a09f08cb67e93d690a6ffd0b.tar.bz2
coreclr-e985b20260631c98a09f08cb67e93d690a6ffd0b.zip
Move EventProvider native layout to be driven by CMake configure (#24478)
* Generate eventpipe implementation as part of CMake configure. * Generate Etw provider as part of CMake configure. * First pass porting over lttng provider to cmake. * Fix up CMake Lttng provider generation. * Move Lttng provider into CMake tree. * Move dummy event provider to CMake * Move genEventing into the CMake tree. * Remove extraneous logging and unused python locator. * Clean up build.sh * Clean up genEventingTests.py * Add dependencies to enable more incremental builds (providers not fully incremental). * Convert to custom command and targets instead of at configure time. * Get each eventing target to incrementally build. * Fix incremental builds * Add missing dependencies on eventing headers. * PR Feedback. Mark all generated files as generated * Clean up eventprovider test CMakeLists
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh37
1 files changed, 2 insertions, 35 deletions
diff --git a/build.sh b/build.sh
index bf2ed184ed..4c7c0cd16c 100755
--- a/build.sh
+++ b/build.sh
@@ -168,55 +168,22 @@ restore_optdata()
generate_event_logging_sources()
{
__OutputDir=$1
- __ConsumingBuildSystem=$2
-
- __OutputIncDir="$__OutputDir/src/inc"
__OutputEventingDir="$__OutputDir/Eventing"
- __OutputEventProviderDir="$__OutputEventingDir/eventprovider"
-
- echo "Laying out dynamically generated files consumed by $__ConsumingBuildSystem"
- echo "Laying out dynamically generated Event test files, etmdummy stub functions, and external linkages"
__PythonWarningFlags="-Wall"
if [[ $__IgnoreWarnings == 0 ]]; then
__PythonWarningFlags="$__PythonWarningFlags -Werror"
fi
- $PYTHON -B $__PythonWarningFlags "$__ProjectRoot/src/scripts/genEventing.py" --inc $__OutputIncDir --dummy $__OutputIncDir/etmdummy.h --man "$__ProjectRoot/src/vm/ClrEtwAll.man" --testdir "$__OutputEventProviderDir/tests"
- if [[ $? != 0 ]]; then
- exit 1
- fi
-
- echo "Laying out dynamically generated EventPipe Implementation"
- $PYTHON -B $__PythonWarningFlags "$__ProjectRoot/src/scripts/genEventPipe.py" --man "$__ProjectRoot/src/vm/ClrEtwAll.man" --exc "$__ProjectRoot/src/vm/ClrEtwAllMeta.lst" --intermediate "$__OutputEventingDir/eventpipe"
-
echo "Laying out dynamically generated EventSource classes"
$PYTHON -B $__PythonWarningFlags "$__ProjectRoot/src/scripts/genRuntimeEventSources.py" --man "$__ProjectRoot/src/vm/ClrEtwAll.man" --intermediate "$__OutputEventingDir"
-
- # determine the logging system
- case $__BuildOS in
- Linux|FreeBSD)
- echo "Laying out dynamically generated Event Logging Implementation of Lttng"
- $PYTHON -B $__PythonWarningFlags "$__ProjectRoot/src/scripts/genLttngProvider.py" --man "$__ProjectRoot/src/vm/ClrEtwAll.man" --intermediate "$__OutputEventProviderDir"
- if [[ $? != 0 ]]; then
- exit 1
- fi
- ;;
- *)
- echo "Laying out dummy event logging provider"
- $PYTHON -B $__PythonWarningFlags "$__ProjectRoot/src/scripts/genDummyProvider.py" --man "$__ProjectRoot/src/vm/ClrEtwAll.man" --intermediate "$__OutputEventProviderDir"
- if [[ $? != 0 ]]; then
- exit 1
- fi
- ;;
- esac
}
generate_event_logging()
{
# Event Logging Infrastructure
- if [[ $__SkipCoreCLR == 0 || $__SkipMSCorLib == 0 || $__ConfigureOnly == 1 ]]; then
- generate_event_logging_sources "$__IntermediatesDir" "the native build system"
+ if [[ $__SkipMSCorLib == 0 ]]; then
+ generate_event_logging_sources "$__IntermediatesDir"
fi
}