versions: unify version variable names

bareos · Jan 18, 2019 · cad448c · cad448c
1 parent 61256c2
commit cad448c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/webui/CMakeLists.txt b/webui/CMakeLists.txt
@@ -25,12 +25,11 @@ set(CMAKE_MODULE_PATH
          ${CMAKE_MODULE_PATH}
          ${PROJECT_SOURCE_DIR}/cmake)
 
-IF (NOT DEFINED FULLVERSION)
+IF (NOT DEFINED VERSION_STRING)
   # try to get version info from version.h
   INCLUDE(BareosExtractVersionInfo)
 ELSE()
-  # we got FULLVERSION from cmake commandline
-  string(REGEX MATCH [0-9.]+ VERSION ${FULLVERSION})
+  # we got VERSION_STRING from cmake commandline
 ENDIF()
 
 
@@ -63,9 +62,11 @@ MESSAGE("   PHP is ${PHP} ")
 MESSAGE("   Install system config files:  ${sysconfdir} ")
 MESSAGE("   Install Bareos config dir:    ${confdir} ")
 MESSAGE("   Install BareosWebui configdir:${webuiconfdir} ")
-MESSAGE("   Version is ${BAREOS_NUMERIC_VERSION} ")
-STRING(REGEX REPLACE "\"" "" FULLVERSION  ${BAREOS_FULL_VERSION} )
-MESSAGE("   FullVersion is ${FULLVERSION} ")
+STRING(REGEX REPLACE "\"" "" BAREOS_FULL_VERSION  ${VERSION_STRING} )
+string(REGEX MATCH [0-9.]+ BAREOS_NUMERIC_VERSION ${VERSION_STRING})
+MESSAGE("   VERSION_STRING is ${VERSION_STRING} ")
+MESSAGE("   BAREOS_FULL_VERSION is ${BAREOS_FULL_VERSION} ")
+MESSAGE("   BAREOS_NUMERIC_VERSION is ${VERSION_STRING} ")
 
 
 IF (EXISTS ${sysconfdir}/httpd/conf.d)

diff --git a/webui/vendor/Bareos/library/Bareos/BSock/BareosBSock.php b/webui/vendor/Bareos/library/Bareos/BSock/BareosBSock.php
@@ -613,7 +613,7 @@ private function login()
 
       if(isset($this->config['console_name'])) {
          $bashed_console_name = self::bash_spaces($this->config['console_name']);
-         $DIR_HELLO = "Hello " . $bashed_console_name . " calling version $bareos_version_short\n";
+         $DIR_HELLO = "Hello " . $bashed_console_name . " calling version $bareos_numeric_version\n";
       } else {
          $DIR_HELLO = "Hello *UserAgent* calling\n";
       }

diff --git a/webui/version.php.in b/webui/version.php.in
@@ -1,4 +1,4 @@
 <?php
-   $bareos_version_long = "@FULLVERSION@";
-   $bareos_version_short = "@VERSION@";
+   $bareos_full_version = "@BAREOS_FULL_VERSION@";
+   $bareos_numeric_version = "@BAREOS_NUMERIC_VERSION@";
 ?>