diff --git a/core/config.class.inc.php b/core/config.class.inc.php index 5107d09d2..41c756984 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -27,12 +27,21 @@ define('ITOP_APPLICATION_SHORT', 'iTop'); * Constant containing the application version * Warning: this might be different from iTop core version! * - * @see ITOP_DESIGN_LATEST_VERSION for iTop core version - * - * @used-by utils::GetItopPatchVersion + * @see ITOP_CORE_VERSION to get iTop core version */ define('ITOP_VERSION', '2.7.0-dev'); +/** + * Constant containing the iTop core version, whatever application was built + * + * Note that in iTop 3.0.0 we used {@see ITOP_DESIGN_LATEST_VERSION} to get core version. + * When releasing, both constants should be updated : see `.make/release/update-versions.php` for that ! + * + * @since 2.7.7 3.0.1 3.1.1 N°4714 constant creation + * @used-by utils::GetItopPatchVersion + */ +define('ITOP_CORE_VERSION', '2.7.7'); + define('ITOP_REVISION', 'svn'); define('ITOP_BUILD_DATE', '$WCNOW$'); define('ITOP_VERSION_FULL', ITOP_VERSION.'-'.ITOP_REVISION); diff --git a/setup/itopdesignformat.class.inc.php b/setup/itopdesignformat.class.inc.php index f588c8dd4..e0fbc84dd 100644 --- a/setup/itopdesignformat.class.inc.php +++ b/setup/itopdesignformat.class.inc.php @@ -20,9 +20,11 @@ /** * iTop Datamodel XML format version - * And also iTop core version * - * To test for iTop core version use this constant instead of {@link ITOP_VERSION} ! + * It was also used in iTop 3.0.0 to get iTop core version (instead of {@see ITOP_VERSION} which gives the application version). + * To address this need you should now use {@see ITOP_CORE_VERSION} + * + * @see ITOP_CORE_VERSION to get full iTop core version */ define('ITOP_DESIGN_LATEST_VERSION', '1.7');