Mercurial > octave-nkf
changeset 15167:1c711a646fa7
Deprecate configure variables CC_VERSION, CXX_VERSION.
Replaced with GCC_VERSION, GXX_VERSION.
* NEWS: Announce deprecated variables CC_VERSION, CXX_VERSION.
* common.mk: Add new substitutions for GCC_VERSION, GXX_VERSION
* configure.ac: Add new substitutions for GCC_VERSION, GXX_VERSION
* toplev.cc (Foctave_config_info): Add variables OCTAVE_CONF_GCC_VERSION,
OCTAVE_CONF_GXX_VERSION to configure info report.
* oct-conf.in.h: Add variables OCTAVE_CONF_GCC_VERSION,
OCTAVE_CONF_GXX_VERSION to header file.
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 13 Aug 2012 14:04:26 -0700 |
| parents | 8750f2cdc4f1 |
| children | 66dcad99b55e |
| files | NEWS build-aux/common.mk configure.ac src/interpfcn/toplev.cc src/oct-conf.in.h |
| diffstat | 5 files changed, 43 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Mon Aug 13 12:56:53 2012 -0700 +++ b/NEWS Mon Aug 13 14:04:26 2012 -0700 @@ -77,6 +77,9 @@ January 1st of the current year. The previous default was the current day, month, and year. This may produce changes in existing scripts. + ** The default name of the Octave crash dump file is now called + octave-workspace instead of octave-core. + ** Other new functions added in 3.8.0: betaincinv erfcinv splinefit @@ -84,9 +87,6 @@ cmunique fminsearch rgbplot colorcube lines shrinkfaces - ** The default name of the Octave crash dump file is now called - octave-workspace instead of octave-core. - ** Deprecated functions. The following functions were deprecated in Octave 3.4 and have been @@ -110,6 +110,14 @@ static + The following configuration variables have been deprecated in Octave + 3.8 and will be removed from Octave 3.12 (or whatever version is the + second major release after 3.8): + + CC_VERSION (now GCC_VERSION) + CXX_VERSION (now GXX_VERSION) + + Summary of important user-visible changes for version 3.6: ---------------------------------------------------------
--- a/build-aux/common.mk Mon Aug 13 12:56:53 2012 -0700 +++ b/build-aux/common.mk Mon Aug 13 14:04:26 2012 -0700 @@ -111,7 +111,9 @@ UGLY_DEFS = @UGLY_DEFS@ CC = @CC@ +## FIXME: CC_VERSION is deprecated and should be removed in version 3.12 CC_VERSION = @CC_VERSION@ +GCC_VERSION = @GCC_VERSION@ CONFIGURE_CFLAGS = @CFLAGS@ CPICFLAG = @CPICFLAG@ XTRA_CFLAGS = @XTRA_CFLAGS@ @@ -133,7 +135,9 @@ GRAPHICS_CFLAGS = @GRAPHICS_CFLAGS@ CXX = @CXX@ +## FIXME: CXX_VERSION is deprecated and should be removed in version 3.12 CXX_VERSION = @CXX_VERSION@ +GXX_VERSION = @GXX_VERSION@ CXXCPP = @CXXCPP@ CONFIGURE_CXXFLAGS = @CXXFLAGS@ CXXPICFLAG = @CXXPICFLAG@ @@ -506,6 +510,8 @@ -e "s|%OCTAVE_CONF_DL_LD%|\"${DL_LD}\"|" \ -e "s|%OCTAVE_CONF_DL_LDFLAGS%|\"${DL_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_DL_LIBS%|\"${DL_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_GCC_VERSION%|\"${GCC_VERSION}\"|" \ + -e "s|%OCTAVE_CONF_GXX_VERSION%|\"${GXX_VERSION}\"|" \ -e "s|%OCTAVE_CONF_EXEEXT%|\"${EXEEXT}\"|" \ -e "s|%OCTAVE_CONF_F77%|\"${F77}\"|" \ -e "s|%OCTAVE_CONF_F77_FLOAT_STORE_FLAG%|\"${F77_FLOAT_STORE_FLAG}\"|" \
--- a/configure.ac Mon Aug 13 12:56:53 2012 -0700 +++ b/configure.ac Mon Aug 13 14:04:26 2012 -0700 @@ -232,7 +232,7 @@ ### Check version number when using g++. -CXX_VERSION= +GXX_VERSION= if test "$GXX" = yes; then gxx_version=`$CXX -v 2>&1 | grep "^.*g.. version" | \ sed -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//' -e 's/ .*//'` @@ -242,8 +242,12 @@ AC_MSG_ERROR([g++ version $gxx_version will probably fail to compile Octave]) ;; esac - CXX_VERSION="$gxx_version" + GXX_VERSION="$gxx_version" fi +AC_SUBST(GXX_VERSION) + +## FIXME: CXX_VERSION is deprecated and should be removed in version 3.12 +CXX_VERSION="$gxx_version" AC_SUBST(CXX_VERSION) ### Determine which C compiler to use (we expect to find gcc). @@ -277,7 +281,7 @@ ### Check version number when using gcc. -CC_VERSION= +GCC_VERSION= if test "$GCC" = yes; then gcc_version=`$CC -v 2>&1 | grep "^.*gcc version" | \ sed -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//'` @@ -287,10 +291,14 @@ OCTAVE_CONFIGURE_WARNING([warn_gcc_version]) ;; esac - CC_VERSION="$gcc_version" + GCC_VERSION="$gcc_version" fi AC_SUBST(CC_VERSION) +## FIXME: CC_VERSION is deprecated and should be removed in version 3.12 +CC_VERSION="$gcc_version" +AC_SUBST(GCC_VERSION) + ### Determine the compiler flag necessary to create dependencies ## Assume GCC.
--- a/src/interpfcn/toplev.cc Mon Aug 13 12:56:53 2012 -0700 +++ b/src/interpfcn/toplev.cc Mon Aug 13 14:04:26 2012 -0700 @@ -1254,6 +1254,7 @@ { false, "CAMD_LDFLAGS", OCTAVE_CONF_CAMD_LDFLAGS }, { false, "CAMD_LIBS", OCTAVE_CONF_CAMD_LIBS }, { false, "CC", OCTAVE_CONF_CC }, + // FIXME: CC_VERSION is deprecated. Remove in version 3.12 { false, "CC_VERSION", OCTAVE_CONF_CC_VERSION }, { false, "CCOLAMD_CPPFLAGS", OCTAVE_CONF_CCOLAMD_CPPFLAGS }, { false, "CCOLAMD_LDFLAGS", OCTAVE_CONF_CCOLAMD_LDFLAGS }, @@ -1277,12 +1278,15 @@ { false, "CXXCPP", OCTAVE_CONF_CXXCPP }, { false, "CXXFLAGS", OCTAVE_CONF_CXXFLAGS }, { false, "CXXPICFLAG", OCTAVE_CONF_CXXPICFLAG }, + // FIXME: CXX_VERSION is deprecated. Remove in version 3.12 { false, "CXX_VERSION", OCTAVE_CONF_CXX_VERSION }, { false, "DEFAULT_PAGER", OCTAVE_DEFAULT_PAGER }, { false, "DEFS", OCTAVE_CONF_DEFS }, { false, "DL_LD", OCTAVE_CONF_DL_LD }, { false, "DL_LDFLAGS", OCTAVE_CONF_DL_LDFLAGS }, { false, "DL_LIBS", OCTAVE_CONF_DL_LIBS }, + { false, "GCC_VERSION", OCTAVE_CONF_GCC_VERSION }, + { false, "GXX_VERSION", OCTAVE_CONF_GXX_VERSION }, { false, "ENABLE_DYNAMIC_LINKING", OCTAVE_CONF_ENABLE_DYNAMIC_LINKING }, { false, "EXEEXT", OCTAVE_CONF_EXEEXT }, { false, "F77", OCTAVE_CONF_F77 },
--- a/src/oct-conf.in.h Mon Aug 13 12:56:53 2012 -0700 +++ b/src/oct-conf.in.h Mon Aug 13 14:04:26 2012 -0700 @@ -96,6 +96,7 @@ #define OCTAVE_CONF_CC %OCTAVE_CONF_CC% #endif +// FIXME: OCTAVE_CONF_CCC_VERSION is deprecated. Remove in version 3.12 #ifndef OCTAVE_CONF_CC_VERSION #define OCTAVE_CONF_CC_VERSION %OCTAVE_CONF_CC_VERSION% #endif @@ -188,6 +189,7 @@ #define OCTAVE_CONF_CXX %OCTAVE_CONF_CXX% #endif +// FIXME: OCTAVE_CONF_CXX_VERSION is deprecated. Remove in version 3.12 #ifndef OCTAVE_CONF_CXX_VERSION #define OCTAVE_CONF_CXX_VERSION %OCTAVE_CONF_CXX_VERSION% #endif @@ -212,6 +214,14 @@ #define OCTAVE_CONF_DL_LIBS %OCTAVE_CONF_DL_LIBS% #endif +#ifndef OCTAVE_CONF_GCC_VERSION +#define OCTAVE_CONF_GCC_VERSION %OCTAVE_CONF_GCC_VERSION% +#endif + +#ifndef OCTAVE_CONF_GXX_VERSION +#define OCTAVE_CONF_GXX_VERSION %OCTAVE_CONF_GXX_VERSION% +#endif + #ifndef OCTAVE_CONF_EXEEXT #define OCTAVE_CONF_EXEEXT %OCTAVE_CONF_EXEEXT% #endif