Update copyright and website labels

KhiopsML · Nov 22, 2023 · 8b25cdc · 8b25cdc
1 parent 074784d
commit 8b25cdc
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 36 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ project(
   Khiops
   LANGUAGES CXX
   VERSION ${VERSION}
-  HOMEPAGE_URL "khiops.com")
+  HOMEPAGE_URL "https://khiops.org")
 
 # Specify CMake policies
 cmake_policy(SET CMP0015 NEW)

diff --git a/packaging/common/khiops/README.txt b/packaging/common/khiops/README.txt
@@ -1,6 +1,6 @@
 Khiops 10.0
 ===========
-  (c) 2023 Orange Labs - All rights reserved.
+  (c) 2023 Orange - All rights reserved.
   https://khiops.org
 
 Khiops is a fully automatic tool for mining large multi-table databases,

diff --git a/packaging/packaging.cmake b/packaging/packaging.cmake
@@ -1,5 +1,5 @@
 set(CPACK_PACKAGE_VENDOR Orange)
-set(CPACK_PACKAGE_HOMEPAGE_URL khiops.com)
+set(CPACK_PACKAGE_HOMEPAGE_URL https://khiops.org)
 set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/packaging/common/images/khiops.png")
 set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 set(CPACK_PACKAGE_VENDOR "Orange")

diff --git a/packaging/windows/nsis/khiops.nsi b/packaging/windows/nsis/khiops.nsi
@@ -103,7 +103,7 @@ Var /GLOBAL SamplesInstallDir
 !define MUI_ABORTWARNING
 !define MUI_ICON ".\images\installer.ico"
 !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-BrandingText "Orange Innovation"
+BrandingText "Orange"
 
 # Welcome page
 !define MUI_WELCOMEPAGE_TITLE "Welcome to the Khiops ${KHIOPS_VERSION} Setup Wizard"
@@ -369,7 +369,7 @@ Section "Install" SecInstall
   WriteRegStr HKLM "${UninstallerKey}\Khiops" "UninstallString" '"$INSTDIR\uninstall-khiops.exe"'
   WriteRegStr HKLM "${UninstallerKey}\Khiops" "InstallLocation" "$INSTDIR"
   WriteRegStr HKLM "${UninstallerKey}\Khiops" "DisplayName" "Khiops"
-  WriteRegStr HKLM "${UninstallerKey}\Khiops" "Publisher" "Orange Labs"
+  WriteRegStr HKLM "${UninstallerKey}\Khiops" "Publisher" "Orange"
   WriteRegStr HKLM "${UninstallerKey}\Khiops" "DisplayIcon" "$INSTDIR\bin\icons\installer.ico"
   WriteRegStr HKLM "${UninstallerKey}\Khiops" "DisplayVersion" "${KHIOPS_VERSION}"
   WriteRegStr HKLM "${UninstallerKey}\Khiops" "URLInfoAbout" "http://khiops.org"

diff --git a/src/Learning/KNITransfer/KNIRecodeFile.cpp b/src/Learning/KNITransfer/KNIRecodeFile.cpp
@@ -2,11 +2,6 @@
 // This software is distributed under the BSD 3-Clause-clear License, the text of which is available
 // at https://spdx.org/licenses/BSD-3-Clause-Clear.html or see the "LICENSE" file for more details.
 
-/******************************************************************************
- * Khiops Native Interface (KNI)
- * Copyright (c) 2022 Orange Labs. All rights reserved.
- *****************************************************************************/
-
 #ifdef _MSC_VER
 // To disable fopen warnings (Visual C++ deprecated method)
 #define _CRT_SECURE_NO_WARNINGS

diff --git a/src/Learning/KNITransfer/KNIRecodeFile.h b/src/Learning/KNITransfer/KNIRecodeFile.h
@@ -3,11 +3,6 @@
 // at https://spdx.org/licenses/BSD-3-Clause-Clear.html or see the "LICENSE" file for more details.
 
 #pragma once
-/******************************************************************************
- * Khiops Native Interface (KNI)
- * Copyright (c) 2022 Orange Labs. All rights reserved.
- *****************************************************************************/
-
 /*
  * Recode an input file to an output file, using a Khiops dictionary from a dictionary file
  * The input file must have a header line, describing the structure of all its instances

diff --git a/src/Learning/KNITransfer/KNIRecodeMTFiles.cpp b/src/Learning/KNITransfer/KNIRecodeMTFiles.cpp
@@ -2,11 +2,6 @@
 // This software is distributed under the BSD 3-Clause-clear License, the text of which is available
 // at https://spdx.org/licenses/BSD-3-Clause-Clear.html or see the "LICENSE" file for more details.
 
-/******************************************************************************
- * Khiops Native Interface (KNI)
- * Copyright (c) 2022 Orange Labs. All rights reserved.
- *****************************************************************************/
-
 #ifdef _MSC_VER
 // To disable fopen warnings (Visual C++ deprecated method)
 #define _CRT_SECURE_NO_WARNINGS

diff --git a/src/Learning/KNITransfer/KNIRecodeMTFiles.h b/src/Learning/KNITransfer/KNIRecodeMTFiles.h
@@ -3,11 +3,6 @@
 // at https://spdx.org/licenses/BSD-3-Clause-Clear.html or see the "LICENSE" file for more details.
 
 #pragma once
-/******************************************************************************
- * Khiops Native Interface (KNI)
- * Copyright (c) 2022 Orange Labs. All rights reserved.
- *****************************************************************************/
-
 /*
  * Recode a set of multi-tables input files to an output file.
  * See main function mainKNIRecodeMTFiles(argc, argv).

diff --git a/src/Learning/KWUtils/KWKhiopsVersion.h b/src/Learning/KWUtils/KWKhiopsVersion.h
@@ -13,4 +13,4 @@
 #define KHIOPS_VERSION str(10.1.5)
 
 // Copyright
-#define KHIOPS_COPYRIGHT_LABEL str((c)2023 Orange Labs - All rights reserved.)
+#define KHIOPS_COPYRIGHT_LABEL str((c)2023 Orange - All rights reserved.)
diff --git a/src/Learning/KhiopsNativeInterface/KhiopsNativeInterface.h b/src/Learning/KhiopsNativeInterface/KhiopsNativeInterface.h
@@ -3,10 +3,6 @@
 // at https://spdx.org/licenses/BSD-3-Clause-Clear.html or see the "LICENSE" file for more details.
 
 #pragma once
-/******************************************************************************
- * Khiops Native Interface (KNI)
- * Copyright (c) 2022 Orange Labs. All rights reserved.
- *****************************************************************************/
 
 /* Use of C linkage from C++ */
 #ifdef __cplusplus

diff --git a/src/Learning/MODL_Coclustering/CCLearningProject.cpp b/src/Learning/MODL_Coclustering/CCLearningProject.cpp
@@ -27,7 +27,7 @@ void CCLearningProject::OpenLearningEnvironnement()
 
 	// Parametrage du menu about
 	SetLearningAboutImage("images/khiops_coclustering_about.gif");
-	SetLearningWebSite("www.khiops.com");
+	SetLearningWebSite("https://khiops.org");
 
 	// Documentation
 	sDocumentation += "<h4> Reference Guide and Tutorial </h4>"

diff --git a/src/Learning/genum/Version.h b/src/Learning/genum/Version.h
@@ -13,4 +13,4 @@
 #define GENUM_VERSION str(1.0)
 
 // Copyright
-#define GENUM_COPYRIGHT_LABEL str((c)2022 Orange Labs.)
+#define GENUM_COPYRIGHT_LABEL str((c)2023 Orange.)
diff --git a/src/Learning/genumfp/Version.h b/src/Learning/genumfp/Version.h
@@ -13,4 +13,4 @@
 #define GENUMFP_VERSION str(1.0)
 
 // Copyright
-#define GENUMFP_COPYRIGHT_LABEL str((c)2022 Orange Labs.)
+#define GENUMFP_COPYRIGHT_LABEL str((c)2023 Orange.)
diff --git a/src/Norm/basetest/UITest.cpp b/src/Norm/basetest/UITest.cpp
@@ -223,7 +223,7 @@ void FormattedLabelCard::Test()
 		"<li> Tutorial: KhiopsTutorial.pdf\n"
 		"</ul>\n"
 		"<h3> See doc directory under Khiops installation directory. </h3> <p>\n"
-		"<a href=\"http://www.khiops.com\">Khiops (c) Orange Labs software for data mining</a> \n"
+		"<a href=\"http://khiops.org\">Khiops (c) Orange software for data mining</a> \n"
 		"</html>";
 
 	// Parametrage de la boite et ouverture
@@ -259,7 +259,7 @@ LabelCard::LabelCard()
 	// Chaine de caracteres dans UriLabel
 	AddStringField("FourthText", "", "");
 	GetFieldAt("FourthText")->SetStyle("UriLabel");
-	GetFieldAt("FourthText")->SetParameters("www.khiops.com");
+	GetFieldAt("FourthText")->SetParameters("khiops.org");
 }
 
 LabelCard::~LabelCard() {}
@@ -279,7 +279,7 @@ void LabelCard::Test()
 		"<li> Tutorial: KhiopsTutorial.pdf\n"
 		"</ul>\n"
 		"<h3> See doc directory under Khiops installation directory. </h3> <p>\n"
-		"<a href=\"http://www.khiops.com\">Khiops (c) Orange Labs software for data mining</a> \n";
+		"<a href=\"http://khiops.org\">Khiops (c) Orange software for data mining</a> \n";
 
 	// Parametrage de la boite et ouverture
 	UIObject::SetUIMode(UIObject::Graphic);