mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
bdf6126133
* build: determine electron version from tags not files (#36106) * build: determine electron version from tags not files * build: make electron_version dependent on packed-refs and git HEAD * build: do not delete electron/.git * build: do not revert a commit we didn't make * build: gen version file instead of just writing it * build: update cache and ninja targets * build: copy resource.h to generated electron.rc * build: electron_win32_resources should be public deps * build: also copy the icon Co-authored-by: MarshallOfSound <marshallofsound@electronjs.org> * chore: fixup patches * chore: update patches * build: ensure get-version runs in the electron git checkout (#36128) * build: strip v in the getElectronVersion helper * build: use npm@7 for npm view command Co-authored-by: Samuel Attard <sam@electronjs.org> Co-authored-by: MarshallOfSound <marshallofsound@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <sattard@salesforce.com>
19 lines
579 B
Diff
19 lines
579 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Attard <sattard@salesforce.com>
|
|
Date: Fri, 21 Oct 2022 16:29:06 -0700
|
|
Subject: build: allow electron to use exec_script
|
|
|
|
This is similar to the //build usecase so we're OK adding ourselves here
|
|
|
|
diff --git a/.gn b/.gn
|
|
index 7d538f812d72e0937e7a031e1c53651c352149c5..1cad40a9825f3c6df67dbcc12d2f9650aad809b2 100644
|
|
--- a/.gn
|
|
+++ b/.gn
|
|
@@ -169,4 +169,6 @@ exec_script_whitelist =
|
|
|
|
"//tools/grit/grit_rule.gni",
|
|
"//tools/gritsettings/BUILD.gn",
|
|
+
|
|
+ "//electron/BUILD.gn"
|
|
]
|