Commit 7a056a06 authored by jcfr's avatar jcfr
Browse files

COMP: Rename Slicer3Version.txt into SlicerVersion.txt

git-svn-id: http://svn.slicer.org/Slicer4/trunk@15107 3bd1e089-480b-0410-8dfb-8563597acbee
parent 1cdd1767
...@@ -1671,7 +1671,7 @@ void vtkSlicerApplication::InitializeSlicer3Version() ...@@ -1671,7 +1671,7 @@ void vtkSlicerApplication::InitializeSlicer3Version()
txtfile += "/../"; txtfile += "/../";
txtfile += Slicer_INSTALL_LIB_DIR; txtfile += Slicer_INSTALL_LIB_DIR;
txtfile += "/"; txtfile += "/";
txtfile += "Slicer3Version.txt"; txtfile += "SlicerVersion.txt";
std::string platform(""); std::string platform("");
std::string build_date(""); std::string build_date("");
......
...@@ -367,7 +367,7 @@ ENDIF() ...@@ -367,7 +367,7 @@ ENDIF()
option(Slicer_USE_MIDAS "Build Slicer with MIDAS support." OFF) option(Slicer_USE_MIDAS "Build Slicer with MIDAS support." OFF)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
## OpenIGTLink (Built in Slicer3-lib) ## OpenIGTLink
option(Slicer_USE_OPENIGTLINK "Build Slicer with OpenIGTLink support." OFF) option(Slicer_USE_OPENIGTLINK "Build Slicer with OpenIGTLink support." OFF)
IF(Slicer_USE_OPENIGTLINK) IF(Slicer_USE_OPENIGTLINK)
find_package(OpenIGTLink REQUIRED) find_package(OpenIGTLink REQUIRED)
...@@ -563,7 +563,7 @@ INSTALL(FILES ...@@ -563,7 +563,7 @@ INSTALL(FILES
) )
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Generate Slicer3Version.txt # Generate SlicerVersion.txt
INCLUDE(${Slicer_CMAKE_DIR}/SlicerTodayMacro.cmake) INCLUDE(${Slicer_CMAKE_DIR}/SlicerTodayMacro.cmake)
...@@ -585,8 +585,8 @@ ENDIF() ...@@ -585,8 +585,8 @@ ENDIF()
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.svn) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.svn)
Subversion_WC_INFO(${CMAKE_CURRENT_SOURCE_DIR} Slicer3) Subversion_WC_INFO(${CMAKE_CURRENT_SOURCE_DIR} Slicer3)
CONFIGURE_FILE( CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/Slicer3Version.txt.in ${CMAKE_CURRENT_SOURCE_DIR}/SlicerVersion.txt.in
${Slicer_HOME}/lib/Slicer3/Slicer3Version.txt ${Slicer_HOME}/lib/Slicer3/SlicerVersion.txt
) )
ENDIF() ENDIF()
...@@ -598,8 +598,8 @@ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git) ...@@ -598,8 +598,8 @@ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
ENDIF(NOT Git_FOUND) ENDIF(NOT Git_FOUND)
Git_WC_INFO(${CMAKE_CURRENT_SOURCE_DIR} Slicer3) Git_WC_INFO(${CMAKE_CURRENT_SOURCE_DIR} Slicer3)
CONFIGURE_FILE( CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/Slicer3Version.txt.in ${CMAKE_CURRENT_SOURCE_DIR}/SlicerVersion.txt.in
${Slicer_HOME}/lib/Slicer3/Slicer3Version.txt ${Slicer_HOME}/lib/Slicer3/SlicerVersion.txt
) )
ENDIF() ENDIF()
...@@ -853,7 +853,7 @@ install(FILES ...@@ -853,7 +853,7 @@ install(FILES
${Slicer3_SOURCE_DIR}/CTestConfig.cmake ${Slicer3_SOURCE_DIR}/CTestConfig.cmake
${Slicer3_BINARY_DIR}/UseSlicer3.cmake ${Slicer3_BINARY_DIR}/UseSlicer3.cmake
${Slicer3_BINARY_DIR}/Utilities/Slicer3Config.cmake ${Slicer3_BINARY_DIR}/Utilities/Slicer3Config.cmake
${Slicer3_BINARY_DIR}/lib/Slicer3/Slicer3Version.txt ${Slicer3_BINARY_DIR}/lib/Slicer3/SlicerVersion.txt
DESTINATION ${Slicer_INSTALL_LIB_DIR} DESTINATION ${Slicer_INSTALL_LIB_DIR}
COMPONENT Development COMPONENT Development
) )
...@@ -230,7 +230,7 @@ if { $::isWindows } { ...@@ -230,7 +230,7 @@ if { $::isWindows } {
vputs "making with $::MAKE" vputs "making with $::MAKE"
# get the slicer version information # get the slicer version information
loadArray $::Slicer3_BUILD/lib/Slicer3/Slicer3Version.txt slicerVersion loadArray $::Slicer3_BUILD/lib/Slicer3/SlicerVersion.txt slicerVersion
set len [string length "http://svn.slicer.org/Slicer3/"] set len [string length "http://svn.slicer.org/Slicer3/"]
set ::EXTEND(slicerSVNSubpath) [string range $slicerVersion(svnurl) $len end] set ::EXTEND(slicerSVNSubpath) [string range $slicerVersion(svnurl) $len end]
set ::EXTEND(slicerSVNRevision) $slicerVersion(svnrevision) set ::EXTEND(slicerSVNRevision) $slicerVersion(svnrevision)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# #
# versioner.tcl # versioner.tcl
# #
# adds a lib/Slicer3/Slicer3Version.txt file to the current build # adds a lib/Slicer3/SlicerVersion.txt file to the current build
# #
# Usage: (no options) # Usage: (no options)
# versioner # versioner
...@@ -62,7 +62,7 @@ set versionText "${versionText}buildDate $::Slicer3_BUILDDATE\n" ...@@ -62,7 +62,7 @@ set versionText "${versionText}buildDate $::Slicer3_BUILDDATE\n"
set versionText "${versionText}svnurl $svn(URL)\n" set versionText "${versionText}svnurl $svn(URL)\n"
set versionText "${versionText}svnrevision $svn(revision)\n" set versionText "${versionText}svnrevision $svn(revision)\n"
set versionFile $::Slicer3_BUILD/lib/Slicer3/Slicer3Version.txt set versionFile $::Slicer3_BUILD/lib/Slicer3/SlicerVersion.txt
puts "Writing version information to $versionFile" puts "Writing version information to $versionFile"
puts $versionText puts $versionText
set fp [open $versionFile "w"] set fp [open $versionFile "w"]
......
...@@ -461,7 +461,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/ExternalProjectDependencies.txt "${ep_dep ...@@ -461,7 +461,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/ExternalProjectDependencies.txt "${ep_dep
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Configure and build Slicer # Configure and build Slicer
# Note that the Slicer3Version.txt file will be created at configuration time # Note that the SlicerVersion.txt file will be created at configuration time
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
set(proj Slicer3) set(proj Slicer3)
......
...@@ -1172,7 +1172,7 @@ proc launch_ImportModulePaths {} { ...@@ -1172,7 +1172,7 @@ proc launch_ImportModulePaths {} {
# we should have the module paths now # we should have the module paths now
# parse the svn revision of the version file # parse the svn revision of the version file
set dp [open "$::env(Slicer_HOME)/lib/Slicer3/Slicer3Version.txt" r] set dp [open "$::env(Slicer_HOME)/lib/Slicer3/SlicerVersion.txt" r]
set data [read $dp] set data [read $dp]
close $dp close $dp
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment