Changeset 2866


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

  • stable/0.7/coin.m4

    r2802 r2866  
    380380      AC_MSG_NOTICE([Overruling autoconf; cl does not recognise -g.])
    381381    fi ;;
     382  * )
     383    CYGPATH_W=echo
     384    ;;
    382385esac
    383386CXXFLAGS="$save_cxxflags"
     
    789792      AC_MSG_NOTICE([Overruling autoconf; cl does not recognise -g.])
    790793    fi ;;
     794  * )
     795    CYGPATH_W=echo
     796    ;;
    791797esac
    792798CFLAGS="$save_cflags"
     
    16301636  # On Cygwin and AIX, building DLLs doesn't work
    16311637  case $build in
    1632     *-cygwin*)
     1638    *-cygwin* | *-mingw*)
    16331639      coin_disable_shared=yes
    1634       platform=Cygwin
     1640      if test x"$enable_shared" = xyes; then
     1641        case "$CXX" in
     1642          clang* )
     1643            AC_MSG_WARN([DLL building not supported. I'm disabling your choice.])
     1644            ;;
     1645          cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
     1646            AC_MSG_WARN([DLL building not supported. I'm disabling your choice, but will build with -MD(d) instead of -MT(d).])
     1647            ;;
     1648          *)
     1649            AC_MSG_WARN([DLL building not supported. I'm disabling your choice.])
     1650            ;;
     1651        esac
     1652      fi
    16351653    ;;
    16361654    *-aix*)
    16371655      coin_disable_shared=yes
    16381656      platform=AIX
    1639     ;;
    1640     *-mingw*)
    1641       coin_disable_shared=yes
    1642       platform="Msys"
    1643 #      case "$CXX" in
    1644 #        cl*)
    1645 #          coin_disable_shared=yes
    1646 #          platform="Msys with cl"
    1647 #      ;;
    1648 #      esac
     1657      if test x"$enable_shared" = xyes; then
     1658        AC_MSG_WARN([Shared objects are not supported. I'm disabling your choice.])
     1659      fi
    16491660    ;;
    16501661  esac
     
    16521663if test x"$coin_disable_shared" = xyes; then
    16531664  if test x"$enable_shared" = xyes; then
    1654     AC_MSG_WARN([On $platform, shared objects are not supported. I'm disabling your choice.])
     1665    :
    16551666  else
    16561667    # we don't disable shared, because it was not selected anyway
  • stable/0.7/prepare_new_release

    r2839 r2866  
    361361# contains a '/', strip it out to make the build and checkout directories.
    362362
    363 topBuildDir=`echo $stableProj | sed -e 's|.*/\([^/]*\)$|\1|'`
    364 topBuildDir="${topBuildDir}-${newVer}"
     363topProjName=`echo $stableProj | sed -e 's|.*/\([^/]*\)$|\1|'`
     364topBuildDir="${topProjName}-${newVer}"
    365365if test $isThirdParty = yes; then
    366366  coDir=$topBuildDir/Thirdparty/$stableProj
     
    418418echo ''
    419419echo "===> Checking for configure.ac files ..."
    420 bak_files=`find $stableProj -name 'configure.ac'`
     420if test -d $topProjName ; then
     421  bak_files=`find $topProjName -name 'configure.ac'`
     422fi
    421423if test -e configure.ac ; then
    422424  bak_files="$bak_files configure.ac"
     
    451453# add config_proj_default.h.bak to the list of files to be restored.
    452454
    453 stableProjUC=`echo $stableProj | tr '[a-z]' '[A-Z]'`
    454 configFileLoc=`find $stableProj -name .svn -prune -o -name 'config_*_default.h' -print`
     455topProjNameUC=`echo $topProjName | tr '[a-z]' '[A-Z]'`
     456if test -d $topProjName ; then
     457  configFileLoc=`find $topProjName -name .svn -prune -o -name 'config_*_default.h' -print`
     458fi
    455459if test -n "$configFileLoc" ; then
    456   versionSym=${stableProjUC}_VERSION
     460  versionSym=${topProjNameUC}_VERSION
    457461  echo ''
    458462  echo "===> Updating $versionSym in $configFileLoc (if present)"
  • stable/0.7/prepare_new_stable

    r2839 r2866  
    330330# Construct a build directory name.
    331331
    332 topBuildDir=`echo $srcProj | sed -e 's|.*/\([^/]*\)$|\1|'`
    333 topBuildDir=${topBuildDir}-${newVersion}
     332topProjName=`echo $srcProj | sed -e 's|.*/\([^/]*\)$|\1|'`
     333topBuildDir=${topProjName}-${newVersion}
    334334echo "Build directory.....: $topBuildDir"
    335335
     
    382382
    383383echo ''
    384 bak_files=`find $srcProj -name 'configure.ac'`
     384if test -d $topProjName ; then
     385  bak_files=`find $topProjName -name 'configure.ac'`
     386fi
    385387if test -e configure.ac ; then
    386388  bak_files="$bak_files configure.ac"
     
    408410# add config_proj_default.h.bak to the list of files to be restored.
    409411
    410 srcProjUC=`echo $srcProj | tr '[a-z]' '[A-Z]'`
    411 configFileLoc=`find $srcProj -name .svn -prune -o -name 'config_*_default.h' -print`
     412topProjNameUC=`echo $topProjName | tr '[a-z]' '[A-Z]'`
     413if test -d $topProjName ; then
     414  configFileLoc=`find $topProjName -name .svn -prune -o -name 'config_*_default.h' -print`
     415fi
    412416echo "config File Loc: $configFileLoc"
    413417if test -n "$configFileLoc" ; then
    414   versionSym=${srcProjUC}_VERSION
     418  versionSym=${topProjNameUC}_VERSION
    415419  echo ''
    416420  echo "===> Updating $versionSym in $configFileLoc (if present)"
Note: See TracChangeset for help on using the changeset viewer.