Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions scripts/build/codegen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,6 @@ function emitGeneratedClasses({ n, cfg, sources, o, dirStamp }: Ctx): void {
resolve(cfg.codegenDir, "ZigGeneratedClasses+DOMClientIsoSubspaces.h"),
resolve(cfg.codegenDir, "ZigGeneratedClasses+DOMIsoSubspaces.h"),
resolve(cfg.codegenDir, "ZigGeneratedClasses+lazyStructureImpl.h"),
resolve(cfg.codegenDir, "ZigGeneratedClasses.lut.txt"),
// Rust sibling: include!()'d by src/runtime/generated_classes.rs. Must be
// a declared output so the cargo edge (which lists this in rustInputs)
// re-invokes when generate-classes.ts changes — cargo doesn't track
Expand All @@ -612,7 +611,6 @@ function emitGeneratedClasses({ n, cfg, sources, o, dirStamp }: Ctx): void {
o.rustInputs.push(...outputs);
o.cppSources.push(outputs[1]!); // .cpp
o.cppHeaders.push(outputs[0]!, outputs[2]!, outputs[3]!, outputs[4]!, outputs[5]!); // .h files
// .lut.txt is consumed by emitObjectLuts below
}

function emitHostExports({ n, cfg, sources, o, dirStamp }: Ctx): void {
Expand Down Expand Up @@ -944,8 +942,7 @@ function emitObjectLuts({ n, cfg, o, dirStamp }: Ctx): void {
const script = resolve(cfg.cwd, "src", "codegen", "create-hash-table.ts");
const perlScript = resolve(cfg.cwd, "src", "codegen", "create_hash_table");

// (source, output) pairs. ZigGeneratedClasses.lut.txt is special: it's
// GENERATED by emitGeneratedClasses, so it's in codegenDir not src/.
// (source, output) pairs.
const pairs: [src: string, out: string][] = [
[resolve(cfg.cwd, "src/jsc/bindings/BunObject.cpp"), resolve(cfg.codegenDir, "BunObject.lut.h")],
[resolve(cfg.cwd, "src/jsc/bindings/ZigGlobalObject.lut.txt"), resolve(cfg.codegenDir, "ZigGlobalObject.lut.h")],
Expand All @@ -969,7 +966,6 @@ function emitObjectLuts({ n, cfg, o, dirStamp }: Ctx): void {
resolve(cfg.codegenDir, "ProcessBindingHTTPParser.lut.h"),
],
[resolve(cfg.cwd, "src/jsc/modules/NodeModuleModule.cpp"), resolve(cfg.codegenDir, "NodeModuleModule.lut.h")],
[resolve(cfg.codegenDir, "ZigGeneratedClasses.lut.txt"), resolve(cfg.codegenDir, "ZigGeneratedClasses.lut.h")],
[resolve(cfg.cwd, "src/jsc/bindings/webcore/JSEvent.cpp"), resolve(cfg.codegenDir, "JSEvent.lut.h")],
];

Expand Down
9 changes: 0 additions & 9 deletions scripts/build/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -311,14 +311,8 @@ export interface Config {
* undefined on native Windows builds (VS dev shell supplies the SDK).
*/
winsysroot: string | undefined;
/** Android NDK root. undefined when abi != "android". */
androidNdk: string | undefined;
/** Android API level (the N in `__ANDROID_API__=N`). undefined when abi != "android". */
androidApiLevel: number | undefined;
/** NDK compiler-rt/libunwind dir: `<ndk>/toolchains/llvm/prebuilt/<host>/lib/clang/<ver>/lib/linux`. */
androidNdkRuntimeDir: string | undefined;
/** FreeBSD release version targeted (e.g. "14.3"). undefined when os != "freebsd". */
freebsdVersion: string | undefined;

// ─── Versioning ───
/** Bun's own version (from package.json). */
Expand Down Expand Up @@ -1280,10 +1274,7 @@ export function resolveConfig(partial: PartialConfig, toolchain: Toolchain): Con
crossTarget,
sysroot,
winsysroot,
androidNdk,
androidApiLevel,
androidNdkRuntimeDir,
freebsdVersion,
version,
revision,
nodejsVersion,
Expand Down
2 changes: 0 additions & 2 deletions scripts/build/depVersionsHeader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ function computeVersions(cfg: Config): [string, string][] {
}

// ─── Non-dep versions ───
versions.push(["BUN_VERSION", cfg.version]);
versions.push(["NODEJS_COMPAT_VERSION", cfg.nodejsVersion]);
// UWS/USOCKETS are vendored at packages/bun-usockets — the bun commit
// IS their version.
versions.push(["UWS", cfg.revision]);
Expand Down
1 change: 0 additions & 1 deletion scripts/build/deps/libjpeg-turbo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ const cmakedefine = (truthy: boolean): [string, string] => ["#cmakedefine", trut

export const libjpegTurbo: Dependency = {
name: "libjpeg-turbo",
versionMacro: "LIBJPEG_TURBO",

source: () => ({
kind: "github-archive",
Expand Down
1 change: 0 additions & 1 deletion scripts/build/deps/libspng.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ const LIBSPNG_COMMIT = "fb768002d4288590083a476af628e51c3f1d47cd"; // v0.7.4

export const libspng: Dependency = {
name: "libspng",
versionMacro: "LIBSPNG",

source: () => ({
kind: "github-archive",
Expand Down
1 change: 0 additions & 1 deletion scripts/build/deps/libwebp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ function simd(path: string, x64: boolean) {

export const libwebp: Dependency = {
name: "libwebp",
versionMacro: "LIBWEBP",

source: () => ({
kind: "github-archive",
Expand Down
1 change: 0 additions & 1 deletion scripts/build/deps/lsqpack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ const LSQPACK_COMMIT = "1e9c5b8e59f8161c54f168a570c8bfdc59ded0c3";

export const lsqpack: Dependency = {
name: "lsqpack",
versionMacro: "LSQPACK",

source: () => ({
kind: "github-archive",
Expand Down
1 change: 0 additions & 1 deletion scripts/build/deps/lsquic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ const liblsquic: string[] = [

export const lsquic: Dependency = {
name: "lsquic",
versionMacro: "LSQUIC",

source: () => ({
kind: "github-archive",
Expand Down
1 change: 0 additions & 1 deletion scripts/build/flags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,6 @@ export const defines: Flag[] = [
flag: [
"_HAS_EXCEPTIONS=0",
"LIBUS_USE_OPENSSL=1",
"LIBUS_USE_BORINGSSL=1",
"STATICALLY_LINKED_WITH_JavaScriptCore=1",
"BUILDING_WITH_CMAKE=1",
"JSC_OBJC_API_ENABLED=0",
Expand Down
1 change: 0 additions & 1 deletion scripts/build/unified.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ const noUnify: readonly string[] = [
"src/jsc/bindings/webcrypto/CryptoAlgorithmAES_KW.cpp",
"src/jsc/bindings/webcrypto/CryptoAlgorithmECDSA.cpp",
"src/jsc/bindings/webcrypto/CryptoAlgorithmHMAC.cpp",
"src/jsc/bindings/webcrypto/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp",
"src/jsc/bindings/webcrypto/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp",
"src/jsc/bindings/webcrypto/CryptoAlgorithmRSA_OAEP.cpp",
"src/jsc/bindings/webcrypto/CryptoAlgorithmRSA_PSS.cpp",
Expand Down
2 changes: 0 additions & 2 deletions scripts/glob-sources.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ const patterns = {
"src/jsc/bindings/webcore/streams/*.cpp",
"src/jsc/bindings/sqlite/*.cpp",
"src/jsc/bindings/webcrypto/*.cpp",
"src/jsc/bindings/webcrypto/*/*.cpp",
"src/jsc/bindings/node/*.cpp",
"src/jsc/bindings/node/crypto/*.cpp",
"src/jsc/bindings/node/http/*.cpp",
Expand All @@ -121,7 +120,6 @@ const patterns = {
paths: [
"packages/bun-usockets/src/*.c",
"packages/bun-usockets/src/eventing/*.c",
"packages/bun-usockets/src/internal/*.c",
"packages/bun-usockets/src/crypto/*.c",
"src/jsc/bindings/uv-posix-polyfills.c",
"src/jsc/bindings/uv-posix-stubs.c",
Expand Down
40 changes: 0 additions & 40 deletions scripts/runner.node.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2913,38 +2913,6 @@ function uploadArtifactsToBuildKite(glob) {
});
}

/**
* @param {string} [glob]
* @param {string} [step]
*/
function listArtifactsFromBuildKite(glob, step) {
const args = [
"artifact",
"search",
"--no-color",
"--allow-empty-results",
"--include-retried-jobs",
"--format",
"%p\n",
glob || "*",
];
if (step) {
args.push("--step", step);
}
const { error, status, signal, stdout, stderr } = spawnSync("buildkite-agent", args, {
stdio: ["ignore", "ignore", "ignore"],
encoding: "utf-8",
timeout: spawnTimeout,
cwd,
});
if (status === 0) {
return stdout?.split("\n").map(line => line.trim()) || [];
}
const cause = error ?? signal ?? `code ${status}`;
console.warn("Failed to list artifacts from BuildKite:", cause, stderr);
return [];
}

/**
* @param {string} name
* @param {string} value
Expand Down Expand Up @@ -2990,14 +2958,6 @@ function stripAnsi(string) {
return string.replace(/\u001b\[\d+m/g, "");
}

/**
* @param {string} string
* @returns {string}
*/
function escapeGitHubAction(string) {
return string.replace(/%/g, "%25").replace(/\r/g, "%0D").replace(/\n/g, "%0A");
}

/**
* @param {string} string
* @returns {string}
Expand Down
Loading
Loading