From d1810b0dce54434378adbd41dc212979d18ba2ce Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 31 Jan 2021 18:57:24 +0100 Subject: [PATCH] Remove setup0.h files 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. --- .gitignore | 9 --------- Makefile.in | 1 - README-GIT.md | 6 ------ appveyor.yml | 2 +- build/bakefiles/make_dist.mk | 1 - build/bakefiles/wx.bkl | 5 ----- build/msw/makefile.gcc | 17 +++++++---------- build/msw/makefile.vc | 17 +++++++---------- build/msw/wx_custom_build.vcxproj | 6 ------ build/tools/build-wxwidgets.py | 8 ++++---- build/tools/release.sh | 5 ----- build/update-setup-h | 22 +++++++++++----------- distrib/mac/pbsetup-sh | 20 -------------------- docs/msw/install.md | 20 -------------------- docs/univ/readme.txt | 6 ------ include/wx/chkconf.h | 7 ++----- include/wx/gtk/{setup0.h => setup.h} | 0 include/wx/motif/{setup0.h => setup.h} | 1 - include/wx/msw/{setup0.h => setup.h} | 1 - include/wx/msw/setup_inc.h | 2 +- include/wx/osx/{setup0.h => setup.h} | 0 include/wx/univ/{setup0.h => setup.h} | 1 - include/wx/univ/setup_inc.h | 2 +- misc/scripts/clean_patch | 2 +- 24 files changed, 35 insertions(+), 126 deletions(-) rename include/wx/gtk/{setup0.h => setup.h} (100%) rename include/wx/motif/{setup0.h => setup.h} (99%) rename include/wx/msw/{setup0.h => setup.h} (99%) rename include/wx/osx/{setup0.h => setup.h} (100%) rename include/wx/univ/{setup0.h => setup.h} (99%) diff --git a/.gitignore b/.gitignore index c9e0156998..4a32713393 100644 --- a/.gitignore +++ b/.gitignore @@ -173,11 +173,9 @@ /include/wx/generic/Makefile.in # /include/wx/gtk/ -/include/wx/gtk/setup.h /include/wx/gtk/Makefile.in # /include/wx/gtk1/ -/include/wx/gtk1/setup.h /include/wx/gtk1/Makefile.in # /include/wx/html/ @@ -187,19 +185,12 @@ /include/wx/motif/Makefile.in # /include/wx/msw/ -/include/wx/msw/setup.h /include/wx/msw/Makefile.in /include/wx/msw/Makefile -# /include/wx/osx/ -/include/wx/osx/setup.h - # /include/wx/protocol/ /include/wx/protocol/Makefile.in -# /include/wx/univ/ -/include/wx/univ/setup.h - # /include/wx/unix/ /include/wx/unix/Makefile.in diff --git a/Makefile.in b/Makefile.in index 8c32f38b1c..d9a939c737 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37458,7 +37458,6 @@ UNIV_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/src/univ mkdir $(DISTDIR)/src/univ/themes $(CP_P) $(INCDIR)/wx/univ/*.h $(DISTDIR)/include/wx/univ - $(CP_P) $(INCDIR)/wx/univ/setup0.h $(DISTDIR)/include/wx/univ/setup.h $(CP_P) $(SRCDIR)/univ/*.cpp $(DISTDIR)/src/univ $(CP_P) $(SRCDIR)/univ/themes/*.cpp $(DISTDIR)/src/univ/themes diff --git a/README-GIT.md b/README-GIT.md index cb7c329c5e..f7d5d08aa6 100644 --- a/README-GIT.md +++ b/README-GIT.md @@ -5,12 +5,6 @@ Please use `--recurse-submodules` option with the initial `git clone`. If you had already cloned the repository without this option, please run `git submodule update --init` to also get all 3rd party libraries code. -If you get errors about "wxUSE_XXX must be defined" when building, it -probably means that you need to copy the new options added to the file -`include/wx/msw/setup0.h` to `include/wx/msw/setup.h`. If you had never -modified the latter, it's safe to just delete it, as it will be created -by copying `setup0.h` during the next build. - Otherwise, building from Git checkout is not different from building from the sources include into the releases, so please follow the usual instructions in the port-specific files, such as diff --git a/appveyor.yml b/appveyor.yml index ea2ee57d66..fa0dd6e662 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -63,7 +63,7 @@ before_build: if (-not (Test-Path env:wxUSE_STL)) { $env:wxUSE_STL = '0' } if (-not (Test-Path env:wxUSE_WEBVIEW_EDGE)) { $env:wxUSE_WEBVIEW_EDGE = '0' } if (($env:compiler -ne "msys2") -and ($env:compiler -ne "cygwin")) { - gc include\wx\msw\setup0.h | + gc include\wx\msw\setup.h | %{$_ -replace "define wxUSE_STL 0", "define wxUSE_STL $env:wxUSE_STL"} | %{$_ -replace "define wxUSE_WEBVIEW_EDGE 0", "define wxUSE_WEBVIEW_EDGE $env:wxUSE_WEBVIEW_EDGE"} | sc include\wx\msw\setup.h diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index b7f94629ba..07beffa7ab 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -469,7 +469,6 @@ UNIV_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/src/univ mkdir $(DISTDIR)/src/univ/themes $(CP_P) $(INCDIR)/wx/univ/*.h $(DISTDIR)/include/wx/univ - $(CP_P) $(INCDIR)/wx/univ/setup0.h $(DISTDIR)/include/wx/univ/setup.h $(CP_P) $(SRCDIR)/univ/*.cpp $(DISTDIR)/src/univ $(CP_P) $(SRCDIR)/univ/themes/*.cpp $(DISTDIR)/src/univ/themes diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl index 806b11a538..8c26aa5b48 100644 --- a/build/bakefiles/wx.bkl +++ b/build/bakefiles/wx.bkl @@ -173,11 +173,6 @@ $(TOOLKIT_LOWERCASE) - - $(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup0.h - $(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h - setup_h - setup_h $(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index ced68d201f..42f5adc99c 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -5067,6 +5067,12 @@ endif ifeq ($(SHARED),0) ____wxgl_namelib_DEP = $(__gllib___depname) endif +ifeq ($(WXUNIV),0) +__SETUP_H_SUBDIR_FILENAMES = msw +endif +ifeq ($(WXUNIV),1) +__SETUP_H_SUBDIR_FILENAMES = univ +endif ifeq ($(USE_STC),1) __wxscintilla = $(LIBDIRNAME)\libwxscintilla$(WXDEBUGFLAG).a endif @@ -5198,12 +5204,6 @@ endif ifeq ($(USE_CAIRO),1) ____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo endif -ifeq ($(WXUNIV),0) -__SETUP_H_SUBDIR_FILENAMES = msw -endif -ifeq ($(WXUNIV),1) -__SETUP_H_SUBDIR_FILENAMES = univ -endif all: $(OBJS) @@ -5277,7 +5277,7 @@ clean: -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a $(MAKE) -C ..\..\samples -f makefile.gcc $(MAKEARGS) clean -setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h +setup_h: $(SETUPHDIR)\wx $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(WXREGEX_OBJECTS) $(foreach f,$(subst \,/,$(WXREGEX_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp)) @@ -5889,9 +5889,6 @@ $(SETUPHDIR): $(LIBDIRNAME) $(SETUPHDIR)\wx: $(SETUPHDIR) if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx -..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h: - if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h - $(SETUPHDIR)\wx\setup.h: if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 6dc7eb6bb3..536ca5edfc 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -5639,6 +5639,12 @@ ____wxgl_namedll_DEP = $(__gldll___depname) !if "$(SHARED)" == "0" ____wxgl_namelib_DEP = $(__gllib___depname) !endif +!if "$(WXUNIV)" == "0" +__SETUP_H_SUBDIR_FILENAMES = msw +!endif +!if "$(WXUNIV)" == "1" +__SETUP_H_SUBDIR_FILENAMES = univ +!endif !if "$(USE_STC)" == "1" __wxscintilla = $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib !endif @@ -5850,12 +5856,6 @@ __UNICODE_DEFINE_p = /D_UNICODE !if "$(USE_CAIRO)" == "1" ____CAIRO_INCLUDEDIR_FILENAMES = /I$(CAIRO_ROOT)\include\cairo !endif -!if "$(WXUNIV)" == "0" -__SETUP_H_SUBDIR_FILENAMES = msw -!endif -!if "$(WXUNIV)" == "1" -__SETUP_H_SUBDIR_FILENAMES = univ -!endif all: $(OBJS) @@ -5966,7 +5966,7 @@ clean: $(MAKE) -f makefile.vc $(MAKEARGS) clean cd "$(MAKEDIR)" -setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h +setup_h: $(SETUPHDIR)\wx $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(WXREGEX_OBJECTS) if exist $@ del $@ @@ -6351,9 +6351,6 @@ $(SETUPHDIR): $(LIBDIRNAME) $(SETUPHDIR)\wx: $(SETUPHDIR) if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx -..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h: - if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h - $(SETUPHDIR)\wx\setup.h: if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h diff --git a/build/msw/wx_custom_build.vcxproj b/build/msw/wx_custom_build.vcxproj index 8d7ff23855..a6d48276b8 100644 --- a/build/msw/wx_custom_build.vcxproj +++ b/build/msw/wx_custom_build.vcxproj @@ -131,12 +131,6 @@ $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - Didn't find "include\wx\setup.h", copying setup0.h - copy ..\..\include\wx\msw\setup0.h ..\..\include\wx\msw\setup.h - - diff --git a/build/tools/build-wxwidgets.py b/build/tools/build-wxwidgets.py index f625f8c198..ba41621a1f 100755 --- a/build/tools/build-wxwidgets.py +++ b/build/tools/build-wxwidgets.py @@ -372,7 +372,7 @@ def main(scriptName, args): flags = {} buildDir = os.path.abspath(os.path.join(scriptDir, "..", "msw")) - print("creating wx/msw/setup.h from setup0.h") + print("creating wx/msw/setup.h") if options.unicode: flags["wxUSE_UNICODE"] = "1" @@ -404,13 +404,13 @@ def main(scriptName, args): mswIncludeDir = os.path.join(wxRootDir, "include", "wx", "msw") - setup0File = os.path.join(mswIncludeDir, "setup0.h") - setupText = open(setup0File, "rb").read() + setupFile = os.path.join(mswIncludeDir, "setup.h") + setupText = open(setupFile, "rb").read() for flag in flags: setupText, subsMade = re.subn(flag + "\s+?\d", "%s %s" % (flag, flags[flag]), setupText) if subsMade == 0: - print("Flag %s wasn't found in setup0.h!" % flag) + print("Flag %s wasn't found in setup.h!" % flag) sys.exit(1) setupFile = open(os.path.join(mswIncludeDir, "setup.h"), "wb") diff --git a/build/tools/release.sh b/build/tools/release.sh index 7e1b0b87e3..b7204489c9 100755 --- a/build/tools/release.sh +++ b/build/tools/release.sh @@ -46,11 +46,6 @@ mkdir -p $destdir tar x -C $destdir -i cd $destdir -# All setup0.h files are supposed to be renamed to just setup.h when checked -# out and in the distribution. -find $prefix/include/wx -type f -name setup0.h | while read f; do - mv $f ${f%0.h}.h -done # Compile gettext catalogs. make -C $prefix/locale -s MSGFMT=msgfmt allmo diff --git a/build/update-setup-h b/build/update-setup-h index 339578964b..732b96396c 100755 --- a/build/update-setup-h +++ b/build/update-setup-h @@ -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 diff --git a/distrib/mac/pbsetup-sh b/distrib/mac/pbsetup-sh index b2f3026de7..c045ef5120 100755 --- a/distrib/mac/pbsetup-sh +++ b/distrib/mac/pbsetup-sh @@ -28,26 +28,6 @@ if [ ! -d "${2}/include/wx" ]; then fi fi # -# Copy stock setup0.h to setup.h if it doesn't exist -# preserve user modifications made to setup.h -# -if [ ! -f "${1}/../include/wx/osx/setup.h" ]; then - echo "${0}:${LINENO}: warning: copying \"include/wx/osx/setup0.h\" to \"include/wx/osx/setup.h\"" - echo "${0}:${LINENO}: warning: edit \"include/wx/osx/setup.h\" to choose the features you would like to compile wxWindows with[out]" - cp "${1}/../include/wx/osx/setup0.h" "${1}/../include/wx/osx/setup.h" - if [ ! -f "${1}/../include/wx/osx/setup.h" ]; then - echo "${0}:${LINENO}: error: unable to create setup file \"${1}/../include/wx/osx/setup.h\"" - exit 1 - fi -fi -# -# Check that stock setup0.h is not newer than user setup.h -# -if [ "${1}/../include/wx/osx/setup0.h" -nt "${1}/../include/wx/osx/setup.h" ] ; then - echo "${0}:${LINENO}: warning: \"include/wx/osx/setup0.h\" is more recent than \"include/wx/osx/setup.h\"" - echo "${0}:${LINENO}: warning: edit or replace \"include/wx/osx/setup.h\" to integrate changes" -fi -# # Copy user setup.h to build setup.h if the latter doesn't exist or is older # if [ ! -f "${2}/include/wx/setup.h" -o \ diff --git a/docs/msw/install.md b/docs/msw/install.md index 8f10fe6db4..c31baa46ef 100644 --- a/docs/msw/install.md +++ b/docs/msw/install.md @@ -34,26 +34,6 @@ variable containing the full path to this directory. While this is not actually required, this makes using the library more convenient and this environment variable is used in the examples below. -Upgrading Existing Git Checkout {#msw_update_setup_h} -------------------------------- - -If you checked your sources from version control repository and didn't -obtain them from a release file, you may need to update your -`include/wx/msw/setup.h` file to add any new options from -`include/wx/msw/setup0.h` to it. If you hadn't edited `setup.h` file -manually, you can just delete it to force recreating it by copying -`setup0.h` to `setup.h` during the next build. If you forget to do it, -you may get errors during the build due to new options being -undefined. - -If you have no intention of ever modifying `setup.h`, you may avoid this -problem entirely by creating a symbolic link to `setup0.h` before -building, e.g. using mklink, from an admin command prompt: - - cd %WXWIN%\include\wx\msw\ - mklink setup.h setup0.h - - Building wxWidgets {#msw_build} ================== diff --git a/docs/univ/readme.txt b/docs/univ/readme.txt index 1cfff06d2e..daa7f3c58e 100644 --- a/docs/univ/readme.txt +++ b/docs/univ/readme.txt @@ -41,9 +41,6 @@ toolkit. 2. Installing under Win32 ------------------------- -If compiling from CVS, please copy include/wx/univ/setup0.h -to include/wx/univ/setup.h before following these steps. - a) Using Visual C++ 6.0/7.x Follow wxMSW instructions but make sure to choose one of the "Universal" @@ -76,9 +73,6 @@ change for wxUniversal is that you must add "--enable-universal" switch to the configure command line and for wxX11 even this is unnecessary, i.e. it is enabled by default. -If compiling from CVS, please copy include/wx/univ/setup0.h -to include/wx/univ/setup.h before configuring. - 4. Running wxUniv programs -------------------------- diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 1c14617b23..4fa7561b9c 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -18,11 +18,8 @@ ************************************************** If you get an error saying "wxUSE_FOO must be defined", it means that you - are not using the correct up-to-date version of setup.h. This happens most - often when using git or snapshots and a new symbol was added to setup0.h - and you haven't updated your local setup.h to reflect it. If this is the - case, you need to propagate the changes from setup0.h to your setup.h and, - if using makefiles under MSW, also remove setup.h under the build directory + are not using the correct up-to-date version of setup.h. If you're building + using makefiles under MSW, also remove setup.h under the build directory (lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that the new setup.h is copied there. diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup.h similarity index 100% rename from include/wx/gtk/setup0.h rename to include/wx/gtk/setup.h diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup.h similarity index 99% rename from include/wx/motif/setup0.h rename to include/wx/motif/setup.h index 9a6b48601d..cf4ee95016 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup.h @@ -1613,4 +1613,3 @@ /* --- end common options --- */ #endif // _WX_SETUP_H_ - diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup.h similarity index 99% rename from include/wx/msw/setup0.h rename to include/wx/msw/setup.h index 28a21cffed..262f732c94 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup.h @@ -1829,4 +1829,3 @@ /* --- end MSW options --- */ #endif // _WX_SETUP_H_ - diff --git a/include/wx/msw/setup_inc.h b/include/wx/msw/setup_inc.h index 9a077f6156..4957536e92 100644 --- a/include/wx/msw/setup_inc.h +++ b/include/wx/msw/setup_inc.h @@ -2,7 +2,7 @@ // Name: wx/msw/setup_inc.h // Purpose: MSW-specific setup.h options // Author: Vadim Zeitlin -// Created: 2007-07-21 (extracted from wx/msw/setup0.h) +// Created: 2007-07-21 (extracted from wx/msw/setup.h) // Copyright: (c) 2007 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup.h similarity index 100% rename from include/wx/osx/setup0.h rename to include/wx/osx/setup.h diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup.h similarity index 99% rename from include/wx/univ/setup0.h rename to include/wx/univ/setup.h index 72b1ea4a43..6757c978aa 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup.h @@ -1760,4 +1760,3 @@ /* --- end wxUniv options --- */ #endif // _WX_SETUP_H_ - diff --git a/include/wx/univ/setup_inc.h b/include/wx/univ/setup_inc.h index 79d524e5f7..8e13ecd229 100644 --- a/include/wx/univ/setup_inc.h +++ b/include/wx/univ/setup_inc.h @@ -2,7 +2,7 @@ // Name: wx/univ/setup_inc.h // Purpose: wxUniversal-specific setup.h options (this file is not used // directly, it is injected by build/update-setup-h in the -// generated include/wx/univ/setup0.h) +// generated include/wx/univ/setup.h) // Author: Vadim Zeitlin // Created: 2008-02-03 // Copyright: (c) 2008 Vadim Zeitlin diff --git a/misc/scripts/clean_patch b/misc/scripts/clean_patch index 8fbe4b8793..bfa2936c94 100755 --- a/misc/scripts/clean_patch +++ b/misc/scripts/clean_patch @@ -1,2 +1,2 @@ #!/bin/sh -filterdiff -x '*/*.vcproj' -x '*/*.vcxproj*' -x a/autoconf_inc.m4 -x a/configure -x '*/makefile.*' -x '*/Makefile.in' -x a/setup.h.in -x '*/setup.h' -x '*/setup0.h' "$@" +filterdiff -x '*/*.vcproj' -x '*/*.vcxproj*' -x a/autoconf_inc.m4 -x a/configure -x '*/makefile.*' -x '*/Makefile.in' -x a/setup.h.in -x '*/setup.h' "$@"