Skip to content

Commit d6d4461

Browse files
committed
Merged PR 10523737: Remove Razzle + scbuild files
The time has come! Now that we've fully transitioned to building in the Windows undocked pipeline with MSBuild, there's no longer any reason to retain the old Razzle dirs/sources files or scbuild scripts. I left the sources files in `gen` and `test/indirect_call_perf` since we don't have CMake or MSBuild files for those. Since they're used extremely rarely, there's no urgency in supporting them in the new build system.
1 parent 7c1f6b4 commit d6d4461

File tree

28 files changed

+10
-1920
lines changed

28 files changed

+10
-1920
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ include_directories(inc)
115115
include_directories(${CMAKE_BINARY_DIR}/inc)
116116

117117
# Process pkg-config file
118-
configure_file(build/symcrypt.pc.in symcrypt.pc @ONLY)
118+
configure_file(conf/symcrypt.pc.in symcrypt.pc @ONLY)
119119

120120
add_subdirectory(lib)
121121
add_subdirectory(modules)

build/buildInfo.cmake

Lines changed: 0 additions & 17 deletions
This file was deleted.

build/createBuildString.cmd

Lines changed: 0 additions & 69 deletions
This file was deleted.

build/makefile.inc

Lines changed: 0 additions & 6 deletions
This file was deleted.

build/sources

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#include "symcrypt_internal_shared.inc"
2-
3-
#define _SYMCRYPT_JOIN(a, b) #a "." #b
4-
#define _SYMCRYPT_EXPAND_JOIN(a, b) _SYMCRYPT_JOIN(a, b)
5-
#define SYMCRYPT_BUILD_INFO_BRANCH "@SYMCRYPT_BUILD_INFO_BRANCH@"
6-
#define SYMCRYPT_BUILD_INFO_COMMIT "@SYMCRYPT_BUILD_INFO_COMMIT@"
7-
#define SYMCRYPT_BUILD_INFO_VERSION _SYMCRYPT_EXPAND_JOIN(_SYMCRYPT_EXPAND_JOIN(SYMCRYPT_CODE_VERSION_API, SYMCRYPT_CODE_VERSION_MINOR), SYMCRYPT_CODE_VERSION_PATCH)
8-
#define SYMCRYPT_BUILD_INFO_TIMESTAMP "@SYMCRYPT_BUILD_INFO_TIMESTAMP@"
1+
#include "symcrypt_internal_shared.inc"
2+
3+
#define _SYMCRYPT_JOIN(a, b) #a "." #b
4+
#define _SYMCRYPT_EXPAND_JOIN(a, b) _SYMCRYPT_JOIN(a, b)
5+
#define SYMCRYPT_BUILD_INFO_BRANCH "@SYMCRYPT_BUILD_INFO_BRANCH@"
6+
#define SYMCRYPT_BUILD_INFO_COMMIT "@SYMCRYPT_BUILD_INFO_COMMIT@"
7+
#define SYMCRYPT_BUILD_INFO_VERSION _SYMCRYPT_EXPAND_JOIN(_SYMCRYPT_EXPAND_JOIN(SYMCRYPT_CODE_VERSION_API, SYMCRYPT_CODE_VERSION_MINOR), SYMCRYPT_CODE_VERSION_PATCH)
8+
#define SYMCRYPT_BUILD_INFO_TIMESTAMP "@SYMCRYPT_BUILD_INFO_TIMESTAMP@"

dirs

Lines changed: 0 additions & 9 deletions
This file was deleted.

lib/sources

Lines changed: 0 additions & 238 deletions
This file was deleted.

publics/getpublics.cmd

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)