From 5a8ca661b130b8eb5c6b82183c0ad459eeaf80a6 Mon Sep 17 00:00:00 2001 From: Liviu Ionescu Date: Thu, 16 Jan 2025 22:38:27 +0200 Subject: [PATCH] website: re-generate commons --- .../_arm-toolchain-check-upstream-release.mdx | 44 ---------- ..._arm-toolchain-update-version-specific.mdx | 82 ------------------- website/package-lock.json | 45 +++++++++- website/package.json | 11 ++- 4 files changed, 51 insertions(+), 131 deletions(-) delete mode 100644 website/docs/maintainer/_common/_arm-toolchain-check-upstream-release.mdx delete mode 100644 website/docs/maintainer/_common/_arm-toolchain-update-version-specific.mdx diff --git a/website/docs/maintainer/_common/_arm-toolchain-check-upstream-release.mdx b/website/docs/maintainer/_common/_arm-toolchain-check-upstream-release.mdx deleted file mode 100644 index ab8ee67..0000000 --- a/website/docs/maintainer/_common/_arm-toolchain-check-upstream-release.mdx +++ /dev/null @@ -1,44 +0,0 @@ -{/* DO NOT EDIT! */} -{/* Automatically generated from xbb-helper/templates/docusaurus/common. */} - -import customField from '@site/src/libs/customField'; - -import versionMajor from '@site/src/libs/versionMajor'; -import versionMinor from '@site/src/libs/versionMinor'; - -{/* ------------------------------------------------------------------------ */} - -### Check the latest upstream release - -The latest releases must have been announced in -[Arm GNU Toolchain Downloads](https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads). -Compare the latest Arm release with the latest xPack -[release](https://github.com/xpack-dev-tools/bash-xpack/releases/). -If necessary, update the triplet, otherwise increase the fourth & fifth numbers, -as below. - -### Update to the latest Arm release - -- download the new _Source code_ archive (like -arm-gnu-toolchain-src-snapshot-{versionMajor()}.{versionMinor()}.rel{customField('armSubRelease')}.tar.xz) from -[Arm GNU Toolchain Downloads](https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads/) -- unpack the archive -- the GCC version is in `gcc/gcc/BASE-VER` -- the binutils version is in `binutils-gdb/bfd/version.m4` -- the GDB version is in `binutils-gdb--gdb/gdb/version.in` -- the newlib version is in `newlib-cygwin/newlib/configure`, search for `VERSION=` -- download the latest **macOS (x86_64) hosted cross toolchains** archive (like -arm-gnu-toolchain-{versionMajor()}.{versionMinor()}.rel{customField('armSubRelease')}-darwin-x86_64-.tar.xz) -- unpack the archive -- create a folder build-assets/extras/{versionMajor()}.{versionMinor()}.rel{customField('armSubRelease')} -- copy the file with the configurations -({versionMajor()}.{versionMinor()}.rel{customField('armSubRelease')}-darwin-x86_64--manifest.txt) to the new folder in extras -- download the manifest.txt with the individual source URLs -(arm-gnu-toolchain-src-snapshot-{versionMajor()}.{versionMinor()}.rel{customField('armSubRelease')}-manifest.txt) -- copy to the new folder in extras - -:::info - -Starting with 14.2.Rel1 there is a link to a [README](https://gitlab.arm.com/tooling/gnu-devtools-for-arm/-/blob/main/README.md) explaining the new build scripts. - -::: diff --git a/website/docs/maintainer/_common/_arm-toolchain-update-version-specific.mdx b/website/docs/maintainer/_common/_arm-toolchain-update-version-specific.mdx deleted file mode 100644 index 3c3190a..0000000 --- a/website/docs/maintainer/_common/_arm-toolchain-update-version-specific.mdx +++ /dev/null @@ -1,82 +0,0 @@ -{/* DO NOT EDIT! */} -{/* Automatically generated from xbb-helper/templates/docusaurus/common. */} - -import customField from '@site/src/libs/customField'; - -import versionMajor from '@site/src/libs/versionMajor'; -import versionMinor from '@site/src/libs/versionMinor'; - -{/* ------------------------------------------------------------------------ */} - -### Update the version specific code - -- open the `build-assets/scripts/versioning.sh` file -- add a new `if` with the new version before the existing code - -### Update local binutils-gdb fork - -With a Git client: - -- checkout the branch mentioned in the release notes - (like users/ARM/binutils-{customField('binutilsVersionMajor')}_{customField('binutilsVersionMinor')}-branch) -- push it to origin with the same name -- enable a filter on the current branch -- identify the commit ID from release notes or manifest.txt (search back in time) -- add a tag like binutils-{customField('binutilsVersionMajor')}.{customField('binutilsVersionMinor')}--{versionMajor()}.{versionMinor()}.rel{customField('armSubRelease')} -- push the tag to origin -- check the tag at https://github.com/xpack-dev-tools/binutils-gdb/tags/ - -Similarly for GDB: - -- checkout the branch mentioned in the release notes - (like gdb-{customField('gdbVersionMajor')}-branch) -- push it to origin with the same name -- enable a filter on the current branch -- identify the commit ID from release notes or manifest.txt (search back in time) -- add a tag like gdb-{customField('gdbVersionMajor')}--{versionMajor()}.{versionMinor()}.rel{customField('armSubRelease')} -- push the tag to origin -- check the tag at https://github.com/xpack-dev-tools/binutils-gdb/tags/ - -### Update the local gcc fork (optional, normally the archive is used) - -With a Git client: - -- checkout the branch mentioned in the release notes - (like ARM/arm-{versionMajor()}) -- push it to origin with the same name -- enable a filter on the current branch -- identify the commit ID from release notes or manifest.txt (search back in time) -- create a branch like arm-{versionMajor()}--{versionMajor()}.{versionMinor()}.rel{customField('armSubRelease')}-xpack -- create a tag like arm-{versionMajor()}--{versionMajor()}.{versionMinor()}.rel{customField('armSubRelease')} -- push the tag to origin -- check the tag at https://github.com/xpack-dev-tools/gcc/tags/ -- cherry pick the `system.h: do not define abort() on mingw` commit -- push the *-xpack branch to origin -- save as Patches into the helper `patches` folder -- rename as gcc-{customField('upstreamVersion')}-cross.git.patch - -### Update the local newlib-cygwin fork (optional, normally the archive is used) - -With a Git client: - -- pull from the `master` branch (none mentioned in the release notes) -- push it to origin with the same name -- enable a filter on the current branch -- identify the commit ID from release notes or manifest.txt (search back in time) -- create a tag like newlib-{customField('newlibVersion')}--{versionMajor()}.{versionMinor()}.rel{customField('armSubRelease')} -- push the tag to origin -- check the tag at https://github.com/xpack-dev-tools/newlib-cygwin/tags/ - -### Update the gdb-*-cross.git.patch in helper - -Copy/paste a previous one; adjust if necessary. - -### Update other dependencies versions - -Check the release notes and updates the `libgmp`, `libisl`, `libmpfr`, `libmpc`, `libiconv` versions. - -### Check configure options - -Verify if the configure options used in -the {versionMajor()}.{versionMinor()}.rel{customField('armSubRelease')}-darwin-x86_64--manifest.txt file -are used in the build scripts. diff --git a/website/package-lock.json b/website/package-lock.json index ab3c23a..f072ead 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -16,7 +16,6 @@ "@mdx-js/react": "^3.1.0", "clean-css": "~5.3.3", "clsx": "^2.1.1", - "del-cli": "^6.0.0", "prism-react-renderer": "^2.4.0", "react": "^18.0.0", "react-dom": "^18.0.0" @@ -25,7 +24,9 @@ "@docusaurus/module-type-aliases": "3.6.3", "@docusaurus/tsconfig": "3.6.3", "@docusaurus/types": "3.6.3", + "del-cli": "^6.0.0", "json": "^11.0.0", + "liquidjs": "^10.20.1", "typescript": "~5.2.2" }, "engines": { @@ -4373,6 +4374,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz", "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==", + "dev": true, "license": "MIT", "engines": { "node": ">=18" @@ -7465,6 +7467,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/del-cli/-/del-cli-6.0.0.tgz", "integrity": "sha512-9nitGV2W6KLFyya4qYt4+9AKQFL+c0Ehj5K7V7IwlxTc6RMCfQUGY9E9pLG6e8TQjtwXpuiWIGGZb3mfVxyZkw==", + "dev": true, "license": "MIT", "dependencies": { "del": "^8.0.0", @@ -7485,6 +7488,7 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/del/-/del-8.0.0.tgz", "integrity": "sha512-R6ep6JJ+eOBZsBr9esiNN1gxFbZE4Q2cULkUSFumGYecAiS6qodDvcPx/sFuWHMNul7DWmrtoEOpYSm7o6tbSA==", + "dev": true, "license": "MIT", "dependencies": { "globby": "^14.0.2", @@ -7505,6 +7509,7 @@ "version": "14.0.2", "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz", "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==", + "dev": true, "license": "MIT", "dependencies": { "@sindresorhus/merge-streams": "^2.1.0", @@ -7525,6 +7530,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-3.0.0.tgz", "integrity": "sha512-kyiNFFLU0Ampr6SDZitD/DwUo4Zs1nSdnygUBqsu3LooL00Qvb5j+UnvApUn/TTj1J3OuE6BTdQ5rudKmU2ZaA==", + "dev": true, "license": "MIT", "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" @@ -7537,6 +7543,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz", "integrity": "sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==", + "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -7549,6 +7556,7 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz", "integrity": "sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA==", + "dev": true, "license": "MIT", "engines": { "node": ">=18" @@ -7561,6 +7569,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz", "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==", + "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -7573,6 +7582,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", + "dev": true, "license": "MIT", "engines": { "node": ">=14.16" @@ -10507,6 +10517,37 @@ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", "license": "MIT" }, + "node_modules/liquidjs": { + "version": "10.20.1", + "resolved": "https://registry.npmjs.org/liquidjs/-/liquidjs-10.20.1.tgz", + "integrity": "sha512-eZ33jfxjj0It8tkY+I4gbKWfXvMmOvQvvraxVFSLcTjZWCjdWMLBnevk48qw9AQIwIHFp58vZc59vH9Qwdq7mw==", + "dev": true, + "license": "MIT", + "dependencies": { + "commander": "^10.0.0" + }, + "bin": { + "liquid": "bin/liquid.js", + "liquidjs": "bin/liquid.js" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/liquidjs" + } + }, + "node_modules/liquidjs/node_modules/commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, "node_modules/loader-runner": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", @@ -11084,6 +11125,7 @@ "version": "13.2.0", "resolved": "https://registry.npmjs.org/meow/-/meow-13.2.0.tgz", "integrity": "sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==", + "dev": true, "license": "MIT", "engines": { "node": ">=18" @@ -17857,6 +17899,7 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz", "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=18" diff --git a/website/package.json b/website/package.json index 6a84f9d..adb52ba 100644 --- a/website/package.json +++ b/website/package.json @@ -1,9 +1,10 @@ { - "DO NOT EDIT": "Automatically generated from xbb-helper/templates/docusaurus/common", + "DO NOT EDIT": "Automatically generated from docusaurus-template-liquid/templates/docusaurus", "name": "website", "version": "0.0.0", "private": true, "scripts": { + "generate-website-commons": "bash node_modules/@xpack/docusaurus-template-liquid/maintenance-scripts/generate-commons.sh --xpack-dev-tools", "docusaurus": "docusaurus", "start": "docusaurus start", "build": "docusaurus build", @@ -17,6 +18,7 @@ "typecheck": "tsc", "npm-outdated": "npm outdated", "npm-install": "npm install", + "npm-link-helpers": "npm link @xpack/docusaurus-template-liquid @xpack/npm-packages-helper", "npm-ci": "npm ci", "deep-clean": "del-cli .docusaurus build node_modules package-lock.json" }, @@ -29,7 +31,6 @@ "@mdx-js/react": "^3.1.0", "clean-css": "~5.3.3", "clsx": "^2.1.1", - "del-cli": "^6.0.0", "prism-react-renderer": "^2.4.0", "react": "^18.0.0", "react-dom": "^18.0.0" @@ -38,7 +39,9 @@ "@docusaurus/module-type-aliases": "3.6.3", "@docusaurus/tsconfig": "3.6.3", "@docusaurus/types": "3.6.3", + "del-cli": "^6.0.0", "json": "^11.0.0", + "liquidjs": "^10.20.1", "typescript": "~5.2.2" }, "browserslist": { @@ -53,8 +56,8 @@ "last 5 safari version" ] }, + "websiteConfig": {}, "engines": { "node": ">=18.0" - }, - "websiteConfig": {} + } }