From 6db27e5db6787ffe75c4a833644c69f9ed4baedc Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 10 Sep 2020 13:10:03 +0200 Subject: [PATCH] Adapt doc and scripts to new tags and branchs names --- Documentation/doc/Documentation/Usage.txt | 4 ++-- Documentation/doc/Documentation/windows.txt | 2 +- Installation/CHANGES.md | 2 +- Scripts/developer_scripts/tag_pr_per_release.sh | 2 +- Scripts/developer_scripts/test_license_check/ImageIO.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/doc/Documentation/Usage.txt b/Documentation/doc/Documentation/Usage.txt index 247348cab68..eba087fdaa6 100644 --- a/Documentation/doc/Documentation/Usage.txt +++ b/Documentation/doc/Documentation/Usage.txt @@ -10,7 +10,7 @@ However, some dependencies of \cgal might still need to be installed. Assuming that you have obtained \cgal through one of the package managers offering \cgal on your platform (see Section \ref secgettingcgal), you can download \cgal examples ( -CGAL-\cgalReleaseNumber-examples.tar.xz) +CGAL-\cgalReleaseNumber-examples.tar.xz) and the compilation of an example is as simple as: cd $HOME/CGAL-\cgalReleaseNumber/examples/Triangulation_2 # go to an example directory @@ -51,7 +51,7 @@ acquire these dependencies. The examples and demos of \cgal are not included when you install \cgal with a package manager, and must be downloaded -here. +here. \subsection secusingpkgman Using a Package Manager diff --git a/Documentation/doc/Documentation/windows.txt b/Documentation/doc/Documentation/windows.txt index 7963b3d12b2..77021a27a28 100644 --- a/Documentation/doc/Documentation/windows.txt +++ b/Documentation/doc/Documentation/windows.txt @@ -60,7 +60,7 @@ Note that \cgal is a header-only library, and there are therefore no `lib` or `d In this section we show how to compile a program that uses \cgal. The examples you find in these User Manual pages are not downloaded when you install \cgal with the Vcpkg library manager. You must download them separately from the following download page: -CGAL-\cgalReleaseNumber-examples.zip +CGAL-\cgalReleaseNumber-examples.zip Assuming you have unzipped this file in your home directory `C:\Users\Me`, we will next compile an example from the 2D Triangulation package. diff --git a/Installation/CHANGES.md b/Installation/CHANGES.md index bdb01e6b8b4..9794eb2c118 100644 --- a/Installation/CHANGES.md +++ b/Installation/CHANGES.md @@ -1,7 +1,7 @@ Release History =============== -[Release 5.1](https://github.com/CGAL/cgal/releases/tag/releases%2FCGAL-5.1) +[Release 5.1](https://github.com/CGAL/cgal/releases/tag/v5.1) ----------- Release date: September 2020 diff --git a/Scripts/developer_scripts/tag_pr_per_release.sh b/Scripts/developer_scripts/tag_pr_per_release.sh index ba1fab8f3b6..a8927dcfe17 100644 --- a/Scripts/developer_scripts/tag_pr_per_release.sh +++ b/Scripts/developer_scripts/tag_pr_per_release.sh @@ -24,7 +24,7 @@ set -e # Exit the script on first error, for safety PREVIOUS_MAJOR_RELEASE=$1 CURRENT_RELEASE=$2 -REMOTE=`git config branch.releases/CGAL-${PREVIOUS_MAJOR_RELEASE}-branch.remote` +REMOTE=`git config branch.releases/CGAL-${PREVIOUS_MAJOR_RELEASE}-branch.remote || git config branch.${PREVIOUS_MAJOR_RELEASE}.x-branch.remote` # $REMOTE should be the "cgal" remote, but a CGAL developer may have keep the # name "origin", or set to another one. diff --git a/Scripts/developer_scripts/test_license_check/ImageIO.h b/Scripts/developer_scripts/test_license_check/ImageIO.h index 50ad48b44ad..4e3a23c1651 100644 --- a/Scripts/developer_scripts/test_license_check/ImageIO.h +++ b/Scripts/developer_scripts/test_license_check/ImageIO.h @@ -13,7 +13,7 @@ // // These files are provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -// $URL: svn+ssh://scm.gforge.inria.fr/svn/cgal/branches/releases/CGAL-4.1-branch/CGALimageIO/include/CGAL/ImageIO.h $ +// $URL: $ // $Id: ImageIO.h 67097 2012-01-13 13:36:56Z lrineau $ // // SPDX-License-Identifier: LGPL-3.0-or-later