Always rearrange wxListBook and send out size event, otherwise scrollbar overlaps...

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

diff --git a/build/update-setup-h b/build/update-setup-h
index 58b1e1bc89bfe46bd41d7fdb3c79cc43a38b2984..894cd1611226d442266b8d92bc27cb42f555b7be 100755 (executable)
--- a/build/update-setup-h
+++ b/build/update-setup-h
@@ -24,18 +24,19 @@ msg()
 }
 
 # write all the common options to stdout, massaging them specially if they are
 }
 
 # 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)
+# meant to be included in a configure input file setup.h.in
+#
+# usage: cat_common_options_for setup_inc.h setup0.h

 cat_common_options_for()
 {
     # get rid of the copyright header on top of the file
 cat_common_options_for()
 {
     # get rid of the copyright header on top of the file

-    cmd="sed '1,/^$/d' include/wx/setup_inc.h"
+    cmd="sed '1,/^\$/d' $1"

 
     # 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)
 
     # 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
+    if [ $2 = "setup.h.in" ]; then

         cmd="$cmd | sed -e '/^\/\//d' \
                         -e 's@ *//.*\$@@' \
                         -e 's/# *define \(.\+\) \+1 *\$/#define \1 0/'"
         cmd="$cmd | sed -e '/^\/\//d' \
                         -e 's@ *//.*\$@@' \
                         -e 's/# *define \(.\+\) \+1 *\$/#define \1 0/'"


@@ -46,9 +47,16 @@ cat_common_options_for()
 
 # update the single setup.h file passed in as the parameter if it is out of
 # date
 
 # update the single setup.h file passed in as the parameter if it is out of
 # date

+#
+# usage: update_single_setup_h {common|MSW} setup_inc.h setup0.h

 update_single_setup_h()
 {
 update_single_setup_h()
 {

-    if [ include/wx/setup_inc.h -ot $1 ]; then
+    section=$1
+    shift
+    setup_inc=$1
+    shift
+
+    if [ $setup_inc -ot $1 ]; then

         echo "Skipping $1 which is already up to date."
         return 0
     fi
         echo "Skipping $1 which is already up to date."
         return 0
     fi


@@ -56,9 +64,9 @@ update_single_setup_h()
     echo -n "Updating $1 ..."
 
     tmp=$i.$$.tmp
     echo -n "Updating $1 ..."
 
     tmp=$i.$$.tmp

-    sed -e '/^\/\* --- start common options --- \*\/$/q' $1 > $tmp &&
-    cat_common_options_for $1 >> $tmp &&
-    sed -n -e '/^\/\* --- end common options --- \*\/$/,$p' $1 >> $tmp &&
+    sed -e "/^\/\* --- start $section options --- \*\/\$/q" $1 > $tmp &&
+    cat_common_options_for $setup_inc $1 >> $tmp &&
+    sed -n -e "/^\/\* --- end $section options --- \*\/\$/,\$p" $1 >> $tmp &&

     mv $tmp $1
 
     if [ $? -ne 0 ]; then
     mv $tmp $1
 
     if [ $? -ne 0 ]; then


@@ -70,16 +78,34 @@ update_single_setup_h()
     fi
 }
 
     fi
 }
 

+# wrapper for update_single_setup_h which only updates the common options
+update_common_setup_h()
+{
+    update_single_setup_h common include/wx/setup_inc.h $1
+}
+
+# wrapper for update_single_setup_h which only updates the MSW options
+update_msw_setup_h()
+{
+    update_single_setup_h MSW include/wx/msw/setup_inc.h $1
+}
+

 # entry point
 if [ ! -f wxwin.m4 ]; then
     error "$0: must be ran from root wx directory"
     exit 1
 fi
 
 # entry point
 if [ ! -f wxwin.m4 ]; then
     error "$0: must be ran from root wx directory"
     exit 1
 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 setup.h.in
+update_common_setup_h include/wx/msw/setup0.h
+update_common_setup_h include/wx/msw/wince/setup.h
+update_common_setup_h include/wx/mac/setup0.h
+update_common_setup_h include/wx/palmos/setup0.h
+update_common_setup_h include/wx/os2/setup0.h
+update_common_setup_h include/wx/motif/setup0.h
+update_common_setup_h setup.h.in
+
+update_msw_setup_h include/wx/msw/setup0.h
+update_msw_setup_h setup.h.in

 
 exit $rc
 
 
 exit $rc