fix: point GPL corresponding-source URLs at the PCBJam org
Every repo moved from emergence-engineering/ to PCBJam/, but the published source pointers still named the old org. GitHub's transfer redirect resolves them (all six checked, 301 -> 200), so nothing is broken today — but it stops working the moment anyone creates a repo at an old path, and a GPLv3 corresponding-source pointer is a poor thing to leave depending on a redirect. CI never passes --repo, so the hardcoded default is what actually ships: the editor's version badge on editor.pcbjam.com has been linking users to the old org for their source. Covers the source pointers (licenses.md, terms.md 12.4, REPO_URL and its doc comment, the three build-script --repo defaults, the site footer's build-commit link) and the two "our GitHub" org links. Bumps the pcbjam-shared pointer for the same fix there. Deliberately untouched: emergence-engineering.com, the company domain behind contact@ and the EE credit block — the trailing slash in the substitution keeps it out. And docs/security-audit-glm/, which describes a finding rather than linking anywhere. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
3ba436d1a8
commit
20e5eb941c
9 changed files with 13 additions and 13 deletions
|
|
@ -25,7 +25,7 @@ function parseArgs(argv) {
|
||||||
const a = {
|
const a = {
|
||||||
tag: null,
|
tag: null,
|
||||||
cdn: "https://cdn.pcbjam.com",
|
cdn: "https://cdn.pcbjam.com",
|
||||||
repo: "https://github.com/emergence-engineering/pcbjam",
|
repo: "https://github.com/PCBJam/pcbjam",
|
||||||
libTag: null,
|
libTag: null,
|
||||||
// Marketing site the version badge links to; the in-editor waitlist form
|
// Marketing site the version badge links to; the in-editor waitlist form
|
||||||
// cross-posts to <landing>/api/waitlist unless --waitlist overrides it.
|
// cross-posts to <landing>/api/waitlist unless --waitlist overrides it.
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ function parseArgs(argv) {
|
||||||
tag: null,
|
tag: null,
|
||||||
cdn: "https://cdn.pcbjam.com",
|
cdn: "https://cdn.pcbjam.com",
|
||||||
apiBase: null,
|
apiBase: null,
|
||||||
repo: "https://github.com/emergence-engineering/pcbjam",
|
repo: "https://github.com/PCBJam/pcbjam",
|
||||||
// Yjs endpoint: defaults to the API origin — board rooms are path-routed
|
// Yjs endpoint: defaults to the API origin — board rooms are path-routed
|
||||||
// (`/parties/board-room/*`) to the sync worker on the same hostname, so the
|
// (`/parties/board-room/*`) to the sync worker on the same hostname, so the
|
||||||
// same-site session cookie rides the WS handshake.
|
// same-site session cookie rides the WS handshake.
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,7 @@ function parseArgs(argv) {
|
||||||
modelsLocal: null, // local publish-models --driver local output dir (serve same-origin)
|
modelsLocal: null, // local publish-models --driver local output dir (serve same-origin)
|
||||||
libsLocal: null, // local publish-libs --driver local output dir (serve same-origin)
|
libsLocal: null, // local publish-libs --driver local output dir (serve same-origin)
|
||||||
port: null,
|
port: null,
|
||||||
repo: "https://github.com/emergence-engineering/pcbjam",
|
repo: "https://github.com/PCBJam/pcbjam",
|
||||||
};
|
};
|
||||||
for (let i = 2; i < argv.length; i++) {
|
for (let i = 2; i < argv.length; i++) {
|
||||||
const next = () => argv[++i];
|
const next = () => argv[++i];
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ import EECredit from './EECredit.astro';
|
||||||
|
|
||||||
const year = new Date().getFullYear();
|
const year = new Date().getFullYear();
|
||||||
// TODO(links): add Roadmap (/roadmap) and dedicated How-it-works/Open pages when they ship.
|
// TODO(links): add Roadmap (/roadmap) and dedicated How-it-works/Open pages when they ship.
|
||||||
const GITHUB_URL = 'https://github.com/emergence-engineering';
|
const GITHUB_URL = 'https://github.com/PCBJam';
|
||||||
|
|
||||||
// Build provenance: the pcbjam commit this site was built from — it pins the
|
// Build provenance: the pcbjam commit this site was built from — it pins the
|
||||||
// KiCad + wxWidgets submodule revisions implicitly and is our GPLv3
|
// KiCad + wxWidgets submodule revisions implicitly and is our GPLv3
|
||||||
|
|
@ -25,7 +25,7 @@ function resolveBuildSha(): string {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const BUILD_SHA = resolveBuildSha();
|
const BUILD_SHA = resolveBuildSha();
|
||||||
const BUILD_COMMIT_URL = `https://github.com/emergence-engineering/pcbjam/commit/${BUILD_SHA}`;
|
const BUILD_COMMIT_URL = `https://github.com/PCBJam/pcbjam/commit/${BUILD_SHA}`;
|
||||||
---
|
---
|
||||||
|
|
||||||
<footer class="site-footer">
|
<footer class="site-footer">
|
||||||
|
|
|
||||||
|
|
@ -36,18 +36,18 @@ The combined application is conveyed to you under the **GPLv3**. The wxWidgets c
|
||||||
|
|
||||||
In line with the GNU GPL (and as referenced in §12.4 of our [Terms](/terms)), the complete **corresponding source code** for the GPL-licensed software we deliver to your browser — together with the applicable licence texts and notices — is publicly available in one place:
|
In line with the GNU GPL (and as referenced in §12.4 of our [Terms](/terms)), the complete **corresponding source code** for the GPL-licensed software we deliver to your browser — together with the applicable licence texts and notices — is publicly available in one place:
|
||||||
|
|
||||||
**<https://github.com/emergence-engineering/pcbjam>**
|
**<https://github.com/PCBJam/pcbjam>**
|
||||||
|
|
||||||
The KiCad and wxWidgets forks are included in that repository as **git submodules**, so a recursive clone fetches everything needed to build PCBJam:
|
The KiCad and wxWidgets forks are included in that repository as **git submodules**, so a recursive clone fetches everything needed to build PCBJam:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
git clone --recurse-submodules https://github.com/emergence-engineering/pcbjam.git
|
git clone --recurse-submodules https://github.com/PCBJam/pcbjam.git
|
||||||
```
|
```
|
||||||
|
|
||||||
For reference, the component forks pulled in as submodules are:
|
For reference, the component forks pulled in as submodules are:
|
||||||
|
|
||||||
- **KiCad fork** — <https://github.com/emergence-engineering/kicad-source-mirror> (branch `wasm-port`)
|
- **KiCad fork** — <https://github.com/PCBJam/kicad-source-mirror> (branch `wasm-port`)
|
||||||
- **wxWidgets fork** (incl. the WebAssembly port) — <https://github.com/emergence-engineering/wxWidgets> (branch `wasm-port`)
|
- **wxWidgets fork** (incl. the WebAssembly port) — <https://github.com/PCBJam/wxWidgets> (branch `wasm-port`)
|
||||||
|
|
||||||
The source corresponding to a specific deployed build is identified by the commit revisions — including submodule revisions — recorded in the application's **About / build information**. If you need the exact corresponding source for a build you received and cannot locate it, contact us at **hello@pcbjam.com** and we will provide it.
|
The source corresponding to a specific deployed build is identified by the commit revisions — including submodule revisions — recorded in the application's **About / build information**. If you need the exact corresponding source for a build you received and cannot locate it, contact us at **hello@pcbjam.com** and we will provide it.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -214,7 +214,7 @@ You can cancel renewal of a paid plan at any time from your account settings or
|
||||||
|
|
||||||
12.3 **Open-source components.** PCBJam is built on **KiCad** and other open-source software, which remain licensed to you under **their own open-source licences — including the GNU General Public License, version 3 (GPLv3)** for KiCad, and other licences for other components. **These Terms govern the hosted PCBJam Service and our proprietary materials; they do not modify, replace, or restrict the open-source licences, and nothing in these Terms limits any right you have under those licences with respect to the open-source components themselves.** Where any conflict exists between these Terms and an applicable open-source licence as to the open-source component, the open-source licence governs that component.
|
12.3 **Open-source components.** PCBJam is built on **KiCad** and other open-source software, which remain licensed to you under **their own open-source licences — including the GNU General Public License, version 3 (GPLv3)** for KiCad, and other licences for other components. **These Terms govern the hosted PCBJam Service and our proprietary materials; they do not modify, replace, or restrict the open-source licences, and nothing in these Terms limits any right you have under those licences with respect to the open-source components themselves.** Where any conflict exists between these Terms and an applicable open-source licence as to the open-source component, the open-source licence governs that component.
|
||||||
|
|
||||||
12.4 **Source availability.** To the extent the Service delivers GPL-licensed software (for example, the KiCad WebAssembly build that runs in your browser) to you, you are entitled under the GPL to the **corresponding source code** and the applicable licence texts and notices. These are made available at **https://github.com/emergence-engineering/pcbjam** (and/or linked from within the application). We do not claim ownership of, and do not purport to relicense, the open-source components.
|
12.4 **Source availability.** To the extent the Service delivers GPL-licensed software (for example, the KiCad WebAssembly build that runs in your browser) to you, you are entitled under the GPL to the **corresponding source code** and the applicable licence texts and notices. These are made available at **https://github.com/PCBJam/pcbjam** (and/or linked from within the application). We do not claim ownership of, and do not purport to relicense, the open-source components.
|
||||||
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit 5a83ed091d3d9d2ff15c3b71bbc8740f71cfc0ec
|
Subproject commit 22217c90ec521adbc637d937f2e272b3a4ad59d4
|
||||||
|
|
@ -41,7 +41,7 @@ export const APP_GIT_SHA = import.meta.env.VITE_GIT_SHA || null;
|
||||||
|
|
||||||
/** Public source repository for the GPL editor (no trailing slash). */
|
/** Public source repository for the GPL editor (no trailing slash). */
|
||||||
export const REPO_URL = (
|
export const REPO_URL = (
|
||||||
import.meta.env.VITE_REPO_URL || "https://github.com/emergence-engineering/pcbjam"
|
import.meta.env.VITE_REPO_URL || "https://github.com/PCBJam/pcbjam"
|
||||||
).replace(/\/+$/, "");
|
).replace(/\/+$/, "");
|
||||||
|
|
||||||
/** Marketing / landing page (no trailing slash). The version badge links here so
|
/** Marketing / landing page (no trailing slash). The version badge links here so
|
||||||
|
|
|
||||||
2
web/standalone/src/vite-env.d.ts
vendored
2
web/standalone/src/vite-env.d.ts
vendored
|
|
@ -10,7 +10,7 @@ interface ImportMetaEnv {
|
||||||
readonly VITE_APP_TAG?: string;
|
readonly VITE_APP_TAG?: string;
|
||||||
/** Source commit this build was made from; the badge links to it as the GPLv3 corresponding-source pointer. */
|
/** Source commit this build was made from; the badge links to it as the GPLv3 corresponding-source pointer. */
|
||||||
readonly VITE_GIT_SHA?: string;
|
readonly VITE_GIT_SHA?: string;
|
||||||
/** Public source repo URL for the GPL editor (default github.com/emergence-engineering/pcbjam). */
|
/** Public source repo URL for the GPL editor (default github.com/PCBJam/pcbjam). */
|
||||||
readonly VITE_REPO_URL?: string;
|
readonly VITE_REPO_URL?: string;
|
||||||
/** @deprecated legacy alias for VITE_WASM_ROOT. */
|
/** @deprecated legacy alias for VITE_WASM_ROOT. */
|
||||||
readonly VITE_WASM_ASSET_BASE_URL?: string;
|
readonly VITE_WASM_ASSET_BASE_URL?: string;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue