Changeset 2167


Ignore:
Timestamp:
Apr 3, 2011 8:09:53 AM (9 years ago)
Author:
stefan
Message:

sync with trunk rev2166

Location:
stable/0.7
Files:
4 edited
4 copied

Legend:

Unmodified
Added
Removed
  • stable/0.7

  • stable/0.7/coin.m4

    r2117 r2167  
    105105  if test "x$have_svnversion" = xyes; then
    106106    AC_SUBST(m4_toupper($1_SVN_REV))
    107     svn_rev_tmp=`cd $srcdir/$m4_tolower(coin_has_$1) ; svnversion`
    108     m4_toupper($1_SVN_REV)=`echo $svn_rev_tmp | sed -n -e 's/^@<:@0-9@:>@*://' -e 's/\(@<:@0-9@:>@\)@<:@^0-9@:>@*$/\1/p'`
    109     if test $m4_toupper($1_SVN_REV) != exported; then
     107    svn_rev_tmp=`LANG=en_EN svnversion $srcdir 2>/dev/null`
     108    if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x; then
     109      m4_toupper($1_SVN_REV)=`echo $svn_rev_tmp | sed -n -e 's/^@<:@0-9@:>@*://' -e 's/\(@<:@0-9@:>@\)@<:@^0-9@:>@*$/\1/p'`
    110110      AC_DEFINE_UNQUOTED(m4_toupper($1_SVN_REV), $m4_toupper($1_SVN_REV), [SVN revision number of project])
    111111    fi
     
    708708fi
    709709
    710 # add automake conditional so we can recognize cl compiler in makefile
    711 coin_cc_is_cl=false
    712 if test x"$CXX" != x; then
    713   case "$CXX" in
    714     cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    715       coin_cc_is_cl=true
    716       ;;
    717   esac
    718 fi
    719 AM_CONDITIONAL(COIN_CC_IS_CL, [test $coin_cc_is_cl = true])
    720 
    721710AC_ARG_VAR(CDEFS,[Additional -D flags to be used when compiling C code.])
    722711AC_ARG_VAR(ADD_CFLAGS,[Additional C compiler options])
     
    770759esac
    771760CFLAGS="$save_cflags"
     761
     762# add automake conditional so we can recognize cl compiler in makefile
     763coin_cc_is_cl=false
     764case "$CC" in
     765  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
     766    coin_cc_is_cl=true
     767    ;;
     768esac
     769AM_CONDITIONAL(COIN_CC_IS_CL, [test $coin_cc_is_cl = true])
    772770
    773771# Check if a project specific CFLAGS variable has been set
     
    11771175###########################################################################
    11781176
    1179 # Calls autoconfs AC_F77_WRAPPERS and does additional corrections to FLIBS
    1180 
    1181 AC_DEFUN([AC_COIN_F77_WRAPPERS],
    1182 [AC_BEFORE([AC_COIN_PROG_F77],[$0])dnl
    1183 AC_BEFORE([AC_PROG_F77],[$0])dnl
    1184 
    1185 AC_LANG_PUSH([Fortran 77])
    1186 
    1187 AC_F77_WRAPPERS
     1177# Calls autoconfs AC_F77_LIBRARY_LDFLAGS and does additional corrections to FLIBS.
     1178# Then calls AC_F77_WRAPPERS to get Fortran namemangling scheme.
     1179#
     1180# To ensure that the FLIBS are determined and corrected before linking against
     1181# Fortran compilers is attempted by other macros, we put it into an extra macro
     1182# and call it via AC_REQUIRE. This way it seems to be called before the macros
     1183# required by AC_F77_WRAPPERS.
     1184
     1185AC_DEFUN([_AC_COIN_F77_LIBRARY_LDFLAGS],
     1186[AC_BEFORE([AC_PROG_F77],[$0])dnl
     1187
     1188# get FLIBS
     1189AC_F77_LIBRARY_LDFLAGS
     1190orig_FLIBS="$FLIBS"
    11881191
    11891192# If FLIBS has been set by the user, we just restore its value here
     
    12101213  # This is seem to be unnecessary, libifcorert(d).lib has been removed from the link line.
    12111214  # Further, excluding libc.lib from the default libs seemed to be necessary only for VS < 8.
    1212   # Since the corresponding flag seems to make more trouble that it avoid, it has been removed now.
     1215  # Since the corresponding flag seems to make more trouble than it avoids, it has been removed now.
    12131216     *-cygwin* | *-mingw*)
    12141217       case "$F77" in
     
    12391242fi
    12401243
     1244if test "x$orig_FLIBS" != "x$FLIBS" ; then
     1245  AC_MSG_NOTICE([Corrected Fortran libraries: $FLIBS])
     1246fi
     1247]) # _AC_COIN_F77_LIBRARY_LDFLAGS
     1248
     1249AC_DEFUN([AC_COIN_F77_WRAPPERS],
     1250[AC_BEFORE([AC_COIN_PROG_F77],[$0])dnl
     1251AC_REQUIRE([_AC_COIN_F77_LIBRARY_LDFLAGS])dnl
     1252
     1253AC_LANG_PUSH([Fortran 77])
     1254AC_F77_WRAPPERS
    12411255AC_LANG_POP([Fortran 77])
    12421256
  • stable/0.7/compile_f2c

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • stable/0.7/prepare_new_release

    r2074 r2167  
    1717#       Adapt to new script architecture pioneered in *_new_stable; major
    1818#       rewrite.
     19# Modified: Lou Hafer          SFU      2011-03-14
     20#       Change handling of externals so the svn:externals is left pointing to
     21#       releases but Dependencies is left pointing to stable branches.
    1922
    2023#set -x -v
     
    7679
    7780# stableExternals specifies externals for which we are doing simultaneous
    78 # releases. We will use the stable branch of the external while preparing and
    79 # testing this release candidate, changing the Dependencies file to specify a
     81# releases. We will use the stable branch of the external while preparing
     82# and testing this release candidate, changing svn:externals to specify a
    8083# (nonexistent) release of the external at the last moment.
    8184
     
    449452fi
    450453
    451 # Look for a file specifying externals.
     454# The Dependencies file in a stable branch should contain only stable
     455# and release references (trunk is flagged as an error below). The overall
     456# algorithm is to convert svn:externals to use releases but leave Dependencies
     457# with stables. In practice, this is accomplished by backing up Dependencies,
     458# using Dependencies to assemble and set svn:externals, and finally restoring
     459# Dependencies from the backup after all else is done.
     460
     461# Look for a file specifying externals. Preferably Dependencies, but check for
     462# Externals just in case this is an unconverted project.
    452463
    453464srcDepFile=
     
    459470done
    460471
    461 # Now generate a proper Dependencies file for the release.  Each line
    462 # in a Dependencies file has the format <ext_name> <ext_url>.  Normally,
    463 # each <ext_url> should be a stable branch.  References to stable branches
    464 # will be converted to references to releases unless the reference is to
    465 # a project in the stableExternals list (in which case it'll be converted
    466 # at the very end). References to releases are not changed. References to
    467 # trunk are an error. Failure to find a release for an external not in the
    468 # stableExternals list is an error. Save the existing externals and srcDepFile,
    469 # as we'll probably change both.
     472# Now generate the proper externals for the release.  Each line in a
     473# Dependencies file has the format <ext_name> <ext_url>.  Normally, each
     474# <ext_url> should be a stable branch.  References to stable branches will be
     475# converted to references to releases unless the reference is to a project
     476# in the stableExternals list (in which case it'll be converted at the very
     477# end). References to releases are not changed. References to trunk are an
     478# error. Failure to find a release for an external not in the stableExternals
     479# list is an error. Save the existing externals and srcDepFile, as we'll
     480# probably change both.
    470481
    471482if test -n "$srcDepFile" ; then
     
    750761fi
    751762
     763# If we had a Dependencies file to begin with, it contained references to
     764# stable branches, and perhaps releases. This is the set of dependencies that
     765# we want to commit in Dependencies, so reload $srcDepFile.bak into
     766# Dependencies, now that we have svn:externals set to releases.
     767
     768if test -n "$srcDepFile" ; then
     769  cp $srcDepFile.bak Dependencies
     770fi
     771
    752772if test -r Dependencies ; then
    753773  echo 'Also, please confirm the externals are correct:'
Note: See TracChangeset for help on using the changeset viewer.