Skip to content

Commit 12a78b2

Browse files
committed
Updated and adjusted build process
1 parent c7abe8b commit 12a78b2

File tree

1,084 files changed

+39377
-15028
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,084 files changed

+39377
-15028
lines changed

.gitignore

+117
Original file line numberDiff line numberDiff line change
@@ -365,3 +365,120 @@ FodyWeavers.xsd
365365
/build/net5.0
366366
/build/net6.0-windows
367367
/build/netcoreapp3.1
368+
369+
Thumbs.db
370+
ehthumbs.db
371+
Desktop.ini
372+
$RECYCLE.BIN/
373+
*.lnk
374+
.DS_Store
375+
.AppleDouble
376+
.LSOverride
377+
._*
378+
.DocumentRevisions-V100
379+
.fseventsd
380+
.Spotlight-V100
381+
.TemporaryItems
382+
.Trashes
383+
.VolumeIcon.icns
384+
.AppleDB
385+
.AppleDesktop
386+
Network Trash Folder
387+
Temporary Items
388+
.apdisk
389+
*.a
390+
*.sdf
391+
*.suo
392+
*.pdb
393+
*.o
394+
*.orig
395+
obj
396+
bin
397+
Debug
398+
TestResults
399+
x64
400+
tmp
401+
ipch
402+
*.opensdf
403+
*.opendb
404+
*.psess
405+
*.vsp
406+
*.ctl
407+
.git
408+
sandbox
409+
exp-bin
410+
Release
411+
pub
412+
*.cd
413+
*.aux
414+
*.out
415+
*.dvi
416+
*.log
417+
*.toc
418+
*.swp
419+
*.user
420+
*.Cache
421+
.project
422+
.settings
423+
*.cch
424+
*.LOG
425+
*.LOG2
426+
packages
427+
*.sig
428+
*.cache
429+
*.aps
430+
*.settings
431+
GraphEngine.Lib
432+
*.vspx
433+
*.diagsession
434+
*.vspx
435+
*.vsps
436+
build/*
437+
*.tapp
438+
CMakeFiles
439+
.vscode/
440+
cmake_install.cmake
441+
CMakeCache.txt
442+
*.VC.db
443+
pingme.txt
444+
CleanVSProject.exe
445+
*.so
446+
slnx.sqlite
447+
.vs/
448+
/src/Modules/LIKQ/FanoutSearch/GeneratedCode
449+
/src/Modules/Spark/spark-trinity/build/sbt-launch-0.13.13.jar
450+
/src/Modules/Spark/spark-trinity/project/project/target/config-classes
451+
/src/Modules/Spark/spark-trinity/project/target
452+
/src/Modules/Spark/spark-trinity/target
453+
/src/Modules/Spark/spark-trinity/.idea
454+
xUnitReports
455+
tools/NuGet.exe
456+
tools/cmake*
457+
tools/dotnet/*
458+
tools/dotnet-dev-win-x64.latest.exe
459+
tests/xunit_reports
460+
tests/xunit_coreclr_reports
461+
tests/nunit*reports
462+
tests/new_test.exe
463+
*.pyd
464+
*.pyc
465+
**/.idea
466+
**/.spyproject
467+
/src/Modules/Trinity.FFI/Trinity.FFI.Python/GraphEngine/**/*.exe
468+
/src/Modules/Trinity.FFI/Trinity.FFI.Python/GraphEngine/**/*.dll
469+
/src/Modules/Trinity.FFI/Trinity.FFI.Python/GraphEngine.egg-info
470+
/src/Modules/Trinity.FFI/Trinity.FFI.Python/build
471+
/src/Modules/Trinity.FFI/Trinity.FFI.Python/__pycache__
472+
/src/Modules/Trinity.FFI/Trinity.FFI.Python/tests/tsl/GeneratedCode
473+
/src/Modules/Trinity.FFI/Trinity.FFI.Python/tests/tsl/bin
474+
/src/Modules/Trinity.FFI/Trinity.FFI.Python/tests/tsl/obj
475+
/src/Modules/Trinity.FFI/Trinity.FFI.Python/dist
476+
/src/Modules/Trinity.FFI/Trinity.FFI.Python/**/storage/**
477+
**/.ropeproject
478+
ServiceFabricBackup
479+
tests/benchmarks/**/*Artifacts*
480+
**/.vim
481+
CMakeSettings.json
482+
Directory.Build.props
483+
.ionide
484+
launchSettings.json

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0)
1+
CMAKE_MINIMUM_REQUIRED(VERSION 3.5.0)
22

33
LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
44
FIND_PACKAGE(Dotnet 2.0 REQUIRED)
@@ -16,7 +16,7 @@ SET(CMAKE_CXX_EXTENSIONS OFF)
1616

1717
SET(XPLAT_LIB_DIR ${CMAKE_CURRENT_LIST_DIR}/lib)
1818
SET_OUTPUT_DIRECTORY(${CMAKE_BINARY_DIR})
19-
DOTNET_REGISTER_LOCAL_REPOSITORY("Graph Engine OSS Local" "${CMAKE_BINARY_DIR}")
19+
DOTNET_REGISTER_LOCAL_REPOSITORY("IKW Graph Engine OSS Local" "${CMAKE_BINARY_DIR}")
2020

2121
IF(WIN32)
2222
ADD_COMPILE_OPTIONS(/volatile:iso /EHsc /fp:except- /Zi /Gy /W3 /nologo /MP)

Directory.Build.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<PropertyGroup>
3-
<OutputPath>O:/IKW-GraphEngine/build/</OutputPath>
4-
<XPLAT_LIB_DIR>O:/IKW-GraphEngine/build/</XPLAT_LIB_DIR>
5-
<DOTNET_PACKAGE_VERSION>2.0.11412</DOTNET_PACKAGE_VERSION>
3+
<OutputPath>O:/IKW-GraphEngine/out/build/x64-Debug/</OutputPath>
4+
<XPLAT_LIB_DIR>O:/IKW-GraphEngine/out/build/x64-Debug/</XPLAT_LIB_DIR>
5+
<DOTNET_PACKAGE_VERSION>3.0.11458</DOTNET_PACKAGE_VERSION>
66

77
</PropertyGroup>
88
</Project>
File renamed without changes.

build/ALL_BUILD.vcxproj

+17-26
Large diffs are not rendered by default.

build/ALL_BUILD.vcxproj.filters

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<CustomBuild Include="O:\IKW-GraphEngine\CMakeLists.txt" />
55
</ItemGroup>

build/BUILD_GraphEngine.ServiceFabric.vcxproj

-409
This file was deleted.

build/BUILD_GraphEngine.ServiceFabric.vcxproj.filters

-20
This file was deleted.

build/CMakeCache.txt

+15-31
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This is the CMakeCache file.
22
# For build in directory: o:/IKW-GraphEngine/build
3-
# It was generated by CMake: K:/CMake/bin/cmake.exe
3+
# It was generated by CMake: O:/IKW-GraphEngine/tools/cmake-3.23.1-windows-x86_64/bin/cmake.exe
44
# You can edit this file to change values found and used by cmake.
55
# If you do not want to change any of the values, simply exit the editor.
66
# If you do want to change a value, simply edit, save, and exit the editor.
@@ -15,7 +15,7 @@
1515
########################
1616

1717
//Path to a program.
18-
CMAKE_AR:FILEPATH=K:/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/lib.exe
18+
CMAKE_AR:FILEPATH=W:/Microsoft Visual Studio/2022/Preview/VC/Tools/MSVC/14.32.31326/bin/HostX64/x64/lib.exe
1919

2020
//Semicolon separated list of supported configuration types, only
2121
// supports Debug, Release, MinSizeRel, and RelWithDebInfo, anything
@@ -77,7 +77,7 @@ CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL
7777
CMAKE_INSTALL_PREFIX:PATH=C:/Program Files/GraphEngine
7878

7979
//Path to a program.
80-
CMAKE_LINKER:FILEPATH=K:/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/link.exe
80+
CMAKE_LINKER:FILEPATH=W:/Microsoft Visual Studio/2022/Preview/VC/Tools/MSVC/14.32.31326/bin/HostX64/x64/link.exe
8181

8282
//Flags used by the linker during the creation of modules during
8383
// all build types.
@@ -112,16 +112,16 @@ CMAKE_PROJECT_HOMEPAGE_URL:STATIC=
112112
CMAKE_PROJECT_NAME:STATIC=GraphEngine
113113

114114
//Value Computed by CMake
115-
CMAKE_PROJECT_VERSION:STATIC=2.0.11412
115+
CMAKE_PROJECT_VERSION:STATIC=3.0.11455
116116

117117
//Value Computed by CMake
118-
CMAKE_PROJECT_VERSION_MAJOR:STATIC=2
118+
CMAKE_PROJECT_VERSION_MAJOR:STATIC=3
119119

120120
//Value Computed by CMake
121121
CMAKE_PROJECT_VERSION_MINOR:STATIC=0
122122

123123
//Value Computed by CMake
124-
CMAKE_PROJECT_VERSION_PATCH:STATIC=11412
124+
CMAKE_PROJECT_VERSION_PATCH:STATIC=11455
125125

126126
//Value Computed by CMake
127127
CMAKE_PROJECT_VERSION_TWEAK:STATIC=
@@ -236,9 +236,6 @@ GraphEngine_IS_TOP_LEVEL:STATIC=ON
236236
//Value Computed by CMake
237237
GraphEngine_SOURCE_DIR:STATIC=O:/IKW-GraphEngine
238238

239-
//Path to a program.
240-
MSBUILD_EXE:FILEPATH=L:/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin/MSBuild.exe
241-
242239
//Path to a program.
243240
NUGET_EXE:FILEPATH=NUGET_EXE-NOTFOUND
244241

@@ -263,9 +260,6 @@ Trinity.TSL_SOURCE_DIR:STATIC=O:/IKW-GraphEngine/src/Trinity.TSL
263260
//Dependencies for the target
264261
Trinity_LIB_DEPENDS:STATIC=general;Psapi.lib;general;ws2_32.lib;general;Dbghelp.lib;general;Synchronization.lib;
265262

266-
//Path to a program.
267-
VSWHERE_EXE:FILEPATH=VSWHERE_EXE-NOTFOUND
268-
269263

270264
########################
271265
# INTERNAL cache entries
@@ -278,15 +272,15 @@ CMAKE_CACHEFILE_DIR:INTERNAL=o:/IKW-GraphEngine/build
278272
//Major version of cmake used to create the current loaded cache
279273
CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
280274
//Minor version of cmake used to create the current loaded cache
281-
CMAKE_CACHE_MINOR_VERSION:INTERNAL=22
275+
CMAKE_CACHE_MINOR_VERSION:INTERNAL=23
282276
//Patch version of cmake used to create the current loaded cache
283-
CMAKE_CACHE_PATCH_VERSION:INTERNAL=0
277+
CMAKE_CACHE_PATCH_VERSION:INTERNAL=1
284278
//Path to CMake executable.
285-
CMAKE_COMMAND:INTERNAL=K:/CMake/bin/cmake.exe
279+
CMAKE_COMMAND:INTERNAL=O:/IKW-GraphEngine/tools/cmake-3.23.1-windows-x86_64/bin/cmake.exe
286280
//Path to cpack program executable.
287-
CMAKE_CPACK_COMMAND:INTERNAL=K:/CMake/bin/cpack.exe
281+
CMAKE_CPACK_COMMAND:INTERNAL=O:/IKW-GraphEngine/tools/cmake-3.23.1-windows-x86_64/bin/cpack.exe
288282
//Path to ctest program executable.
289-
CMAKE_CTEST_COMMAND:INTERNAL=K:/CMake/bin/ctest.exe
283+
CMAKE_CTEST_COMMAND:INTERNAL=O:/IKW-GraphEngine/tools/cmake-3.23.1-windows-x86_64/bin/ctest.exe
290284
//ADVANCED property for variable: CMAKE_CXX_FLAGS
291285
CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1
292286
//ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG
@@ -311,8 +305,6 @@ CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1
311305
CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
312306
//ADVANCED property for variable: CMAKE_C_STANDARD_LIBRARIES
313307
CMAKE_C_STANDARD_LIBRARIES-ADVANCED:INTERNAL=1
314-
//Whether to issue deprecation errors for macros and functions.
315-
CMAKE_ERROR_DEPRECATED:INTERNAL=FALSE
316308
//Executable file format
317309
CMAKE_EXECUTABLE_FORMAT:INTERNAL=Unknown
318310
//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS
@@ -328,9 +320,9 @@ CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
328320
//Name of external makefile project generator.
329321
CMAKE_EXTRA_GENERATOR:INTERNAL=
330322
//Name of generator.
331-
CMAKE_GENERATOR:INTERNAL=Visual Studio 16 2019
323+
CMAKE_GENERATOR:INTERNAL=Visual Studio 17 2022
332324
//Generator instance identifier.
333-
CMAKE_GENERATOR_INSTANCE:INTERNAL=K:/Microsoft Visual Studio/2019/Enterprise
325+
CMAKE_GENERATOR_INSTANCE:INTERNAL=W:/Microsoft Visual Studio/2022/Preview
334326
//Name of generator platform.
335327
CMAKE_GENERATOR_PLATFORM:INTERNAL=x64
336328
//Name of generator toolset.
@@ -353,7 +345,7 @@ CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
353345
//ADVANCED property for variable: CMAKE_MT
354346
CMAKE_MT-ADVANCED:INTERNAL=1
355347
//number of local generators
356-
CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=12
348+
CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=11
357349
//Platform information initialized
358350
CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1
359351
//noop for ranlib
@@ -372,7 +364,7 @@ CMAKE_RC_FLAGS_RELEASE-ADVANCED:INTERNAL=1
372364
//ADVANCED property for variable: CMAKE_RC_FLAGS_RELWITHDEBINFO
373365
CMAKE_RC_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
374366
//Path to CMake installation.
375-
CMAKE_ROOT:INTERNAL=K:/CMake/share/cmake-3.22
367+
CMAKE_ROOT:INTERNAL=O:/IKW-GraphEngine/tools/cmake-3.23.1-windows-x86_64/share/cmake-3.23
376368
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
377369
CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
378370
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG
@@ -397,14 +389,6 @@ CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
397389
CMAKE_STATIC_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
398390
//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO
399391
CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
400-
//Suppress errors that are meant for the author of the CMakeLists.txt
401-
// files.
402-
CMAKE_SUPPRESS_DEVELOPER_ERRORS:INTERNAL=TRUE
403-
//Suppress Warnings that are meant for the author of the CMakeLists.txt
404-
// files.
405-
CMAKE_SUPPRESS_DEVELOPER_WARNINGS:INTERNAL=FALSE
406392
//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
407393
CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
408-
//Whether to issue warnings for deprecated functionality.
409-
CMAKE_WARN_DEPRECATED:INTERNAL=TRUE
410394

build/CMakeFiles/3.22.0-rc2/CMakeCCompiler.cmake

-72
This file was deleted.

0 commit comments

Comments
 (0)