Changeset 2254


Ignore:
Timestamp:
Jun 9, 2011 1:46:45 PM (9 years ago)
Author:
stefan
Message:

sync with trunk rev2253

Location:
stable/0.7
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

  • stable/0.7/coin.m4

    r2237 r2254  
    394394        coin_opt_cxxflags="-O3"
    395395        coin_add_cxxflags="-pipe"
    396         coin_dbg_cxxflags="-g"
     396        coin_dbg_cxxflags="-g -O0"
    397397        coin_warn_cxxflags="-Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wno-unknown-pragmas -Wno-long-long"
    398398        case $build in
     
    795795        coin_opt_cflags="-O3"
    796796        coin_add_cflags="-pipe"
    797         coin_dbg_cflags="-g"
     797        coin_dbg_cflags="-g -O0"
    798798        coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas -Wno-long-long"
    799799        case $build in
     
    10251025    coin_opt_fflags="-O3"
    10261026    coin_add_fflags="-pipe"
    1027     coin_dbg_fflags="-g"
     1027    coin_dbg_fflags="-g -O0"
    10281028    case $enable_doscompile in
    10291029      mingw)
     
    31233123m4_toupper($1_CFLAGS)=
    31243124m4_toupper($1_DATA)=
     3125m4_toupper($1_DEPENDENCIES)=
     3126m4_toupper($1_PCLIBS)=
     3127m4_toupper($1_PCREQUIRES)=
     3128m4_toupper($1_DATA)=
    31253129AC_SUBST(m4_toupper($1_LIBS))
    31263130AC_SUBST(m4_toupper($1_CFLAGS))
     
    31503154       m4_tolower(coin_has_$1)=yes
    31513155       m4_toupper($1_LIBS)="$withval"
     3156       m4_toupper($1_PCLIBS)="$withval"
    31523157       coin_foreach_w([myvar], [$3], [
    31533158         m4_toupper(myvar)_PCLIBS="$withval $m4_toupper(myvar)_PCLIBS"
     
    32213226          m4_toupper($1_LIBS)=`echo " $m4_toupper($1_LIBS) " | [sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g']`
    32223227        fi
     3228        m4_toupper($1_PCREQUIRES)="$2"
    32233229   
    32243230        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in $3
     
    32793285      AC_MSG_NOTICE([$1 DATA   is  $m4_toupper($1)_DATA])
    32803286    fi
    3281     if test -n "$m4_toupper($1)_CFLAGS" ; then
    3282       AC_MSG_NOTICE([$1 CFLAGS are $m4_toupper($1)_CFLAGS])
     3287    if test -n "$m4_toupper($1)_PCLIBS" ; then
     3288      AC_MSG_NOTICE([$1 PCLIBS are $m4_toupper($1)_PCLIBS])
     3289    fi
     3290    if test -n "$m4_toupper($1)_PCREQUIRES" ; then
     3291      AC_MSG_NOTICE([$1 PCREQUIRES are $m4_toupper($1)_PCREQUIRES])
    32833292    fi
    32843293    coin_foreach_w([myvar], [$3], [
     
    33543363m4_toupper($1_DATA)=
    33553364m4_toupper($1_DATA_INSTALLED)=
     3365m4_toupper($1_PCLIBS)=
     3366m4_toupper($1_PCREQUIRES)=
    33563367
    33573368# initial list of dependencies is "$2", but we need to filter out version number specifications (= x, <= x, >= x, != x)
     
    35443555  fi
    35453556
     3557  m4_toupper($1_PCREQUIRES)="$2"
    35463558  coin_foreach_w([myvar], [$3], [
    35473559    m4_toupper(myvar)_PCREQUIRES="$2 $m4_toupper(myvar)_PCREQUIRES"
  • stable/0.7/compile_f2c

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

    r2231 r2254  
    436436fi
    437437
    438 # Find ProjConfig.h. If there's a definition for PROJ_VERSION, adjust it and
    439 # add ProjConfig.h.bak to the list of files to be restored.
     438# Find config_proj_default.h. If there's a definition for PROJ_VERSION, adjust it and
     439# add config_proj_default.h.bak to the list of files to be restored.
    440440
    441441stableProjUC=`echo $stableProj | tr '[a-z]' '[A-Z]'`
    442 configFileLoc=`find . -name '*Config.h' -print`
     442configFileLoc=`find . -name 'config_*_default.h' -print`
    443443if test -n "$configFileLoc" ; then
    444444  versionSym=${stableProjUC}_VERSION
     
    448448  mv $configFileLoc $configFileLoc.bak
    449449  bak_files="$bak_files $configFileLoc"
    450   sed -e "s/# *define $versionSym.*\$/#define $versionSym \"$newVer\"/" <$configFileLoc.bak >$configFileLoc
     450  sed -e "s/# *define $versionSym .*\$/#define $versionSym \"$newVer\"/" \
     451    -e "s/# *define ${versionSym}_MAJOR .*\$/#define ${versionSym}_MAJOR $majVer/" \
     452    -e "s/# *define ${versionSym}_MINOR .*\$/#define ${versionSym}_MINOR $minVer/" \
     453    -e "s/# *define ${versionSym}_RELEASE .*\$/#define ${versionSym}_RELEASE $newRel/" \
     454    <$configFileLoc.bak >$configFileLoc
    451455  svn diff $configFileLoc
    452456fi
Note: See TracChangeset for help on using the changeset viewer.