Changeset 2254 for stable

Timestamp:

Jun 9, 2011 1:46:45 PM (10 years ago)

Author:

stefan

Message:

sync with trunk rev2253

Location:

stable/0.7

Files:

• . (modified) (1 prop)
• coin.m4 (modified) (9 diffs)
• compile_f2c (modified) (1 prop)
• prepare_new_release (modified) (2 diffs)

stable/0.7/coin.m4

@@ -394 +394 @@
         coin_opt_cxxflags="-O3"
         coin_add_cxxflags="-pipe"
-        coin_dbg_cxxflags="-g"
+        coin_dbg_cxxflags="-g -O0"
         coin_warn_cxxflags="-Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wno-unknown-pragmas -Wno-long-long"
         case $build in
@@ -795 +795 @@
         coin_opt_cflags="-O3"
         coin_add_cflags="-pipe"
-        coin_dbg_cflags="-g"
+        coin_dbg_cflags="-g -O0"
         coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas -Wno-long-long"
         case $build in
@@ -1025 +1025 @@
     coin_opt_fflags="-O3"
     coin_add_fflags="-pipe"
-    coin_dbg_fflags="-g"
+    coin_dbg_fflags="-g -O0"
     case $enable_doscompile in
       mingw)
@@ -3123 +3123 @@
 m4_toupper($1_CFLAGS)=
 m4_toupper($1_DATA)=
+m4_toupper($1_DEPENDENCIES)=
+m4_toupper($1_PCLIBS)=
+m4_toupper($1_PCREQUIRES)=
+m4_toupper($1_DATA)=
 AC_SUBST(m4_toupper($1_LIBS))
 AC_SUBST(m4_toupper($1_CFLAGS))
@@ -3150 +3154 @@
        m4_tolower(coin_has_$1)=yes
        m4_toupper($1_LIBS)="$withval"
+       m4_toupper($1_PCLIBS)="$withval"
        coin_foreach_w([myvar], [$3], [
          m4_toupper(myvar)_PCLIBS="$withval $m4_toupper(myvar)_PCLIBS"
@@ -3221 +3226 @@
           m4_toupper($1_LIBS)=`echo " $m4_toupper($1_LIBS) " | [sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g']`
         fi
+        m4_toupper($1_PCREQUIRES)="$2"
    
         # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in $3
@@ -3279 +3285 @@
       AC_MSG_NOTICE([$1 DATA   is  $m4_toupper($1)_DATA])
     fi
-    if test -n "$m4_toupper($1)_CFLAGS" ; then
-      AC_MSG_NOTICE([$1 CFLAGS are $m4_toupper($1)_CFLAGS])
+    if test -n "$m4_toupper($1)_PCLIBS" ; then
+      AC_MSG_NOTICE([$1 PCLIBS are $m4_toupper($1)_PCLIBS])
+    fi
+    if test -n "$m4_toupper($1)_PCREQUIRES" ; then
+      AC_MSG_NOTICE([$1 PCREQUIRES are $m4_toupper($1)_PCREQUIRES])
     fi
     coin_foreach_w([myvar], [$3], [
@@ -3354 +3363 @@
 m4_toupper($1_DATA)=
 m4_toupper($1_DATA_INSTALLED)=
+m4_toupper($1_PCLIBS)=
+m4_toupper($1_PCREQUIRES)=
 
 # initial list of dependencies is "$2", but we need to filter out version number specifications (= x, <= x, >= x, != x)
@@ -3544 +3555 @@
   fi
 
+  m4_toupper($1_PCREQUIRES)="$2"
   coin_foreach_w([myvar], [$3], [
     m4_toupper(myvar)_PCREQUIRES="$2 $m4_toupper(myvar)_PCREQUIRES"

stable/0.7/prepare_new_release

@@ -436 +436 @@
 fi
 
-# Find ProjConfig.h. If there's a definition for PROJ_VERSION, adjust it and
-# add ProjConfig.h.bak to the list of files to be restored.
+# Find config_proj_default.h. If there's a definition for PROJ_VERSION, adjust it and
+# add config_proj_default.h.bak to the list of files to be restored.
 
 stableProjUC=`echo $stableProj | tr '[a-z]' '[A-Z]'`
-configFileLoc=`find . -name '*Config.h' -print`
+configFileLoc=`find . -name 'config_*_default.h' -print`
 if test -n "$configFileLoc" ; then
   versionSym=${stableProjUC}_VERSION
@@ -448 +448 @@
   mv $configFileLoc $configFileLoc.bak
   bak_files="$bak_files $configFileLoc"
-  sed -e "s/# *define $versionSym.*\$/#define $versionSym \"$newVer\"/" <$configFileLoc.bak >$configFileLoc
+  sed -e "s/# *define $versionSym .*\$/#define $versionSym \"$newVer\"/" \
+    -e "s/# *define ${versionSym}_MAJOR .*\$/#define ${versionSym}_MAJOR $majVer/" \
+    -e "s/# *define ${versionSym}_MINOR .*\$/#define ${versionSym}_MINOR $minVer/" \
+    -e "s/# *define ${versionSym}_RELEASE .*\$/#define ${versionSym}_RELEASE $newRel/" \
+    <$configFileLoc.bak >$configFileLoc
   svn diff $configFileLoc
 fi