Commit 5fd2a7fb authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

version bump, and allow string version release 

so now we can have e.g. version 1.4.0-rc2
parent 6b1a96da

Makefile.version

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ export PROJECT=drspine 


export VERSION_MAJOR=1

export VERSION_MINOR=3

export VERSION_RELEASE=5

export VERSION_RELEASE=6



export PROJLIB=lib$(PROJECT).a

export PROJARCH=$(PROJECT)-$(VERSION_MAJOR).$(VERSION_MINOR)

sources/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ LDLIBS += -lGR 
endif



DEFINES+=-D_DEFAULT_INSTRUMENT_=$(INSTRUMENT)

DEFINES+=-D_VERSION_MAJOR_=$(VERSION_MAJOR) -D_VERSION_MINOR_=$(VERSION_MINOR) -D_VERSION_RELEASE_=$(VERSION_RELEASE)

DEFINES+=-D_VERSION_MAJOR_=$(VERSION_MAJOR) -D_VERSION_MINOR_=$(VERSION_MINOR) -D_VERSION_RELEASE_=\"$(VERSION_RELEASE)\"

DEFINES+=-D_BUILD_REVISION_=\"$(BUILD_REVISION)\"

LDLIBS:=$(PROJLIB) $(LDLIBS)

sources/drspine_version.F90

+4 −14
Original line number Diff line number Diff line
@@ -14,15 +14,13 @@ module drspine_version 
  !

  integer, parameter :: VERSION_MAJOR   = _VERSION_MAJOR_   ! major revision code

  integer, parameter :: VERSION_MINOR   = _VERSION_MINOR_   ! minor revision code

  integer, parameter :: VERSION_RELEASE = _VERSION_RELEASE_ ! release number

  character(len=*), parameter :: VERSION_RELEASE = _VERSION_RELEASE_ ! release number

  character(len=*), parameter :: BUILD_REVISION  = _BUILD_REVISION_ ! git SHA1 revision

  character(len=*), parameter :: BUILD_DATE = __DATE__

  character(len=*), parameter :: BUILD_TIME = __TIME__

! Intel puts way too much info

#if defined(__INTEL_COMPILER)

  character(len=*), parameter :: COMPILER = "Intel(R) Fortran"

!#elif   defined(__GFORTRAN__)

!  character(len=*), parameter :: COMPILER = "GCC Fortran"

#else

  character(len=*), parameter :: COMPILER = compiler_version()

#endif
@@ -32,20 +30,12 @@ contains 
  function drspine_libversion(short_version) result(cresult)

    logical, intent(in), optional :: short_version

    character(len=STR_NAME_LEN) :: cresult

    !character(len=VAR_NAME_LEN) :: cmaj, cmin, crev



    !write(cmaj,'(i0)') VERSION_MAJOR

    !write(cmin,'(i0)') VERSION_MINOR

    !write(crev,'(i0)') VERSION_RELEASE

    write(cresult,'(i0,".",i0,".",i0)') VERSION_MAJOR, VERSION_MINOR, VERSION_RELEASE

    !cresult = adjustl(adjustr(cmaj)//"."//adjustl(cmin))

    write(cresult,'(i0,".",i0)') VERSION_MAJOR, VERSION_MINOR

    if ( present(short_version) ) then

        if ( short_version ) return

    end if

    cresult = trim(cresult)//"-"//trim(BUILD_REVISION)//" "//&

         "(build on "//trim(BUILD_DATE)//" "//trim(BUILD_TIME)//&

         " with "//trim(COMPILER)//")"



    cresult = trim(cresult)//"."//trim(VERSION_RELEASE)//" (build: "//trim(BUILD_REVISION)//&

         " on "//trim(BUILD_DATE)//" "//trim(BUILD_TIME)//" with "//trim(COMPILER)//")"

  end function drspine_libversion



end module drspine_version