Skip to content

Commit

Permalink
Backport update hard-coded copyright notices to 2025
Browse files Browse the repository at this point in the history
Backport du premier commit de la PR #506
  • Loading branch information
marcboulle committed Jan 2, 2025
1 parent 506dd13 commit e95f0c6
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The Clear BSD License

Copyright (c) 2024 Orange S.A.
Copyright (c) 2023-2025 Orange S.A.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion packaging/common/khiops/README.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Khiops 10
=========
(c) 2024 Orange - All rights reserved.
(c) 2023-2025 Orange. All rights reserved.
https://khiops.org

Khiops is a fully automatic tool for mining large multi-table databases,
Expand Down
2 changes: 1 addition & 1 deletion packaging/windows/nsis/khiops.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Page custom RequirementsPageShow RequirementsPageLeave
VIProductVersion "${KHIOPS_REDUCED_VERSION}.0"
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Khiops"
VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "Orange"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright (c) 2024 Orange"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright (c) 2023-2025 Orange. All rights reserved."
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Khiops Installer"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${KHIOPS_VERSION}"

Expand Down
2 changes: 1 addition & 1 deletion scripts/update-copyright.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
byte_linesep = bytes(os.linesep, encoding="ascii")
copyright_banner_lines = [
bytes(
f"Copyright (c) {datetime.today().year} Orange. All rights reserved.",
f"Copyright (c) 2024 Orange. All rights reserved.",
encoding="ascii",
),
b"This software is distributed under the BSD 3-Clause-clear License, the text of which is available",
Expand Down
2 changes: 1 addition & 1 deletion src/Learning/KWUtils/KWKhiopsVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
// - KHIOPS_STR(10.5.0-rc.2)

// Copyright
#define KHIOPS_COPYRIGHT_LABEL KHIOPS_STR((c)2024 Orange - All rights reserved.)
#define KHIOPS_COPYRIGHT_LABEL KHIOPS_STR((c) 2023-2025 Orange. All rights reserved.)
2 changes: 1 addition & 1 deletion src/Learning/genum/GenumCommandLine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ boolean GenumCommandLine::InitializeParameters(int argc, char** argv)
if (sArgument == "-v")
{
cout << GetClassLabel() << " " << GENUM_VERSION << "\n ";
cout << "Copyright (C) 2022 Orange labs\n";
cout << GENUM_COPYRIGHT_LABEL << "\n";
bOk = false;
}
// Aide
Expand Down
2 changes: 1 addition & 1 deletion src/Learning/genum/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
#define GENUM_VERSION KHIOPS_STR(1.0)

// Copyright
#define GENUM_COPYRIGHT_LABEL KHIOPS_STR((c)2024 Orange.)
#define GENUM_COPYRIGHT_LABEL KHIOPS_STR((c) 2023-2025 Orange. All rights reserved.)
2 changes: 1 addition & 1 deletion src/Learning/genumfp/MHCommandLine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ const ALString MHCommandLine::InitializeParameters(int argc, char** argv)
if (sArgument == "-v")
{
cout << GetClassLabel() << " " << histogramSpec.GetVersion() << "\n ";
cout << "Copyright (C) 2022 Orange labs\n";
cout << GENUMFP_COPYRIGHT_LABEL << "\n";
bOk = false;
}
// Aide
Expand Down
1 change: 1 addition & 0 deletions src/Learning/genumfp/MHCommandLine.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "MHHistogramSpecView.h"
#include "MHTruncationDiscretizerHistogramMODL_fp.h"
#include "MHBin.h"
#include "Version.h"

////////////////////////////////////////////////////////////////
// Classe MHCommandLine
Expand Down
2 changes: 1 addition & 1 deletion src/Learning/genumfp/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
#define GENUMFP_VERSION KHIOPS_STR(1.0)

// Copyright
#define GENUMFP_COPYRIGHT_LABEL KHIOPS_STR((c)2024 Orange.)
#define GENUMFP_COPYRIGHT_LABEL KHIOPS_STR((c) 2023-2025 Orange. All rights reserved.)
14 changes: 7 additions & 7 deletions src/Norm/_khiopsgetprocnumber/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
// at https://spdx.org/licenses/BSD-3-Clause-Clear.html or see the "LICENSE" file for more details.

#pragma once
#define GPN_STR(s) #s
#define KHIOPS_STR(s) #s

// Constantes definies a la fois dans les sources et dans les ressources Visual Studio.
// Les ressources permettent d'afficher des informations sur les executables
// dans le TaskManager de Windows (par exemple)

// Version de Khiops
#define GPN_VERSION GPN_STR(1.0.0)
// Les versions release distribuees sont bases sur trois numeros, par exemple GPN_STR(10.2.0)
#define GPN_VERSION KHIOPS_STR(1.0.0)
// Les versions release distribuees sont bases sur trois numeros, par exemple KHIOPS_STR(10.2.0)
// Les versions alpha, beta ou release candidate ont un suffixe supplementaire, par exemple :
// - GPN_STR(10.5.0-a.1)
// - GPN_STR(10.5.0-b.3)
// - GPN_STR(10.5.0-rc.2)
// - KHIOPS_STR(10.5.0-a.1)
// - KHIOPS_STR(10.5.0-b.3)
// - KHIOPS_STR(10.5.0-rc.2)

// Copyright
#define GPN_COPYRIGHT_LABEL GPN_STR((c)2024 Orange - All rights reserved.)
#define GPN_COPYRIGHT_LABEL KHIOPS_STR((c) 2023-2025 Orange. All rights reserved.)

0 comments on commit e95f0c6

Please sign in to comment.