Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove setup0.h files

Browse Source 
Simplify things by putting setup.h files themselves under version
control and getting rid of setup0.h ones.

The initial motivation for using separate setup0.h files was to allow
having local changes to setup.h, but with Git there is a simple way to
do it by using "git update-index --skip-worktree include/wx/msw/setup.h"
for example, so we don't really need setup0.h any more and dropping them
makes things simpler.
This commit is contained in:
Vadim Zeitlin
2021-01-31 18:57:24 +01:00
parent fd653c7ca8
commit d1810b0dce
24 changed files with 35 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
build/update-setup-h
View File

@@ -25,7 +25,7 @@ msg()
# 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
#
# usage: cat_common_options_for setup_inc.h setup0.h
# usage: cat_common_options_for setup_inc.h setup.h
cat_common_options_for()
{
# get rid of the copyright header on top of the file
@@ -52,7 +52,7 @@ cat_common_options_for()
# 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
# usage: update_single_setup_h {common|MSW} setup_inc.h setup.h
update_single_setup_h()
{
section=$1
@@ -108,22 +108,22 @@ if [ ! -f wxwin.m4 ]; then
fi
update_common_setup_h include/wx/android/setup.h
update_common_setup_h include/wx/motif/setup0.h
update_common_setup_h include/wx/msw/setup0.h
update_common_setup_h include/wx/gtk/setup0.h
update_common_setup_h include/wx/osx/setup0.h
update_common_setup_h include/wx/univ/setup0.h
update_common_setup_h include/wx/motif/setup.h
update_common_setup_h include/wx/msw/setup.h
update_common_setup_h include/wx/gtk/setup.h
update_common_setup_h include/wx/osx/setup.h
update_common_setup_h include/wx/univ/setup.h
update_common_setup_h setup.h.in
update_common_setup_h build/cmake/setup.h.in
update_msw_setup_h include/wx/msw/setup0.h
update_msw_setup_h include/wx/gtk/setup0.h
update_msw_setup_h include/wx/msw/setup.h
update_msw_setup_h include/wx/gtk/setup.h
update_msw_setup_h setup.h.in
update_msw_setup_h build/cmake/setup.h.in
update_osx_setup_h include/wx/osx/setup0.h
update_osx_setup_h include/wx/osx/setup.h
update_single_setup_h wxUniv include/wx/univ/setup_inc.h include/wx/univ/setup0.h
update_single_setup_h wxUniv include/wx/univ/setup_inc.h include/wx/univ/setup.h
exit $rc