Changeset 2866 for stable/0.7

Timestamp:

Sep 8, 2013 12:27:09 PM (7 years ago)

Author:

stefan

Message:

merge r2839-2856,2858-2865 from trunk

Location:

stable/0.7

Files:

• . (modified) (1 prop)
• coin.m4 (modified) (4 diffs)
• prepare_new_release (modified) (3 diffs)
• prepare_new_stable (modified) (3 diffs)

stable/0.7/coin.m4

@@ -380 +380 @@
       AC_MSG_NOTICE([Overruling autoconf; cl does not recognise -g.])
     fi ;;
+  * )
+    CYGPATH_W=echo
+    ;;
 esac
 CXXFLAGS="$save_cxxflags"
@@ -789 +792 @@
       AC_MSG_NOTICE([Overruling autoconf; cl does not recognise -g.])
     fi ;;
+  * )
+    CYGPATH_W=echo
+    ;;
 esac
 CFLAGS="$save_cflags"
@@ -1630 +1636 @@
   # On Cygwin and AIX, building DLLs doesn't work
   case $build in
-    *-cygwin*)
+    *-cygwin* | *-mingw*)
       coin_disable_shared=yes
-      platform=Cygwin
+      if test x"$enable_shared" = xyes; then
+        case "$CXX" in
+          clang* )
+            AC_MSG_WARN([DLL building not supported. I'm disabling your choice.])
+            ;;
+          cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
+            AC_MSG_WARN([DLL building not supported. I'm disabling your choice, but will build with -MD(d) instead of -MT(d).])
+            ;;
+          *)
+            AC_MSG_WARN([DLL building not supported. I'm disabling your choice.])
+            ;;
+        esac
+      fi
     ;;
     *-aix*)
       coin_disable_shared=yes
       platform=AIX
-    ;;
-    *-mingw*)
-      coin_disable_shared=yes
-      platform="Msys"
-#      case "$CXX" in
-#        cl*)
-#          coin_disable_shared=yes
-#          platform="Msys with cl"
-#      ;;
-#      esac
+      if test x"$enable_shared" = xyes; then
+        AC_MSG_WARN([Shared objects are not supported. I'm disabling your choice.])
+      fi
     ;;
   esac
@@ -1652 +1663 @@
 if test x"$coin_disable_shared" = xyes; then
   if test x"$enable_shared" = xyes; then
-    AC_MSG_WARN([On $platform, shared objects are not supported. I'm disabling your choice.])
+    :
   else
     # we don't disable shared, because it was not selected anyway

stable/0.7/prepare_new_release

@@ -361 +361 @@
 # contains a '/', strip it out to make the build and checkout directories.
 
-topBuildDir=`echo $stableProj | sed -e 's|.*/\([^/]*\)$|\1|'`
-topBuildDir="${topBuildDir}-${newVer}"
+topProjName=`echo $stableProj | sed -e 's|.*/\([^/]*\)$|\1|'`
+topBuildDir="${topProjName}-${newVer}"
 if test $isThirdParty = yes; then
   coDir=$topBuildDir/Thirdparty/$stableProj
@@ -418 +418 @@
 echo ''
 echo "===> Checking for configure.ac files ..."
-bak_files=`find $stableProj -name 'configure.ac'`
+if test -d $topProjName ; then
+  bak_files=`find $topProjName -name 'configure.ac'`
+fi
 if test -e configure.ac ; then
   bak_files="$bak_files configure.ac"
@@ -451 +453 @@
 # add config_proj_default.h.bak to the list of files to be restored.
 
-stableProjUC=`echo $stableProj | tr '[a-z]' '[A-Z]'`
-configFileLoc=`find $stableProj -name .svn -prune -o -name 'config_*_default.h' -print`
+topProjNameUC=`echo $topProjName | tr '[a-z]' '[A-Z]'`
+if test -d $topProjName ; then
+  configFileLoc=`find $topProjName -name .svn -prune -o -name 'config_*_default.h' -print`
+fi
 if test -n "$configFileLoc" ; then
-  versionSym=${stableProjUC}_VERSION
+  versionSym=${topProjNameUC}_VERSION
   echo ''
   echo "===> Updating $versionSym in $configFileLoc (if present)"

stable/0.7/prepare_new_stable

@@ -330 +330 @@
 # Construct a build directory name.
 
-topBuildDir=`echo $srcProj | sed -e 's|.*/\([^/]*\)$|\1|'`
-topBuildDir=${topBuildDir}-${newVersion}
+topProjName=`echo $srcProj | sed -e 's|.*/\([^/]*\)$|\1|'`
+topBuildDir=${topProjName}-${newVersion}
 echo "Build directory.....: $topBuildDir"
 
@@ -382 +382 @@
 
 echo ''
-bak_files=`find $srcProj -name 'configure.ac'`
+if test -d $topProjName ; then
+  bak_files=`find $topProjName -name 'configure.ac'`
+fi
 if test -e configure.ac ; then
   bak_files="$bak_files configure.ac"
@@ -408 +410 @@
 # add config_proj_default.h.bak to the list of files to be restored.
 
-srcProjUC=`echo $srcProj | tr '[a-z]' '[A-Z]'`
-configFileLoc=`find $srcProj -name .svn -prune -o -name 'config_*_default.h' -print`
+topProjNameUC=`echo $topProjName | tr '[a-z]' '[A-Z]'`
+if test -d $topProjName ; then
+  configFileLoc=`find $topProjName -name .svn -prune -o -name 'config_*_default.h' -print`
+fi
 echo "config File Loc: $configFileLoc"
 if test -n "$configFileLoc" ; then
-  versionSym=${srcProjUC}_VERSION
+  versionSym=${topProjNameUC}_VERSION
   echo ''
   echo "===> Updating $versionSym in $configFileLoc (if present)"