prepare 1.10.2-3

xpack-dev-tools · Apr 28, 2021 · de38082 · de38082
1 parent 7e7aa6f
commit de38082
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 49 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 Releases in reverse chronological order.
 
+## 2021-04-28
+
+- v1.10.2-3.1 published on npmjs.com
+- v1.10.2-3 released
+- use local fork, with cmd.exe fix
+
 ## 2021-03-16
 
 - v1.10.2-2.1 published on npmjs.com

diff --git a/README-BUILD.md b/README-BUILD.md
@@ -113,7 +113,7 @@ No need to add a tag here, it'll be added when the release is created.
 
 To prepare a new release, first determine the Ninja Build version
 (like `1.10.2`) and update the `scripts/VERSION` file. The format is
-`1.10.2-2`. The fourth number is the xPack release number
+`1.10.2-3`. The fourth number is the xPack release number
 of this version. A fifth number will be added when publishing
 the package on the `npm` server.
 
@@ -201,14 +201,14 @@ archives and their SHA signatures, created in the `deploy` folder:
 ```console
 $ ls -l ~/Work/ninja-build-*/deploy
 total 1624
--rw-rw-r-- 1 ilg ilg 233764 Sep 28 16:53 xpack-ninja-build-1.10.2-2-linux-x32.tar.gz
--rw-rw-r-- 1 ilg ilg    110 Sep 28 16:53 xpack-ninja-build-1.10.2-2-linux-x32.tar.gz.sha
--rw-rw-r-- 1 ilg ilg 217440 Sep 28 16:52 xpack-ninja-build-1.10.2-2-linux-x64.tar.gz
--rw-rw-r-- 1 ilg ilg    110 Sep 28 16:52 xpack-ninja-build-1.10.2-2-linux-x64.tar.gz.sha
--rw-rw-r-- 1 ilg ilg 475368 Sep 28 16:53 xpack-ninja-build-1.10.2-2-win32-x32.zip
--rw-rw-r-- 1 ilg ilg    107 Sep 28 16:53 xpack-ninja-build-1.10.2-2-win32-x32.zip.sha
--rw-rw-r-- 1 ilg ilg 706151 Sep 28 16:52 xpack-ninja-build-1.10.2-2-win32-x64.zip
--rw-rw-r-- 1 ilg ilg    107 Sep 28 16:52 xpack-ninja-build-1.10.2-2-win32-x64.zip.sha
+-rw-rw-r-- 1 ilg ilg 233764 Sep 28 16:53 xpack-ninja-build-1.10.2-3-linux-x32.tar.gz
+-rw-rw-r-- 1 ilg ilg    110 Sep 28 16:53 xpack-ninja-build-1.10.2-3-linux-x32.tar.gz.sha
+-rw-rw-r-- 1 ilg ilg 217440 Sep 28 16:52 xpack-ninja-build-1.10.2-3-linux-x64.tar.gz
+-rw-rw-r-- 1 ilg ilg    110 Sep 28 16:52 xpack-ninja-build-1.10.2-3-linux-x64.tar.gz.sha
+-rw-rw-r-- 1 ilg ilg 475368 Sep 28 16:53 xpack-ninja-build-1.10.2-3-win32-x32.zip
+-rw-rw-r-- 1 ilg ilg    107 Sep 28 16:53 xpack-ninja-build-1.10.2-3-win32-x32.zip.sha
+-rw-rw-r-- 1 ilg ilg 706151 Sep 28 16:52 xpack-ninja-build-1.10.2-3-win32-x64.zip
+-rw-rw-r-- 1 ilg ilg    107 Sep 28 16:52 xpack-ninja-build-1.10.2-3-win32-x64.zip.sha
 ```
 
 To copy the files from the build machine to the current development
@@ -272,10 +272,10 @@ archives and their SHA signatures, created in the `deploy` folder:
 ```console
 $ ls -l ~/Work/ninja-build-*/deploy
 total 416
--rw-rw-r-- 1 ilg ilg 215309 Sep 28 14:00 xpack-ninja-build-1.10.2-2-linux-arm64.tar.gz
--rw-rw-r-- 1 ilg ilg    112 Sep 28 14:00 xpack-ninja-build-1.10.2-2-linux-arm64.tar.gz.sha
--rw-rw-r-- 1 ilg ilg 199196 Sep 28 14:01 xpack-ninja-build-1.10.2-2-linux-arm.tar.gz
--rw-rw-r-- 1 ilg ilg    110 Sep 28 14:01 xpack-ninja-build-1.10.2-2-linux-arm.tar.gz.sha
+-rw-rw-r-- 1 ilg ilg 215309 Sep 28 14:00 xpack-ninja-build-1.10.2-3-linux-arm64.tar.gz
+-rw-rw-r-- 1 ilg ilg    112 Sep 28 14:00 xpack-ninja-build-1.10.2-3-linux-arm64.tar.gz.sha
+-rw-rw-r-- 1 ilg ilg 199196 Sep 28 14:01 xpack-ninja-build-1.10.2-3-linux-arm.tar.gz
+-rw-rw-r-- 1 ilg ilg    110 Sep 28 14:01 xpack-ninja-build-1.10.2-3-linux-arm.tar.gz.sha
 ```
 
 To copy the files from the build machine to the current development
@@ -314,8 +314,8 @@ archive and its SHA signature, created in the `deploy` folder:
 ```console
 $ ls -l ~/Work/ninja-build-*/deploy
 total 1768
--rw-r--r--  1 ilg  staff  900060 Sep 28 17:04 xpack-ninja-build-1.10.2-2-darwin-x64.tar.gz
--rw-r--r--  1 ilg  staff     111 Sep 28 17:04 xpack-ninja-build-1.10.2-2-darwin-x64.tar.gz.sha
+-rw-r--r--  1 ilg  staff  900060 Sep 28 17:04 xpack-ninja-build-1.10.2-3-darwin-x64.tar.gz
+-rw-r--r--  1 ilg  staff     111 Sep 28 17:04 xpack-ninja-build-1.10.2-3-darwin-x64.tar.gz.sha
 ```
 
 To copy the files from the build machine to the current development
@@ -397,7 +397,7 @@ program from there. For example on macOS the output should
 look like:
 
 ```console
-$ /Users/ilg/Downloads/xPacks/ninja-build/1.10.2-2/bin/ninja --version
+$ /Users/ilg/Downloads/xPacks/ninja-build/1.10.2-3/bin/ninja --version
 1.10.2
 ```
 
@@ -407,8 +407,8 @@ After install, the package should create a structure like this (macOS files;
 only the first two depth levels are shown):
 
 ```console
-$ tree -L 2 /Users/ilg/Library/xPacks/\@xpack-dev-tools/ninja-build/1.10.2-2.1/.content/
-/Users/ilg/Library/xPacks/\@xpack-dev-tools/ninja-build/1.10.2-2.1/.content/
+$ tree -L 2 /Users/ilg/Library/xPacks/\@xpack-dev-tools/ninja-build/1.10.2-3.1/.content/
+/Users/ilg/Library/xPacks/\@xpack-dev-tools/ninja-build/1.10.2-3.1/.content/
 ├── README.md
 ├── bin
 │   ├── libgcc_s.1.dylib

diff --git a/README-RELEASE.md b/README-RELEASE.md
@@ -21,7 +21,7 @@ Before starting the build, perform some checks and tweaks.
 To keep the development repository in sync with the original OpenOCD
 repository, in the `xpack-dev-tools/ninja` Git repo:
 
-- checkout `release` 
+- checkout `release`
 - merge from `upstream/release`
 - checkout `xpack-develop`
 - merge `release`
@@ -31,7 +31,7 @@ repository, in the `xpack-dev-tools/ninja` Git repo:
 ### Increase the version
 
 Determine the version (like `1.10.2`) and update the `scripts/VERSION`
-file; the format is `1.10.2-2`. The fourth number is the xPack release number
+file; the format is `1.10.2-3`. The fourth number is the xPack release number
 of this version. A fifth number will be added when publishing
 the package on the `npm` server.
 
@@ -41,7 +41,7 @@ Check GitHub issues and pull requests:
 
 - https://github.com/xpack-dev-tools/ninja-build-xpack/issues/
 
-and fix them; assign them to a milestone (like `1.10.2-2`).
+and fix them; assign them to a milestone (like `1.10.2-3`).
 
 ### Check `README.md`
 
@@ -56,8 +56,8 @@ but in the version specific file (below).
 
 - open the `CHANGELOG.md` file
 - check if all previous fixed issues are in
-- add a new entry like _v1.10.2-2 prepared_
-- commit commit with a message like _prepare v1.10.2-2_
+- add a new entry like _v1.10.2-3 prepared_
+- commit with a message like _prepare v1.10.2-3_
 
 Note: if you missed to update the `CHANGELOG.md` before starting the build,
 edit the file and rerun the build, it should take only a few minutes to
@@ -170,15 +170,15 @@ functional.
 - commit and push the `xpack-develop` branch
 - go to the GitHub [releases](https://github.com/xpack-dev-tools/ninja-build-xpack/releases) page
 - click **Draft a new release**, in the `xpack-develop` branch
-- name the tag like **v1.10.2-2** (mind the dash in the middle!)
-- name the release like **xPack Ninja Build v1.10.2-2**
+- name the tag like **v1.10.2-3** (mind the dash in the middle!)
+- name the release like **xPack Ninja Build v1.10.2-3**
 (mind the dash)
 - as description, use:
 
 ```console
-![Github Releases (by Release)](https://img.shields.io/github/downloads/xpack-dev-tools/ninja-build-xpack/v1.10.2-2/total.svg)
+![Github Releases (by Release)](https://img.shields.io/github/downloads/xpack-dev-tools/ninja-build-xpack/v1.10.2-3/total.svg)
 
-Version v1.10.2-2 is a new/maintenance release of the **xPack Ninja Build** package, following the Ninja Build release/fixing...
+Version v1.10.2-3 is a new/maintenance release of the **xPack Ninja Build** package, following the Ninja Build release/fixing...
 
 _For the moment these binaries are provided only for testing purposes!_
 ```
@@ -211,8 +211,8 @@ In the `xpack/web-jekyll` GitHub repo:
 - select the `develop` branch
 - add a new file to `_posts/ninja-build/releases`
 - name the file like `2020-12-19-ninja-build-v1-10-2-1-released.md`
-- name the post like: **xPack Ninja Build v1.10.2-2 released**
-- as `download_url` use the tagged URL like `https://github.com/xpack-dev-tools/ninja-build-xpack/releases/tag/v1.10.2-2/`
+- name the post like: **xPack Ninja Build v1.10.2-3 released**
+- as `download_url` use the tagged URL like `https://github.com/xpack-dev-tools/ninja-build-xpack/releases/tag/v1.10.2-3/`
 - update the `date:` field with the current date
 - update the Travis URLs using the actual test pages
 - update the SHA sums via copy/paste from the original build machines
@@ -239,31 +239,31 @@ Copy/paste the build report at the end of the post as:
 The SHA-256 hashes for the files are:
 
 0a2a2550ec99b908c92811f8dbfde200956a22ab3d9af1c92ce9926bf8feddf9
-xpack-ninja-build-1.10.2-2-darwin-x64.tar.gz
+xpack-ninja-build-1.10.2-3-darwin-x64.tar.gz
 
 254588cbcd685748598dd7bbfaf89280ab719bfcd4dabeb0269fdb97a52b9d7a
-xpack-ninja-build-1.10.2-2-linux-arm.tar.gz
+xpack-ninja-build-1.10.2-3-linux-arm.tar.gz
 
 10e30128d626f9640c0d585e6b65ac943de59fbdce5550386add015bcce408fa
-xpack-ninja-build-1.10.2-2-linux-arm64.tar.gz
+xpack-ninja-build-1.10.2-3-linux-arm64.tar.gz
 
 50f2e399382c29f8cdc9c77948e1382dfd5db20c2cb25c5980cb29774962483f
-xpack-ninja-build-1.10.2-2-linux-ia32.tar.gz
+xpack-ninja-build-1.10.2-3-linux-ia32.tar.gz
 
 9b147443780b7f825eec333857ac7ff9e9e9151fd17c8b7ce2a1ecb6e3767fd6
-xpack-ninja-build-1.10.2-2-linux-x64.tar.gz
+xpack-ninja-build-1.10.2-3-linux-x64.tar.gz
 
 501366492cd73b06fca98b8283f65b53833622995c6e44760eda8f4483648525
-xpack-ninja-build-1.10.2-2-win32-ia32.zip
+xpack-ninja-build-1.10.2-3-win32-ia32.zip
 
 dffc858d64be5539410aa6d3f3515c6de751cd295c99217091f5ccec79cabf39
-xpack-ninja-build-1.10.2-2-win32-x64.zip
+xpack-ninja-build-1.10.2-3-win32-x64.zip
 ```
 
 ## Update the preview Web
 
 - commit the `develop` branch of `xpack/web-jekyll` GitHub repo;
-  use a message like **xPack Ninja Build v1.10.2-2 released**
+  use a message like **xPack Ninja Build v1.10.2-3 released**
 - wait for the GitHub Pages build to complete
 - the preview web is https://xpack.github.io/web-preview/
 
@@ -273,7 +273,7 @@ xpack-ninja-build-1.10.2-2-win32-x64.zip
 - run `xpm-dev binaries-update`
 
 ```console
-xpm-dev binaries-update -C "${HOME}/Downloads/ninja-build-xpack.git" '1.10.2-2' "${HOME}/Downloads/xpack-binaries/ninja-build"
+xpm-dev binaries-update -C "${HOME}/Downloads/ninja-build-xpack.git" '1.10.2-3' "${HOME}/Downloads/xpack-binaries/ninja-build"
 ```
 
 - open the GitHub [releases](https://github.com/xpack-dev-tools/ninja-build-xpack/releases)
@@ -285,17 +285,17 @@ xpm-dev binaries-update -C "${HOME}/Downloads/ninja-build-xpack.git" '1.10.2-2'
 - compare the SHA sums with those shown by `cat *.sha`
 - check the executable names
 - commit all changes, use a message like
-  `package.json: update urls for 1.10.2-2.1 release` (without `v`)
+  `package.json: update urls for 1.10.2-3.1 release` (without `v`)
 
 ## Publish on the npmjs.com server
 
 - select the `xpack-develop` branch
 - check the latest commits `npm run git-log`
 - update `CHANGELOG.md`; commit with a message like
-  _CHANGELOG: prepare npm v1.10.2-2.1_
+  _CHANGELOG: prepare npm v1.10.2-3.1_
 - `npm pack` and check the content of the archive, which should list
   only the `package.json`, the `README.md`, `LICENSE` and `CHANGELOG.md`
-- `npm version 1.10.2-2.1`; the first 5 numbers are the same as the
+- `npm version 1.10.2-3.1`; the first 5 numbers are the same as the
   GitHub release; the sixth number is the npm specific version
 - push the `xpack-develop` branch to GitHub
 - push tags with `git push origin --tags`
@@ -332,7 +332,7 @@ xpm install --global @xpack-dev-tools/ninja-build@next
 On GNU/Linux systems, including Raspberry Pi, use the following commands:
 
 ```sh
-~/opt/xPacks/@xpack-dev-tools/ninja-build/1.10.2-2.1/.content/bin/ninja --version
+~/opt/xPacks/@xpack-dev-tools/ninja-build/1.10.2-3.1/.content/bin/ninja --version
 
 ninja-build version 1.10.2
 
@@ -342,7 +342,7 @@ Ninja Build suite maintained and supported by Kitware (kitware.com/ninja-build).
 On macOS, use:
 
 ```sh
-~/Library/xPacks/@xpack-dev-tools/ninja-build/1.10.2-2.1/.content/bin/ninja --version
+~/Library/xPacks/@xpack-dev-tools/ninja-build/1.10.2-3.1/.content/bin/ninja --version
 
 ninja-build version 1.10.2
 
@@ -352,7 +352,7 @@ Ninja Build suite maintained and supported by Kitware (kitware.com/ninja-build).
 On Windows use:
 
 ```console
-%HOMEPATH%\AppData\Roaming\xPacks\@xpack-dev-tools\ninja-build\1.10.2-2.1\.content\bin\ninja --version
+%HOMEPATH%\AppData\Roaming\xPacks\@xpack-dev-tools\ninja-build\1.10.2-3.1\.content\bin\ninja --version
 
 ninja-build version 1.10.2
 
@@ -369,7 +369,7 @@ Ninja Build suite maintained and supported by Kitware (kitware.com/ninja-build).
 When the release is considered stable, promote it as `latest`:
 
 - `npm dist-tag ls @xpack-dev-tools/ninja-build`
-- `npm dist-tag add @xpack-dev-tools/ninja-build@1.10.2-2.1 latest`
+- `npm dist-tag add @xpack-dev-tools/ninja-build@1.10.2-3.1 latest`
 - `npm dist-tag ls @xpack-dev-tools/ninja-build`
 
 ## Update the Web
@@ -391,7 +391,7 @@ When the release is considered stable, promote it as `latest`:
 
 - in a separate browser windows, open [TweetDeck](https://tweetdeck.twitter.com/)
 - using the `@xpack_project` account
-- paste the release name like **xPack Ninja Build v1.10.2-2 released**
+- paste the release name like **xPack Ninja Build v1.10.2-3 released**
 - paste the link to the Web page
   [release](https://xpack.github.io/ninja-build/releases/)
 - click the **Tweet** button
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ With the `xpm` tool available, installing
 the latest version of the package is quite easy:
 
 ```console
-$ xpm install --global @xpack-dev-tools/ninja-build@latest
+xpm install --global @xpack-dev-tools/ninja-build@latest
 ```
 
 This command will always install the latest available version,
@@ -64,7 +64,7 @@ identify binaries installed with
 To remove the installed xPack, the command is similar:
 
 ```console
-$ xpm uninstall --global @xpack-dev-tools/ninja-build
+xpm uninstall --global @xpack-dev-tools/ninja-build
 ```
 
 (Note: not yet implemented. As a temporary workaround, simply remove the

diff --git a/scripts/VERSION b/scripts/VERSION
@@ -1 +1 @@
-1.10.2-2
+1.10.2-3
diff --git a/scripts/common-versions-source.sh b/scripts/common-versions-source.sh
@@ -34,6 +34,14 @@ function build_versions()
       NINJA_GIT_URL=${NINJA_GIT_URL:-"https://github.com/xpack-dev-tools/ninja.git"}
       NINJA_GIT_BRANCH=${NINJA_GIT_BRANCH:-"xpack"}
       NINJA_GIT_COMMIT=${NINJA_GIT_COMMIT:-"73218c896d51b91a4654531e90bf9a277bdf0300"}
+    elif [ "${RELEASE_VERSION}" == "1.10.2-3" ]
+    then
+      NINJA_GIT_URL=${NINJA_GIT_URL:-"https://github.com/xpack-dev-tools/ninja.git"}
+      NINJA_GIT_BRANCH=${NINJA_GIT_BRANCH:-"xpack"}
+      NINJA_GIT_COMMIT=${NINJA_GIT_COMMIT:-"148d49dd50c9d126bbcb509c1082ac8ef8dcf76a"}
+    else
+      echo "Unsupported version"
+      exit 1
     fi
 
     # -------------------------------------------------------------------------