Changeset 8501

Show
Ignore:
Timestamp:
09/20/10 15:14:12 (3 years ago)
Author:
mtmoore
Message:

change configure back to non-release

Location:
branches/Orange-Branch
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • branches/Orange-Branch/configure

    r8500 r8501  
    686686build_cpu 
    687687build 
    688 PVFS2_VERSION_RELEASE 
    689688PVFS2_VERSION_SUB 
    690689PVFS2_VERSION_MINOR 
    … …  
    24742473PVFS2_VERSION_MINOR=8 
    24752474PVFS2_VERSION_SUB=2 
    2476 PVFS2_VERSION_RELEASE="orangefs-20100920" 
     2475#PVFS2_VERSION_RELEASE="orangefs-20100920" 
    24772476#PVFS2_PRE="" 
    2478 #PVFS2_VERSION_PRE="-orangefs-$CONFIGURE_TIME" 
    2479  
    2480 PVFS2_VERSION=$PVFS2_VERSION_MAJOR.$PVFS2_VERSION_MINOR.$PVFS2_VERSION_SUB-$PVFS2_VERSION_RELEASE 
     2477PVFS2_VERSION_PRE="orangefs-$CONFIGURE_TIME" 
     2478 
     2479PVFS2_VERSION=$PVFS2_VERSION_MAJOR.$PVFS2_VERSION_MINOR.$PVFS2_VERSION_SUB-$PVFS2_VERSION_PRE 
    24812480 
    24822481 
    … …  
    24952494_ACEOF 
    24962495 
    2497  
    2498 cat >>confdefs.h <<_ACEOF 
    2499 #define PVFS2_VERSION_RELEASE $PVFS2_VERSION_RELEASE 
    2500 _ACEOF 
    2501  
    2502  
    2503  
    2504  
    2505  
     2496#AC_DEFINE_UNQUOTED(PVFS2_VERSION_RELEASE, $PVFS2_VERSION_RELEASE, release version number) 
     2497 
     2498 
     2499 
     2500#AC_SUBST(PVFS2_VERSION_RELEASE) 
    25062501 
    25072502 

  • branches/Orange-Branch/configure.in

    r8500 r8501  
    2020PVFS2_VERSION_MINOR=8 
    2121PVFS2_VERSION_SUB=2 
    22 PVFS2_VERSION_RELEASE="orangefs-20100920" 
     22#PVFS2_VERSION_RELEASE="orangefs-20100920" 
    2323#PVFS2_PRE="" 
    24 #PVFS2_VERSION_PRE="-orangefs-$CONFIGURE_TIME" 
    25  
    26 PVFS2_VERSION=$PVFS2_VERSION_MAJOR.$PVFS2_VERSION_MINOR.$PVFS2_VERSION_SUB-$PVFS2_VERSION_RELEASE 
     24PVFS2_VERSION_PRE="orangefs-$CONFIGURE_TIME" 
     25 
     26PVFS2_VERSION=$PVFS2_VERSION_MAJOR.$PVFS2_VERSION_MINOR.$PVFS2_VERSION_SUB-$PVFS2_VERSION_PRE 
    2727AC_SUBST(PVFS2_VERSION) 
    2828AC_DEFINE_UNQUOTED(PVFS2_VERSION_MAJOR, $PVFS2_VERSION_MAJOR, major version number) 
    2929AC_DEFINE_UNQUOTED(PVFS2_VERSION_MINOR, $PVFS2_VERSION_MINOR, minor version number) 
    3030AC_DEFINE_UNQUOTED(PVFS2_VERSION_SUB, $PVFS2_VERSION_SUB, sub version number) 
    31 AC_DEFINE_UNQUOTED(PVFS2_VERSION_RELEASE, $PVFS2_VERSION_RELEASE, release version number) 
     31#AC_DEFINE_UNQUOTED(PVFS2_VERSION_RELEASE, $PVFS2_VERSION_RELEASE, release version number) 
    3232AC_SUBST(PVFS2_VERSION_MAJOR) 
    3333AC_SUBST(PVFS2_VERSION_MINOR) 
    3434AC_SUBST(PVFS2_VERSION_SUB) 
    35 AC_SUBST(PVFS2_VERSION_RELEASE) 
     35#AC_SUBST(PVFS2_VERSION_RELEASE) 
    3636 
    3737dnl BMI_ONLY_TAG 

  • branches/Orange-Branch/pvfs2-config.h.in

    r8500 r8501  
    460460/* minor version number */ 
    461461#undef PVFS2_VERSION_MINOR 
    462  
    463 /* release version number */ 
    464 #undef PVFS2_VERSION_RELEASE 
    465462 
    466463/* sub version number */