From 9cb762dbd27cd74a5f889dcc7c9de3e58ac864d3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 8 Sep 2016 00:42:46 +0200 Subject: [PATCH] Rebake to get rid of whitespace-only changes in generated files This just commits insignificant changes after rebaking everything to make sure they don't get mixed up with significant ones at some later time. --- samples/makefile.bcc | 2 +- samples/makefile.gcc | 2 +- samples/makefile.vc | 2 +- samples/secretstore/Makefile.in | 12 +++++------ samples/secretstore/makefile.bcc | 15 +++++++------- samples/secretstore/makefile.gcc | 16 +++++++-------- samples/secretstore/makefile.unx | 26 ++++++++++++------------ samples/secretstore/makefile.vc | 35 ++++++++++++++++---------------- tests/Makefile.in | 2 +- tests/makefile.bcc | 2 +- tests/makefile.gcc | 2 +- tests/makefile.vc | 2 +- tests/test_vc7_test_gui.vcproj | 6 +++--- tests/test_vc8_test_gui.vcproj | 8 ++++---- tests/test_vc9_test_gui.vcproj | 8 ++++---- 15 files changed, 71 insertions(+), 69 deletions(-) diff --git a/samples/makefile.bcc b/samples/makefile.bcc index d57cf4aedc..b9b51034a9 100644 --- a/samples/makefile.bcc +++ b/samples/makefile.bcc @@ -712,7 +712,7 @@ scroll: call scroll.bat @del scroll.bat -secretstore: +secretstore: @echo cd secretstore >secretstore.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>secretstore.bat call secretstore.bat diff --git a/samples/makefile.gcc b/samples/makefile.gcc index e8611a9fe0..0fece64440 100644 --- a/samples/makefile.gcc +++ b/samples/makefile.gcc @@ -293,7 +293,7 @@ sashtest: scroll: $(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) all -secretstore: +secretstore: $(MAKE) -C secretstore -f makefile.gcc $(MAKEARGS) all shaped: diff --git a/samples/makefile.vc b/samples/makefile.vc index e647ca3697..df4fea0351 100644 --- a/samples/makefile.vc +++ b/samples/makefile.vc @@ -572,7 +572,7 @@ sub_scroll: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" -sub_secretstore: +sub_secretstore: cd secretstore $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" diff --git a/samples/secretstore/Makefile.in b/samples/secretstore/Makefile.in index 8688037360..2447373889 100644 --- a/samples/secretstore/Makefile.in +++ b/samples/secretstore/Makefile.in @@ -36,7 +36,7 @@ wx_top_builddir = @wx_top_builddir@ ### Variables: ### -DESTDIR = +DESTDIR = WX_RELEASE = 3.1 LIBDIRNAME = $(wx_top_builddir)/lib SECRETSTORE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @@ -60,7 +60,7 @@ SECRETSTORE_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) -@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = +@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__secretstore___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__secretstore___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL secretstore$(EXEEXT) @@ -100,13 +100,13 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ all: secretstore$(EXEEXT) -install: +install: -uninstall: +uninstall: install-strip: install -clean: +clean: rm -rf ./.deps ./.pch rm -f ./*.o rm -f secretstore$(EXEEXT) @@ -116,7 +116,7 @@ distclean: clean secretstore$(EXEEXT): $(SECRETSTORE_OBJECTS) $(CXX) -o $@ $(SECRETSTORE_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - + $(__secretstore___mac_setfilecmd) secretstore_secretstore.o: $(srcdir)/secretstore.cpp diff --git a/samples/secretstore/makefile.bcc b/samples/secretstore/makefile.bcc index f03b81c69a..8ccb0bd09d 100644 --- a/samples/secretstore/makefile.bcc +++ b/samples/secretstore/makefile.bcc @@ -68,10 +68,10 @@ LIBTYPE_SUFFIX = lib LIBTYPE_SUFFIX = dll !endif !if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG_2 = -Od @@ -80,13 +80,13 @@ __OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -O2 !endif !if "$(USE_THREADS)" == "0" -__THREADSFLAG_5 = +__THREADSFLAG_5 = !endif !if "$(USE_THREADS)" == "1" __THREADSFLAG_5 = mt !endif !if "$(USE_THREADS)" == "0" -__THREADSFLAG_6 = +__THREADSFLAG_6 = !endif !if "$(USE_THREADS)" == "1" __THREADSFLAG_6 = -tWM @@ -95,13 +95,13 @@ __THREADSFLAG_6 = -tWM __RUNTIME_LIBS_7 = -tWR !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_7 = +__RUNTIME_LIBS_7 = !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_8 = i !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = +__RUNTIME_LIBS_8 = !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -181,7 +181,7 @@ $(OBJS): all: $(OBJS)\secretstore.exe -clean: +clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.csm del $(OBJS)\*.csm @@ -199,3 +199,4 @@ $(OBJS)\secretstore.exe: $(SECRETSTORE_OBJECTS) $(OBJS)\secretstore_secretstore.obj: .\secretstore.cpp $(CXX) -q -c -P -o$@ $(SECRETSTORE_CXXFLAGS) .\secretstore.cpp + diff --git a/samples/secretstore/makefile.gcc b/samples/secretstore/makefile.gcc index a45210fd39..6ec08cb236 100644 --- a/samples/secretstore/makefile.gcc +++ b/samples/secretstore/makefile.gcc @@ -64,10 +64,10 @@ ifeq ($(SHARED),1) LIBTYPE_SUFFIX = dll endif ifeq ($(MONOLITHIC),0) -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = endif ifeq ($(MONOLITHIC),1) -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = endif ifeq ($(BUILD),debug) __OPTIMIZEFLAG_2 = -O0 @@ -79,13 +79,13 @@ ifeq ($(USE_RTTI),0) __RTTIFLAG_5 = -fno-rtti endif ifeq ($(USE_RTTI),1) -__RTTIFLAG_5 = +__RTTIFLAG_5 = endif ifeq ($(USE_EXCEPTIONS),0) __EXCEPTIONSFLAG_6 = -fno-exceptions endif ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG_6 = +__EXCEPTIONSFLAG_6 = endif ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -152,17 +152,17 @@ endif endif ifeq ($(BUILD),release) ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = +__DEBUGINFO = endif endif ifeq ($(DEBUG_INFO),0) -__DEBUGINFO = +__DEBUGINFO = endif ifeq ($(DEBUG_INFO),1) __DEBUGINFO = -g endif ifeq ($(USE_THREADS),0) -__THREADSFLAG = +__THREADSFLAG = endif ifeq ($(USE_THREADS),1) __THREADSFLAG = -mthreads @@ -177,7 +177,7 @@ $(OBJS): all: $(OBJS)\secretstore.exe -clean: +clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\secretstore.exe del $(OBJS)\secretstore.exe diff --git a/samples/secretstore/makefile.unx b/samples/secretstore/makefile.unx index 210af54eaf..603b4c00fd 100644 --- a/samples/secretstore/makefile.unx +++ b/samples/secretstore/makefile.unx @@ -10,19 +10,19 @@ # These are configurable options: # ------------------------------------------------------------------------- -# C++ compiler +# C++ compiler CXX = `$(WX_CONFIG) --cxx` -# Standard flags for C++ -CXXFLAGS ?= +# Standard flags for C++ +CXXFLAGS ?= -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS ?= +# Standard preprocessor flags (common for CC and CXX) +CPPFLAGS ?= -# Standard linker flags -LDFLAGS ?= +# Standard linker flags +LDFLAGS ?= -# Location and arguments of wx-config script +# Location and arguments of wx-config script WX_CONFIG ?= wx-config # Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb] @@ -34,7 +34,7 @@ WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --query-linkage`; then echo 1; els # Compile Unicode build of wxWidgets? [0,1] WX_UNICODE ?= $(shell $(WX_CONFIG) --query-chartype | sed 's/unicode/1/;s/ansi/0/') -# Version of the wx library to build against. +# Version of the wx library to build against. WX_VERSION ?= $(shell $(WX_CONFIG) --query-version | sed -e 's/\([0-9]*\)\.\([0-9]*\)/\1\2/') @@ -75,16 +75,16 @@ endif all: test_for_selected_wxbuild secretstore -install: +install: -uninstall: +uninstall: -clean: +clean: rm -f ./*.o rm -f ./*.d rm -f secretstore -test_for_selected_wxbuild: +test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) secretstore: $(SECRETSTORE_OBJECTS) diff --git a/samples/secretstore/makefile.vc b/samples/secretstore/makefile.vc index 74ee3a5bca..2e28a595e0 100644 --- a/samples/secretstore/makefile.vc +++ b/samples/secretstore/makefile.vc @@ -102,19 +102,19 @@ LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:X64 !endif !if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_0 = /Zi !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = +__DEBUGINFO_0 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = +__DEBUGINFO_0 = !endif !if "$(DEBUG_INFO)" == "1" __DEBUGINFO_0 = /Zi @@ -123,10 +123,10 @@ __DEBUGINFO_0 = /Zi __DEBUGINFO_1 = /DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = +__DEBUGINFO_1 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = +__DEBUGINFO_1 = !endif !if "$(DEBUG_INFO)" == "1" __DEBUGINFO_1 = /DEBUG @@ -135,10 +135,10 @@ __DEBUGINFO_1 = /DEBUG __DEBUGINFO_2 = $(__DEBUGRUNTIME_5) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2 = +__DEBUGINFO_2 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_2 = +__DEBUGINFO_2 = !endif !if "$(DEBUG_INFO)" == "1" __DEBUGINFO_2 = $(__DEBUGRUNTIME_5) @@ -147,10 +147,10 @@ __DEBUGINFO_2 = $(__DEBUGRUNTIME_5) ____DEBUGRUNTIME_3_p = /D_DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_3_p = +____DEBUGRUNTIME_3_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_3_p = +____DEBUGRUNTIME_3_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" ____DEBUGRUNTIME_3_p = /D_DEBUG @@ -159,16 +159,16 @@ ____DEBUGRUNTIME_3_p = /D_DEBUG __DEBUGRUNTIME_4 = d !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_4 = +__DEBUGRUNTIME_4 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_4 = +__DEBUGRUNTIME_4 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" __DEBUGRUNTIME_4 = d !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_5 = +__DEBUGRUNTIME_5 = !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" __DEBUGRUNTIME_5 = /opt:ref /opt:icf @@ -177,7 +177,7 @@ __DEBUGRUNTIME_5 = /opt:ref /opt:icf __DEBUGRUNTIME_5 = /opt:ref /opt:icf !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_5 = +__DEBUGRUNTIME_5 = !endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG_6 = /Od @@ -198,13 +198,13 @@ __RUNTIME_LIBS_10 = D __RUNTIME_LIBS_10 = $(__THREADSFLAG_9) !endif !if "$(USE_RTTI)" == "0" -__RTTIFLAG_11 = +__RTTIFLAG_11 = !endif !if "$(USE_RTTI)" == "1" __RTTIFLAG_11 = /GR !endif !if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_12 = +__EXCEPTIONSFLAG_12 = !endif !if "$(USE_EXCEPTIONS)" == "1" __EXCEPTIONSFLAG_12 = /EHsc @@ -284,7 +284,7 @@ $(OBJS): all: $(OBJS)\secretstore.exe -clean: +clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.pch del $(OBJS)\*.pch @@ -299,3 +299,4 @@ $(OBJS)\secretstore.exe: $(SECRETSTORE_OBJECTS) $(OBJS)\secretstore_secretstore.obj: .\secretstore.cpp $(CXX) /c /nologo /TP /Fo$@ $(SECRETSTORE_CXXFLAGS) .\secretstore.cpp + diff --git a/tests/Makefile.in b/tests/Makefile.in index a931266acb..668bb925b3 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -497,7 +497,7 @@ fr: esac; \ done -ja: +ja: @mkdir -p ./intl/ja @for f in internat.po internat.mo; do \ if test ! -f ./intl/ja/$$f -a ! -d ./intl/ja/$$f ; \ diff --git a/tests/makefile.bcc b/tests/makefile.bcc index de249aee29..4de882317d 100644 --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@ -532,7 +532,7 @@ fr: if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr -ja: +ja: if not exist $(OBJS)\intl\ja mkdir $(OBJS)\intl\ja for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\ja\%f copy .\intl\ja\%f $(OBJS)\intl\ja diff --git a/tests/makefile.gcc b/tests/makefile.gcc index b86bcc0062..5dc1004a37 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -508,7 +508,7 @@ fr: if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr for %%f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%%f copy .\intl\fr\%%f $(OBJS)\intl\fr -ja: +ja: if not exist $(OBJS)\intl\ja mkdir $(OBJS)\intl\ja for %%f in (internat.po internat.mo) do if not exist $(OBJS)\intl\ja\%%f copy .\intl\ja\%%f $(OBJS)\intl\ja diff --git a/tests/makefile.vc b/tests/makefile.vc index 34c88d0738..676d02e15b 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -709,7 +709,7 @@ fr: if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr -ja: +ja: if not exist $(OBJS)\intl\ja mkdir $(OBJS)\intl\ja for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\ja\%f copy .\intl\ja\%f $(OBJS)\intl\ja diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj index 3ed9e92602..ed7e734217 100644 --- a/tests/test_vc7_test_gui.vcproj +++ b/tests/test_vc7_test_gui.vcproj @@ -319,9 +319,6 @@ - - @@ -343,6 +340,9 @@ + + diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj index 2e9f8f1806..a8a9ed514c 100644 --- a/tests/test_vc8_test_gui.vcproj +++ b/tests/test_vc8_test_gui.vcproj @@ -862,10 +862,6 @@ RelativePath=".\graphics\boundingbox.cpp" > - - @@ -894,6 +890,10 @@ RelativePath=".\window\clientsize.cpp" > + + diff --git a/tests/test_vc9_test_gui.vcproj b/tests/test_vc9_test_gui.vcproj index 8083fd6285..f53fa6ec21 100644 --- a/tests/test_vc9_test_gui.vcproj +++ b/tests/test_vc9_test_gui.vcproj @@ -834,10 +834,6 @@ RelativePath=".\graphics\boundingbox.cpp" > - - @@ -866,6 +862,10 @@ RelativePath=".\window\clientsize.cpp" > + +