Fix crash caused by last change

[wxWidgets.git] / build / update-setup-h

diff --git a/build/update-setup-h b/build/update-setup-h
index fc422ac586ea92bf7776578863c917097fd44abd..804b4f43ac1688b2daa5dee33240998e9ecb3d6d 100755 (executable)
--- a/build/update-setup-h
+++ b/build/update-setup-h
@@ -17,17 +17,56 @@ error()
     echo $* 1>&2
 }
 
     echo $* 1>&2
 }
 

+msg()
+{
+    # TODO: only output from here if "quiet" option is not given
+    echo "$*"
+}
+
+# write all the common options to stdout, massaging them specially if they are
+# meant to be included in a configure input file setup.h.in (the name of the
+# file the common options are meant to be included in is the parameter)
+cat_common_options_for()
+{
+    # get rid of the copyright header on top of the file
+    cmd="sed '1,/^$/d' include/wx/setup_inc.h"
+
+    # the file used for configure is special: we need to get rid of C++
+    # comments in it because it is included by some C code and we also have to
+    # set all options to 0 by default as they're put to 1 only by configure
+    # (and hence any #ifdefs setting default values for them become unneeded)
+    if [ $1 = "setup.h.in" ]; then
+        cmd="$cmd | sed -e '/^\/\//d' \
+                        -e 's@ *//.*\$@@' \
+                        -e 's/# *define \(.\+\) \+1 *\$/#define \1 0/'"
+    fi
+
+    eval $cmd
+}
+
+# update the single setup.h file passed in as the parameter if it is out of
+# date

 update_single_setup_h()
 {
 update_single_setup_h()
 {

+    if [ include/wx/setup_inc.h -ot $1 ]; then
+        echo "Skipping $1 which is already up to date."
+        return 0
+    fi
+
+    echo -n "Updating $1 ..."
+

     tmp=$i.$$.tmp
     sed -e '/^\/\* --- start common options --- \*\/$/q' $1 > $tmp &&
     tmp=$i.$$.tmp
     sed -e '/^\/\* --- start common options --- \*\/$/q' $1 > $tmp &&

-    cat include/wx/setup_inc.h >> $tmp &&
+    cat_common_options_for $1 >> $tmp &&

     sed -n -e '/^\/\* --- end common options --- \*\/$/,$p' $1 >> $tmp &&
     mv $tmp $1
 
     if [ $? -ne 0 ]; then
     sed -n -e '/^\/\* --- end common options --- \*\/$/,$p' $1 >> $tmp &&
     mv $tmp $1
 
     if [ $? -ne 0 ]; then

+        msg " FAILED"

         error "$0: failed to update file $1"
         rc=2
         error "$0: failed to update file $1"
         rc=2

+    else
+        msg " ok"

     fi
 }
 
     fi
 }
 


@@ -38,12 +77,12 @@ if [ ! -f wxwin.m4 ]; then
 fi
 
 update_single_setup_h include/wx/msw/setup0.h
 fi
 
 update_single_setup_h include/wx/msw/setup0.h

+update_single_setup_h include/wx/msw/wince/setup.h

 update_single_setup_h include/wx/mac/setup0.h
 update_single_setup_h include/wx/mac/setup0.h

-
-# get rid of C++ comments in this file
+update_single_setup_h include/wx/palmos/setup0.h
+update_single_setup_h include/wx/os2/setup0.h
+update_single_setup_h include/wx/motif/setup0.h

 update_single_setup_h setup.h.in
 update_single_setup_h setup.h.in

-sed -i -e '/^\/\//d' -e 's@ *//.*$@@' setup.h.in

 
 exit $rc
 
 
 exit $rc
 

-# vi: set ft=sh: