Changeset 2167

Timestamp:

Apr 3, 2011 8:09:53 AM (10 years ago)

Author:

stefan

Message:

sync with trunk rev2166

Location:

stable/0.7

Files:

• . (modified) (1 prop)
• MSVisualStudio/v10alt (copied) (copied from trunk/MSVisualStudio/v10alt)
• MSVisualStudio/v10alt/BuildTools.sln (copied) (copied from trunk/MSVisualStudio/v10alt/BuildTools.sln)
• MSVisualStudio/v10alt/BuildTools.vcxproj (copied) (copied from trunk/MSVisualStudio/v10alt/BuildTools.vcxproj)
• MSVisualStudio/v10alt/coin.props (copied) (copied from trunk/MSVisualStudio/v10alt/coin.props)
• coin.m4 (modified) (6 diffs)
• compile_f2c (modified) (1 prop)
• prepare_new_release (modified) (5 diffs)

stable/0.7/coin.m4

@@ -105 +105 @@
   if test "x$have_svnversion" = xyes; then
     AC_SUBST(m4_toupper($1_SVN_REV))
-    svn_rev_tmp=`cd $srcdir/$m4_tolower(coin_has_$1) ; svnversion`
-    m4_toupper($1_SVN_REV)=`echo $svn_rev_tmp | sed -n -e 's/^@<:@0-9@:>@*://' -e 's/\(@<:@0-9@:>@\)@<:@^0-9@:>@*$/\1/p'`
-    if test $m4_toupper($1_SVN_REV) != exported; then
+    svn_rev_tmp=`LANG=en_EN svnversion $srcdir 2>/dev/null`
+    if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x; then
+      m4_toupper($1_SVN_REV)=`echo $svn_rev_tmp | sed -n -e 's/^@<:@0-9@:>@*://' -e 's/\(@<:@0-9@:>@\)@<:@^0-9@:>@*$/\1/p'`
       AC_DEFINE_UNQUOTED(m4_toupper($1_SVN_REV), $m4_toupper($1_SVN_REV), [SVN revision number of project])
     fi
@@ -708 +708 @@
 fi
 
-# add automake conditional so we can recognize cl compiler in makefile
-coin_cc_is_cl=false
-if test x"$CXX" != x; then
-  case "$CXX" in
-    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
-      coin_cc_is_cl=true
-      ;;
-  esac
-fi
-AM_CONDITIONAL(COIN_CC_IS_CL, [test $coin_cc_is_cl = true])
-
 AC_ARG_VAR(CDEFS,[Additional -D flags to be used when compiling C code.])
 AC_ARG_VAR(ADD_CFLAGS,[Additional C compiler options])
@@ -770 +759 @@
 esac
 CFLAGS="$save_cflags"
+
+# add automake conditional so we can recognize cl compiler in makefile
+coin_cc_is_cl=false
+case "$CC" in
+  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
+    coin_cc_is_cl=true
+    ;;
+esac
+AM_CONDITIONAL(COIN_CC_IS_CL, [test $coin_cc_is_cl = true])
 
 # Check if a project specific CFLAGS variable has been set
@@ -1177 +1175 @@
 ###########################################################################
 
-# Calls autoconfs AC_F77_WRAPPERS and does additional corrections to FLIBS
-
-AC_DEFUN([AC_COIN_F77_WRAPPERS],
-[AC_BEFORE([AC_COIN_PROG_F77],[$0])dnl
-AC_BEFORE([AC_PROG_F77],[$0])dnl
-
-AC_LANG_PUSH([Fortran 77])
-
-AC_F77_WRAPPERS
+# Calls autoconfs AC_F77_LIBRARY_LDFLAGS and does additional corrections to FLIBS.
+# Then calls AC_F77_WRAPPERS to get Fortran namemangling scheme.
+#
+# To ensure that the FLIBS are determined and corrected before linking against
+# Fortran compilers is attempted by other macros, we put it into an extra macro
+# and call it via AC_REQUIRE. This way it seems to be called before the macros
+# required by AC_F77_WRAPPERS.
+
+AC_DEFUN([_AC_COIN_F77_LIBRARY_LDFLAGS],
+[AC_BEFORE([AC_PROG_F77],[$0])dnl
+
+# get FLIBS
+AC_F77_LIBRARY_LDFLAGS
+orig_FLIBS="$FLIBS"
 
 # If FLIBS has been set by the user, we just restore its value here
@@ -1210 +1213 @@
   # This is seem to be unnecessary, libifcorert(d).lib has been removed from the link line.
   # Further, excluding libc.lib from the default libs seemed to be necessary only for VS < 8.
-  # Since the corresponding flag seems to make more trouble that it avoid, it has been removed now.
+  # Since the corresponding flag seems to make more trouble than it avoids, it has been removed now.
      *-cygwin* | *-mingw*)
        case "$F77" in
@@ -1239 +1242 @@
 fi
 
+if test "x$orig_FLIBS" != "x$FLIBS" ; then
+  AC_MSG_NOTICE([Corrected Fortran libraries: $FLIBS])
+fi
+]) # _AC_COIN_F77_LIBRARY_LDFLAGS
+
+AC_DEFUN([AC_COIN_F77_WRAPPERS],
+[AC_BEFORE([AC_COIN_PROG_F77],[$0])dnl
+AC_REQUIRE([_AC_COIN_F77_LIBRARY_LDFLAGS])dnl
+
+AC_LANG_PUSH([Fortran 77])
+AC_F77_WRAPPERS
 AC_LANG_POP([Fortran 77])
 

stable/0.7/prepare_new_release

@@ -17 +17 @@
 #       Adapt to new script architecture pioneered in *_new_stable; major
 #       rewrite.
+# Modified: Lou Hafer          SFU      2011-03-14
+#       Change handling of externals so the svn:externals is left pointing to
+#       releases but Dependencies is left pointing to stable branches.
 
 #set -x -v
@@ -76 +79 @@
 
 # stableExternals specifies externals for which we are doing simultaneous
-# releases. We will use the stable branch of the external while preparing and
-# testing this release candidate, changing the Dependencies file to specify a
+# releases. We will use the stable branch of the external while preparing
+# and testing this release candidate, changing svn:externals to specify a
 # (nonexistent) release of the external at the last moment.
 
@@ -449 +452 @@
 fi
 
-# Look for a file specifying externals.
+# The Dependencies file in a stable branch should contain only stable
+# and release references (trunk is flagged as an error below). The overall
+# algorithm is to convert svn:externals to use releases but leave Dependencies
+# with stables. In practice, this is accomplished by backing up Dependencies,
+# using Dependencies to assemble and set svn:externals, and finally restoring
+# Dependencies from the backup after all else is done.
+
+# Look for a file specifying externals. Preferably Dependencies, but check for
+# Externals just in case this is an unconverted project.
 
 srcDepFile=
@@ -459 +470 @@
 done
 
-# Now generate a proper Dependencies file for the release.  Each line
-# in a Dependencies file has the format <ext_name> <ext_url>.  Normally,
-# each <ext_url> should be a stable branch.  References to stable branches
-# will be converted to references to releases unless the reference is to
-# a project in the stableExternals list (in which case it'll be converted
-# at the very end). References to releases are not changed. References to
-# trunk are an error. Failure to find a release for an external not in the
-# stableExternals list is an error. Save the existing externals and srcDepFile,
-# as we'll probably change both.
+# Now generate the proper externals for the release.  Each line in a
+# Dependencies file has the format <ext_name> <ext_url>.  Normally, each
+# <ext_url> should be a stable branch.  References to stable branches will be
+# converted to references to releases unless the reference is to a project
+# in the stableExternals list (in which case it'll be converted at the very
+# end). References to releases are not changed. References to trunk are an
+# error. Failure to find a release for an external not in the stableExternals
+# list is an error. Save the existing externals and srcDepFile, as we'll
+# probably change both.
 
 if test -n "$srcDepFile" ; then
@@ -750 +761 @@
 fi
 
+# If we had a Dependencies file to begin with, it contained references to
+# stable branches, and perhaps releases. This is the set of dependencies that
+# we want to commit in Dependencies, so reload $srcDepFile.bak into
+# Dependencies, now that we have svn:externals set to releases.
+
+if test -n "$srcDepFile" ; then
+  cp $srcDepFile.bak Dependencies
+fi
+
 if test -r Dependencies ; then
   echo 'Also, please confirm the externals are correct:'