Commit Graph

983 Commits

Author SHA1 Message Date
Maxime Gimeno 1d98f0f71d Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-12-09 14:40:02 +01:00
Sébastien Loriot 9a7f0b9f07 accomodate Polyhedral_envelope.h 2020-12-07 19:00:07 +01:00
Sébastien Loriot 08eeacca8b Merge remote-tracking branch 'cgal/master' into FastEnvelope-GF 2020-12-07 16:40:34 +01:00
Laurent Rineau af67ba2bd3 Merge branch '5.1.x-branch' into 5.2.x-branch 2020-12-07 15:52:32 +01:00
Sébastien Loriot fd591dedf4 seperate files with \n rather than \0
workaround issues with some version of awk or xargs
(not sure where the issue comes from)
2020-12-07 15:39:55 +01:00
Giles Bathgate 5a36ff89b5 Drop NDEBUG it is already visible through CGAL_NO_ASSERTIONS 2020-12-04 19:42:21 +00:00
Maxime Gimeno de7f35fe6b add missing /demo in script 2020-11-23 17:11:41 +01:00
Maxime Gimeno f5c32f126f copy demo resources in the cmake module dir during release creation and fetch it from here during installation 2020-11-20 12:20:54 +01:00
Sébastien Loriot b5094bd00a handle derived work 2020-11-02 18:07:39 +01:00
Maxime Gimeno 8eb02bd7aa update scripts 2020-10-14 11:38:31 +02:00
Maxime Gimeno 24390666eb remove qt4 traces in scripts 2020-10-14 11:31:40 +02:00
Maxime Gimeno 27ddd9bf86 remove flags in CI 2020-10-12 15:44:44 +02:00
Mael Rouxel-Labbé f55ef7dd50 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-10-09 18:36:17 +02:00
Laurent Rineau c300ef6591 Fix the script when the merge fixes 2020-10-09 16:53:07 +02:00
Sebastien Loriot af260a3156
Merge pull request #4869 from maxGimeno/CGAL-CMake_testsuite-maxGimeno
Add a testsuite for CMake
2020-10-02 15:21:47 +02:00
Mael Rouxel-Labbé 4694a48913 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-09-22 11:35:25 +02:00
Laurent Rineau 6db27e5db6 Adapt doc and scripts to new tags and branchs names 2020-09-10 13:10:03 +02:00
Laurent Rineau 301c5e0c5c Add our scripts to new releases tag names 2020-09-08 13:51:17 +02:00
Mael Rouxel-Labbé 8682f9bafb Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-08-24 11:45:17 +02:00
Maxime Gimeno e2eca0150b Merge remote-tracking branch 'cgal/master' into CGAL-CMake_testsuite-maxGimeno 2020-08-21 14:40:58 +02:00
Maxime Gimeno 6ffb10a71c Fixes for cmake-testsuite...
- Use CGAL_RELEASE_DIR as CGAL_DIR to have the real setup
 - Use RUNNING_CGAL_AUTO_TEST to detect a testsuite setup
2020-08-06 11:03:53 +02:00
Laurent Rineau c788d66761 Merge pull request #4860 from lrineau/CGAL-CGALConfigVersion__fixes-GF
CGALConfigVersion... fix #4850
2020-07-23 17:15:09 +02:00
Laurent Rineau 201974279a Merge branch 'releases/CGAL-5.0-branch' 2020-07-22 16:54:45 +02:00
Laurent Rineau 03be017c46 Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch 2020-07-22 16:54:04 +02:00
Sébastien Loriot 6c64758109 handle updated version of file 2020-07-22 07:53:22 +02:00
Laurent Rineau 5b89f55ebc Automatic whitespace adjustments by my editor 2020-07-21 11:57:12 +02:00
Laurent Rineau 4b489b4c02 Replace --is_master by --integration
The old option was completely useless: it was ON by default, and had a
flag to set it ON again!
2020-07-21 11:57:12 +02:00
Laurent Rineau ed377100ee Read CGAL_BUILD_VERSION from another file
That allows the release creation script to fill that number.
2020-07-21 11:57:12 +02:00
Laurent Rineau 61c04aed10 Merge pull request #4827 from lrineau/Installation-remove_code_about_REFERENCE_CACHE_DIR-GF
Remove CGAL_REFERENCE_CACHE_DIR from our CMake scripts
2020-07-08 16:24:39 +02:00
Laurent Rineau cdfbe3b0df Merge branch 'releases/CGAL-5.0-branch' 2020-07-03 16:21:42 +02:00
Laurent Rineau f94a024191 Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch 2020-07-03 16:20:55 +02:00
Laurent Rineau 0e6302d1d5 Remove CGAL_REFERENCE_CACHE_DIR
That no longer works with header-only, anyway. Now we use the option
`-C` of CMake, with a small file loaded from the environment variable
`INIT_FILE`.
2020-07-02 15:02:20 +02:00
Laurent Rineau 0f51c426d3 Add a new script that helps dealing with `integration` 2020-07-01 16:37:32 +02:00
Mael Rouxel-Labbé 619e27e50f Remove Polyhedron_IO
Completely undocumented package.

All functions/examples have been moved and documented (Stream_support/IO, mostly=
2020-06-22 18:52:24 +02:00
Laurent Rineau 1b947a6c04 Merge pull request #4678 from maxGimeno/CGAL-Fixes_for_bundle-maxGimeno
Script: Update the script for the demo bundle
2020-05-18 12:24:39 +02:00
Laurent Rineau 81c1b96217 Merge branch 'releases/CGAL-5.0-branch' 2020-05-18 12:01:39 +02:00
Laurent Rineau 0ed0741489 Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch 2020-05-18 11:59:20 +02:00
Laurent Rineau abf414df81 Change create_new_release to use CGALConfigVersion.cmake as input 2020-05-06 13:36:38 +02:00
Laurent Rineau 9611eada72 Add the +x permission bit 2020-05-06 12:10:57 +02:00
Laurent Rineau 841a2505fa Catch errors earlier
If `$1` and `$2` is either empty, or not a directory, then display the
help. Maybe we should check that `$1` is indeed a CGAL directory.
2020-05-06 12:10:06 +02:00
Laurent Rineau 57b37e3e1d Fix so that is runs on Fedora 2020-05-06 12:08:54 +02:00
Maxime Gimeno c372c04a6b Change script for use zith new dicker image. 2020-04-23 14:24:14 +02:00
Sébastien Loriot c5af2b25f3 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-04-22 13:27:29 +02:00
Sébastien Loriot 157bdbda08 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-04-22 13:26:52 +02:00
Maxime Gimeno 75152e76d2 Add switch in dependency script 2020-04-16 16:29:42 +02:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch'
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Sébastien Loriot da0f21e667 add script to replace tabs by spaces and removing trailing whitespaces 2020-03-26 13:24:28 +01:00
Sébastien Loriot 766967913c add checks for the presence of tabs and trailing whitespaces 2020-03-26 13:24:27 +01:00
Laurent Rineau f76f2f43e1 Modify the script to rely on refs/pull/\*head references
... instead of commit log messages.
2020-01-27 12:04:42 +01:00
Laurent Rineau 7653cd081d Fix cgal_create_release_with_cmake.cmake 2020-01-17 16:35:54 +01:00
Laurent Rineau 4d77c82377 Fix cgal_create_release_with_cmake.cmake 2020-01-17 16:30:46 +01:00
Laurent Rineau 4646f9c70a Fix cgal_create_release_with_cmake.cmake 2020-01-16 16:11:03 +01:00
Laurent Rineau 6cdd833e13 Merge branch 'DT_3-issue4388__for_CGAL-4.14.2-GF' into DT_3-issue4388-GF 2019-12-04 15:39:55 +01:00
Laurent Rineau 6ded244449 Merge branch 'DT_3-issue4388__for_CGAL-4.13.2-GF' into DT_3-issue4388__for_CGAL-4.14.2-GF 2019-12-04 15:32:07 +01:00
Laurent Rineau 12181210e8 Add a bench of DT3 with TBB and Google benchmark 2019-12-04 15:16:25 +01:00
Laurent Rineau 64763c41b0 The file to extract was moved just a few line above! 2019-11-08 11:55:42 +01:00
Laurent Rineau 65dd48a94c Fix the Windows-installer generation 2019-11-08 11:47:09 +01:00
Laurent Rineau e10ace6bcf Merge pull request #4334 from sloriot/CGAL-SPDX_cleanup_fixes
Fix some remaining license notice + add a missing LicenseRef-Commercial
2019-11-06 17:45:23 +01:00
Sébastien Loriot 0d4963f455 also detect BSL 2019-11-04 09:24:22 +01:00
Laurent Rineau 21fedbf0ad Take the version number from `public_release_name` 2019-10-31 18:34:08 +01:00
Sébastien Loriot 9af500c5e5 make the message more verbose 2019-10-28 10:52:28 +01:00
Laurent Rineau 30b02eea63 Merge pull request #4303 from sloriot/CGAL-SPDX_updates
Update SPDX tags
2019-10-25 16:26:13 +02:00
Laurent Rineau 1d6fba5a39 Also create .zip files for -examples and -library tarballs 2019-10-22 18:16:35 +02:00
Laurent Rineau 620d90961d replace tarballs creation by the script feature GENERATE_TARBALLS=ON 2019-10-22 12:50:28 +02:00
Laurent Rineau 30479e5c12 Fix the date in man pages 2019-10-21 18:46:18 +02:00
Sébastien Loriot dfe3ce485d special case for Random Forest 2019-10-20 10:45:13 +02:00
Sébastien Loriot 5dfd8b753f check for the absence of license notice in headers 2019-10-20 01:01:10 +02:00
Sébastien Loriot 8832addb4e update to read SPDX tags (GPL-3+, LGPL 3+, and LGPL3 are enough for us) 2019-10-20 00:36:39 +02:00
Sébastien Loriot 7c63219861 Manual removal of license notice + SPDX updates 2019-10-19 17:14:18 +02:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Laurent Rineau c69c604f1f Merge remote-tracking branch 'refs/remotes/cgal/master' 2019-10-17 21:00:28 +02:00
Sébastien Loriot dd00593e86 add a comment 2019-10-16 23:53:59 +02:00
Laurent Rineau e496a5e679 Merge pull request #4280 from lrineau/CGAL-fix_CGAL_CreateSingleSourceCGALProgram-GF
Fix CGAL_CreateSingleSourceCGALProgram for CGAL_Core and others components

# Conflicts:
#	Scripts/scripts/cgal_create_CMakeLists
2019-10-15 16:33:17 +02:00
Laurent Rineau ac557caa4a Fix CGAL_CreateSingleSourceCGALProgram for CGAL_Core and others 2019-10-10 12:23:42 +02:00
Laurent Rineau 5075a895f7 Merge branch 'releases/CGAL-4.14-branch' 2019-09-06 14:14:29 +02:00
Laurent Rineau 73500e8d3c Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-09-06 14:14:13 +02:00
Sébastien Loriot 4b28db79f0 update script 2019-09-04 16:19:10 +02:00
Maxime Gimeno fe7d83d67e Add a test to replace an empty number of processors by 1 and move --timeout sooner in the options to prevent an eventual other parsing error. 2019-08-13 10:35:35 +02:00
Sébastien Loriot 25a05e9f4c Merge branch 'CGAL-named_function_parameters-4.14' into master
Conflicts resolved by hand
2019-07-28 23:46:43 +02:00
Sébastien Loriot 2f81a21523 Merge 'CGAL-named_function_parameters' for 4.13-branch into 4.14-branch
Conflicts resolved by hand
2019-07-28 22:30:13 +02:00
Sébastien Loriot 41ef56f8ad Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' into HEAD 2019-07-18 16:57:27 +02:00
Sébastien Loriot 560c77f567 rename named function parameter class 2019-07-15 06:25:02 +02:00
Sébastien Loriot 0343659467 add script to ease the update to the new CGAL np 2019-07-14 22:46:46 +02:00
Maxime Gimeno f3697f1b2b Move logging functions in the script to avoid having to ask for CGAL-I before it is set. 2019-07-09 14:17:04 +02:00
Laurent Rineau 39a245220a Merge pull request #3660 from mglisse/NewKernel_d-lazy_Epeck_d-glisse
Epeck_d
2019-07-01 11:16:33 +02:00
Laurent Rineau 32f80cbece Merge pull request #4018 from lrineau/CGAL-refresh_cmake_minimum_required-GF
CMake>=3.13: opt for for new policies up to 3.15
2019-07-01 11:16:30 +02:00
Laurent Rineau a236d22e2d Merge pull request #3730 from sloriot/CGAL-create_tarballs
Add an option to create tarballs while creating a release
2019-06-20 14:21:16 +02:00
Laurent Rineau 2a5b558eb5 Merge branch 'master' into NewKernel_d-lazy_Epeck_d-glisse 2019-06-20 10:28:01 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Laurent Rineau 021b287fa0 Merge pull request #3912 from lrineau/Scripts-simplify_user_scripts-GF
Simplify user scripts (cgal_create_CMakeLists and cgal_create_cmake_script)
2019-06-17 13:54:36 +02:00
Sébastien Loriot e07ff8846f add a little doc 2019-06-13 14:11:47 +02:00
Sébastien Loriot 453313fae6 script to add label PR merged in a release since the previous release (not a bug-fix release) 2019-06-13 13:54:43 +02:00
Laurent Rineau a6514fdfad Merge branch 'master' into Scripts-simplify_user_scripts-GF 2019-06-06 10:11:23 +02:00
Laurent Rineau 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF
Fix some typos in code/comments/documentation
2019-05-23 08:50:14 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00