Commit 93b74ac0 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

version 1.0.0 release candidate

parent a267ed78

Makefile.version

+4 −3
Original line number Diff line number Diff line
@@ -5,14 +5,15 @@ export PROJLIB=lib$(PROJECT).a 
export PROJARCH=$(PROJECT)-$(VERSION_MAJOR).$(VERSION_MINOR)





export VERSION_MAJOR=0

export VERSION_MINOR=63

export VERSION_MAJOR=1

export VERSION_MINOR=0

export VERSION_RELEASE=0



git_rev=$(shell git rev-parse --short HEAD 2> /dev/null)

ifeq "$(git_rev)" ""

   git_rev='dev'

endif

export VERSION_RELEASE=$(git_rev)

export BUILD_REVISION=$(git_rev)



#git_tag=$(shell git describe --tags --abbrev=0 HEAD 2> /dev/null)

#ifeq "$(git_tag)" ""

sources/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ 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)



HASMAKEDEP := $(and $(MAKEDEPEND),$(MAKEDEPF90))

sources/drspine_version.F90

+11 −8
Original line number Diff line number Diff line
@@ -12,9 +12,10 @@ module drspine_version 
  integer, parameter :: VAR_NAME_LEN =    8

  integer, parameter :: STR_NAME_LEN  = 512

  !

  integer, parameter :: VERSION_MAJOR = _VERSION_MAJOR_

  integer, parameter :: VERSION_MINOR = _VERSION_MINOR_

  character(len=*), parameter :: VERSION_RELEASE = _VERSION_RELEASE_

  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 :: 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
@@ -31,15 +32,17 @@ 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

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



    write(cmaj,'(i0)') VERSION_MAJOR

    write(cmin,'(i0)') VERSION_MINOR

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

    !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))

    if ( present(short_version) ) then

        if ( short_version ) return

    end if

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

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

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

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