From 7eee3576cf473d20438f00b620995848644074d8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 2 Mar 2016 23:16:16 +0100 Subject: [PATCH] Update version to 3.1.1 Update misc/scripts/inc_release script: remove non-existent any more files and update the version in the MSVS 200x project files not generated by bakefile any more and MSVS 201x project files which were not previously taken into account. Run it and rebake. --- Makefile.in | 30 ++++++++++++------------ build/bakefiles/version.bkl | 2 +- build/msw/makefile.bcc | 4 ++-- build/msw/makefile.gcc | 4 ++-- build/msw/makefile.vc | 4 ++-- build/msw/wx_setup.props | 2 +- build/osx/wxvers.xcconfig | 2 +- configure.in | 4 ++-- demos/bombs/Makefile.in | 2 +- demos/forty/Makefile.in | 2 +- demos/fractal/Makefile.in | 2 +- demos/life/Makefile.in | 2 +- demos/poem/Makefile.in | 2 +- docs/doxygen/Doxyfile | 2 +- docs/readme.txt | 6 ++--- include/wx/osx/config_xcode.h | 4 ++-- include/wx/version.h | 4 ++-- misc/scripts/inc_release | 14 +++++++---- samples/Info.plist | 8 +++---- samples/access/Makefile.in | 2 +- samples/animate/Makefile.in | 2 +- samples/artprov/Makefile.in | 2 +- samples/aui/Makefile.in | 2 +- samples/calendar/Makefile.in | 2 +- samples/caret/Makefile.in | 2 +- samples/clipboard/Makefile.in | 2 +- samples/collpane/Makefile.in | 2 +- samples/combo/Makefile.in | 2 +- samples/config/Makefile.in | 2 +- samples/dataview/Makefile.in | 2 +- samples/debugrpt/Makefile.in | 2 +- samples/dialogs/Makefile.in | 2 +- samples/dialup/Makefile.in | 2 +- samples/display/Makefile.in | 2 +- samples/dll/Makefile.in | 2 +- samples/dnd/Makefile.in | 2 +- samples/docview/Info.plist | 8 +++---- samples/docview/Makefile.in | 2 +- samples/dragimag/Makefile.in | 2 +- samples/drawing/Makefile.in | 2 +- samples/erase/Makefile.in | 2 +- samples/event/Makefile.in | 2 +- samples/except/Makefile.in | 2 +- samples/exec/Makefile.in | 2 +- samples/font/Makefile.in | 2 +- samples/fswatcher/Makefile.in | 2 +- samples/grid/Makefile.in | 2 +- samples/help/Makefile.in | 2 +- samples/htlbox/Makefile.in | 2 +- samples/html/about/Makefile.in | 2 +- samples/html/help/Makefile.in | 2 +- samples/html/helpview/Makefile.in | 2 +- samples/html/htmlctrl/Makefile.in | 2 +- samples/html/printing/Makefile.in | 2 +- samples/html/test/Makefile.in | 2 +- samples/html/virtual/Makefile.in | 2 +- samples/html/widget/Makefile.in | 2 +- samples/html/zip/Makefile.in | 2 +- samples/image/Makefile.in | 2 +- samples/internat/Makefile.in | 2 +- samples/ipc/Makefile.in | 2 +- samples/joytest/Makefile.in | 2 +- samples/keyboard/Makefile.in | 2 +- samples/layout/Makefile.in | 2 +- samples/listctrl/Makefile.in | 2 +- samples/mdi/Makefile.in | 2 +- samples/mediaplayer/Makefile.in | 2 +- samples/memcheck/Makefile.in | 2 +- samples/menu/Makefile.in | 2 +- samples/minimal/Info_cocoa.plist | 8 +++---- samples/minimal/Makefile.in | 2 +- samples/nativdlg/Makefile.in | 2 +- samples/notebook/Makefile.in | 2 +- samples/oleauto/Makefile.in | 2 +- samples/opengl/cube/Makefile.in | 2 +- samples/opengl/isosurf/Makefile.in | 2 +- samples/opengl/penguin/Makefile.in | 2 +- samples/opengl/pyramid/Makefile.in | 2 +- samples/ownerdrw/Makefile.in | 2 +- samples/popup/Makefile.in | 2 +- samples/power/Makefile.in | 2 +- samples/preferences/Makefile.in | 2 +- samples/printing/Makefile.in | 2 +- samples/propgrid/Makefile.in | 2 +- samples/regtest/Makefile.in | 2 +- samples/render/Makefile.in | 4 ++-- samples/render/makefile.bcc | 2 +- samples/render/makefile.gcc | 2 +- samples/render/makefile.vc | 2 +- samples/render/render_vc7_renddll.vcproj | 12 +++++----- samples/render/render_vc8_renddll.vcproj | 24 +++++++++---------- samples/render/render_vc9_renddll.vcproj | 24 +++++++++---------- samples/ribbon/Makefile.in | 2 +- samples/richtext/Makefile.in | 2 +- samples/sashtest/Makefile.in | 2 +- samples/scroll/Makefile.in | 2 +- samples/shaped/Makefile.in | 2 +- samples/sockets/Makefile.in | 2 +- samples/sound/Makefile.in | 2 +- samples/splash/Makefile.in | 2 +- samples/splitter/Makefile.in | 2 +- samples/statbar/Makefile.in | 2 +- samples/stc/Makefile.in | 2 +- samples/svg/Makefile.in | 2 +- samples/taborder/Makefile.in | 2 +- samples/taskbar/Makefile.in | 2 +- samples/taskbarbutton/Makefile.in | 2 +- samples/text/Makefile.in | 2 +- samples/thread/Makefile.in | 2 +- samples/toolbar/Makefile.in | 2 +- samples/treectrl/Makefile.in | 2 +- samples/treelist/Makefile.in | 2 +- samples/typetest/Makefile.in | 2 +- samples/uiaction/Makefile.in | 2 +- samples/validate/Makefile.in | 2 +- samples/vscroll/Makefile.in | 2 +- samples/webview/Makefile.in | 2 +- samples/widgets/Makefile.in | 2 +- samples/wizard/Makefile.in | 2 +- samples/wrapsizer/Makefile.in | 2 +- samples/xrc/Makefile.in | 2 +- samples/xti/Makefile.in | 2 +- tests/Makefile.in | 2 +- tests/benchmarks/Makefile.in | 2 +- utils/helpview/src/Makefile.in | 2 +- utils/screenshotgen/src/Makefile.in | 2 +- 126 files changed, 193 insertions(+), 189 deletions(-) diff --git a/Makefile.in b/Makefile.in index 57f68c1d66..ab6beaf2f4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -77,8 +77,8 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 WX_RELEASE_NODOT = 31 -WX_VERSION = $(WX_RELEASE).0 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 +WX_VERSION = $(WX_RELEASE).1 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1 LIBDIRNAME = $(wx_top_builddir)/lib WXREGEX_CFLAGS = -DNDEBUG -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \ $(CPPFLAGS) $(CFLAGS) @@ -13165,7 +13165,7 @@ COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \ @COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc @COND_USE_XRC_1@__install_wxrc___depname = install-wxrc @COND_TOOLKIT_MSW@RCDEFS_H = msw/rcdefs.h -@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).1.r @COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install @COND_SHARED_0@____SHARED = @COND_SHARED_1@____SHARED = $(PIC_FLAG) @@ -13762,17 +13762,17 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_65 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p_65 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p_65 = --define wxNO_THREADS -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).0 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).1 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .1.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).1.0.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) -@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX) +@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -1.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX) -@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).0 +@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).1 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \ @@ -13970,7 +13970,7 @@ clean: $(__clean_wxrc___depname) rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) rm -f $(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) -(cd samples && $(MAKE) clean) - rm -f lib/libwx_$(TOOLCHAIN_NAME).0.rsrc lib/libwx_$(TOOLCHAIN_NAME).0.r + rm -f lib/libwx_$(TOOLCHAIN_NAME).1.rsrc lib/libwx_$(TOOLCHAIN_NAME).1.r distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @@ -14749,13 +14749,13 @@ locale_msw_uninstall: fi ; \ done -@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).0.r: -@COND_TOOLKIT_COCOA@ $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).0.rsrc -@COND_TOOLKIT_COCOA@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).1.r: +@COND_TOOLKIT_COCOA@ $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).1.rsrc +@COND_TOOLKIT_COCOA@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).1.r @COND_TOOLKIT_COCOA@cocoa-res-install: $(__cocoa_res___depname) -@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.r $(libdir) -@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc $(libdir) +@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.r $(libdir) +@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc $(libdir) wxregex_regcomp.o: $(srcdir)/src/regex/regcomp.c $(CCC) -c -o $@ $(WXREGEX_CFLAGS) $(srcdir)/src/regex/regcomp.c diff --git a/build/bakefiles/version.bkl b/build/bakefiles/version.bkl index e894e41ac5..d10595924b 100644 --- a/build/bakefiles/version.bkl +++ b/build/bakefiles/version.bkl @@ -22,7 +22,7 @@ 3. Else, i.e. if there were no changes at all to API but only internal changes, change C:R:A to C:R+1:A --> - 0 + 1 0 0 diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 36bd8e1610..1d5757e4f4 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -39,7 +39,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \ -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" WX_RELEASE_NODOT = 31 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1 COMPILER_PREFIX = bcc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -5561,7 +5561,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 2ceea9b67b..1d8c32c6c8 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -33,7 +33,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ WINDRES="$(WINDRES)" CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 31 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1 COMPILER_PREFIX = gcc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -5736,7 +5736,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 5a30f76808..71eeff2230 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -30,7 +30,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" WX_RELEASE_NODOT = 31 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1 COMPILER_PREFIX = vc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) @@ -6253,7 +6253,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) diff --git a/build/msw/wx_setup.props b/build/msw/wx_setup.props index 935d649f1a..0cee81fb4b 100644 --- a/build/msw/wx_setup.props +++ b/build/msw/wx_setup.props @@ -1,7 +1,7 @@  - 310 + 311 31 msw vc diff --git a/build/osx/wxvers.xcconfig b/build/osx/wxvers.xcconfig index 1033a57fc7..e4fe5bf103 100644 --- a/build/osx/wxvers.xcconfig +++ b/build/osx/wxvers.xcconfig @@ -1,4 +1,4 @@ // update this file with new version numbers DYLIB_COMPATIBILITY_VERSION = 3.1 -DYLIB_CURRENT_VERSION = 3.1.0 +DYLIB_CURRENT_VERSION = 3.1.1 diff --git a/configure.in b/configure.in index 3971754689..d0c441f1c3 100644 --- a/configure.in +++ b/configure.in @@ -14,7 +14,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWidgets], [3.1.0], [wx-dev@googlegroups.com]) +AC_INIT([wxWidgets], [3.1.1], [wx-dev@googlegroups.com]) dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package AC_CONFIG_SRCDIR([wx-config.in]) @@ -40,7 +40,7 @@ dnl wx_release_number += 1 wx_major_version_number=3 wx_minor_version_number=1 -wx_release_number=0 +wx_release_number=1 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in index 4d4bc80fae..2b55213594 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib BOMBS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index 0a965941e4..a5271a3991 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in index 617b8f55a8..9e233139d5 100644 --- a/demos/fractal/Makefile.in +++ b/demos/fractal/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in index ca4431ef01..cf4b717205 100644 --- a/demos/life/Makefile.in +++ b/demos/life/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in index 93688ed6d1..318db8b408 100644 --- a/demos/poem/Makefile.in +++ b/demos/poem/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib WXPOEM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile index 84d6ea57ad..a5dd625c2f 100644 --- a/docs/doxygen/Doxyfile +++ b/docs/doxygen/Doxyfile @@ -6,7 +6,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = wxWidgets -PROJECT_NUMBER = 3.1.0 +PROJECT_NUMBER = 3.1.1 PROJECT_BRIEF = PROJECT_LOGO = logo.png OUTPUT_DIRECTORY = out diff --git a/docs/readme.txt b/docs/readme.txt index cafaa741dc..d5ae14f8c0 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -1,4 +1,4 @@ -wxWidgets 3.1.0 Release Notes +wxWidgets 3.1.1 Release Notes ============================= Welcome to the latest development release of wxWidgets, a free and open source @@ -16,12 +16,12 @@ more about wxWidgets at: Documentation is available online at: -* http://docs.wxwidgets.org/3.1.0/ +* http://docs.wxwidgets.org/3.1.1/ wxWidgets sources and binaries for the selected platforms are available for download from: -* https://github.com/wxWidgets/wxWidgets/releases/tag/v3.1.0/ +* https://github.com/wxWidgets/wxWidgets/releases/tag/v3.1.1/ Changes diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h index 2f38214f8f..ca0619bc78 100644 --- a/include/wx/osx/config_xcode.h +++ b/include/wx/osx/config_xcode.h @@ -123,9 +123,9 @@ #define PACKAGE_BUGREPORT "wx-dev@googlegroups.com" #define PACKAGE_NAME "wxWidgets" -#define PACKAGE_STRING "wxWidgets 3.1.0" +#define PACKAGE_STRING "wxWidgets 3.1.1" #define PACKAGE_TARNAME "wxwidgets" -#define PACKAGE_VERSION "3.1.0" +#define PACKAGE_VERSION "3.1.1" // for regex #define WX_NO_REGEX_ADVANCED 1 diff --git a/include/wx/version.h b/include/wx/version.h index 16578dc283..57ec66fa40 100644 --- a/include/wx/version.h +++ b/include/wx/version.h @@ -27,9 +27,9 @@ /* NB: this file is parsed by automatic tools so don't change its format! */ #define wxMAJOR_VERSION 3 #define wxMINOR_VERSION 1 -#define wxRELEASE_NUMBER 0 +#define wxRELEASE_NUMBER 1 #define wxSUBRELEASE_NUMBER 0 -#define wxVERSION_STRING wxT("wxWidgets 3.1.0") +#define wxVERSION_STRING wxT("wxWidgets 3.1.1") /* nothing to update below this line when updating the version */ /* ---------------------------------------------------------------------------- */ diff --git a/misc/scripts/inc_release b/misc/scripts/inc_release index dfea623b29..76e067b957 100755 --- a/misc/scripts/inc_release +++ b/misc/scripts/inc_release @@ -78,9 +78,6 @@ run_sed configure.in \ run_sed build/osx/wxvers.xcconfig \ "/DYLIB_.* = /s/$ver_for_sed/$ver_string_new/" -run_sed build/tools/bld_chm_exe.bat \ - "/^SET WXW_VER=/s/$ver_for_sed/$ver_string_new/" - run_sed docs/readme.txt \ "/wxWidgets /s/$ver_for_sed/$ver_string_new/" \ "/\//s/$ver_for_sed/$ver_string_new/" \ @@ -101,8 +98,6 @@ run_sed samples/Info.plist \ "/version/s/$ver_for_sed/$ver_string_new/" \ "//s/$ver_for_sed/$ver_string_new/" -run_sed samples/minimal/Info_carbon.plist \ - "//s/$ver_for_sed/$ver_string_new/" run_sed samples/minimal/Info_cocoa.plist \ "//s/$ver_for_sed/$ver_string_new/" @@ -110,4 +105,13 @@ run_sed samples/docview/Info.plist \ "/versionon/s/$ver_for_sed/$ver_string_new/" \ "//s/$ver_for_sed/$ver_string_new/" +msgn " processing MSVS 200x project files ... " +for f in build/msw/wx_vc[789]*.vcproj; do + sed -i -e 's/\(\(msw\|base\)$ver_major$ver_minor\)$ver_release/\1$ver_release_new/g' $f +done +msgc "done" + +run_sed build/msw/wx_setup.props \ + "//s/\($ver_major$ver_minor\)$ver_release/\1$ver_release_new/" + msg "Don't forget to change the C:R:A triplet in build/bakefiles/version.bkl now!" diff --git a/samples/Info.plist b/samples/Info.plist index cc6e9483ed..51607647cd 100644 --- a/samples/Info.plist +++ b/samples/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 3.1.0, (c) 2005-2016 wxWidgets + $(PRODUCT_NAME) version 3.1.1, (c) 2005-2016 wxWidgets CFBundleIconFile wxmac.icns CFBundleIdentifier @@ -15,17 +15,17 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 3.1.0, (c) 2005-2016 wxWidgets + 3.1.1, (c) 2005-2016 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 3.1.0 + 3.1.1 CFBundleSignature ???? CFBundleVersion - 3.1.0 + 3.1.1 CSResourcesFileMapped LSRequiresCarbon diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index 361548dbd3..c431c4c3b0 100644 --- a/samples/access/Makefile.in +++ b/samples/access/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib ACCESSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in index 13c257de1a..3d0ecfd878 100644 --- a/samples/animate/Makefile.in +++ b/samples/animate/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib ANITEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index cf01dea2f8..0932729f1b 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib ARTTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in index 0381160b9f..3589c90bb5 100644 --- a/samples/aui/Makefile.in +++ b/samples/aui/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib AUIDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index cc68376340..6618fbd969 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib CALENDAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index 0bf5a650fe..973741d8bb 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/clipboard/Makefile.in b/samples/clipboard/Makefile.in index eb7a135dfb..22c65f1d87 100644 --- a/samples/clipboard/Makefile.in +++ b/samples/clipboard/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib CLIPBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in index f202cc022a..d5732d87ef 100644 --- a/samples/collpane/Makefile.in +++ b/samples/collpane/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib COLLPANE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in index 0cb9c451d6..8ec1aa0225 100644 --- a/samples/combo/Makefile.in +++ b/samples/combo/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib COMBO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index 830fda81d5..a9b3534ac7 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in index fc6288284e..9abd241ecc 100644 --- a/samples/dataview/Makefile.in +++ b/samples/dataview/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib DATAVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in index 8fce1c0916..24b02acd07 100644 --- a/samples/debugrpt/Makefile.in +++ b/samples/debugrpt/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib DEBUGRPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index 8c7d579748..c3a22fe187 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index a54f0ab4cd..6d6b85843d 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index d40a145a85..c5e87d903d 100644 --- a/samples/display/Makefile.in +++ b/samples/display/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib DISPLAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/dll/Makefile.in b/samples/dll/Makefile.in index 0f535665ea..e6308980df 100644 --- a/samples/dll/Makefile.in +++ b/samples/dll/Makefile.in @@ -48,7 +48,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib MY_DLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index eab03eb982..753feab706 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib DND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/docview/Info.plist b/samples/docview/Info.plist index 849ef87843..47761967bf 100644 --- a/samples/docview/Info.plist +++ b/samples/docview/Info.plist @@ -51,7 +51,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 3.1.0, (c) 2005-2016 wxWidgets + $(PRODUCT_NAME) version 3.1.1, (c) 2005-2016 wxWidgets CFBundleIconFile doc CFBundleIdentifier @@ -66,17 +66,17 @@ it CFBundleLongVersionString - 3.1.0, (c) 2005-2016 wxWidgets + 3.1.1, (c) 2005-2016 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 3.1.0 + 3.1.1 CFBundleSignature WXMA CFBundleVersion - 3.1.0 + 3.1.1 CSResourcesFileMapped LSRequiresCarbon diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index 629fdf2b93..18227ec5e8 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index 08fbed0e57..10cee14273 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib DRAGIMAG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index 874af30ae7..472d48d930 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib DRAWING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index ea25733d33..63a107859e 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index d5266ed33a..6d2379473c 100644 --- a/samples/event/Makefile.in +++ b/samples/event/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib EVENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in index da237a4919..3a0ce3a624 100644 --- a/samples/except/Makefile.in +++ b/samples/except/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib EXCEPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index a24684860f..bab8738ed3 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib EXEC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index e1a24756ef..8760626c8c 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/fswatcher/Makefile.in b/samples/fswatcher/Makefile.in index 95ab22693c..8e83652b36 100644 --- a/samples/fswatcher/Makefile.in +++ b/samples/fswatcher/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib FSWATCHER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index 7ba7d94991..8f29198d9b 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index 01d26f3e3e..480f226dd1 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index 31c235ce85..02aeb1d4da 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in index d927b0dfb4..0d81ffd62f 100644 --- a/samples/html/about/Makefile.in +++ b/samples/html/about/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in index fc9586ea4e..d5f075c085 100644 --- a/samples/html/help/Makefile.in +++ b/samples/html/help/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib HTMLHELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in index 603915e7e7..547a6ce661 100644 --- a/samples/html/helpview/Makefile.in +++ b/samples/html/helpview/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in index a5c25defdb..b63e814b51 100644 --- a/samples/html/htmlctrl/Makefile.in +++ b/samples/html/htmlctrl/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib HTMLCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in index 55058c77b3..418b58cfd7 100644 --- a/samples/html/printing/Makefile.in +++ b/samples/html/printing/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib HTMLPRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in index b05edfbd29..31307adbf8 100644 --- a/samples/html/test/Makefile.in +++ b/samples/html/test/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in index 173294db86..ac6adae72b 100644 --- a/samples/html/virtual/Makefile.in +++ b/samples/html/virtual/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in index 5db8140fc6..75a21cdfa3 100644 --- a/samples/html/widget/Makefile.in +++ b/samples/html/widget/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in index 437a72007f..85400c58f2 100644 --- a/samples/html/zip/Makefile.in +++ b/samples/html/zip/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index a4ee7cb5e6..492cc93e96 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index 9c1b6e9249..cec0fda725 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index f44bb3fc6d..846e1a4fe4 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib IPCCLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index 708ddbe422..7fbfdd48ce 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib JOYTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index 0b1f0f99ba..8174f173ab 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index d2e7dc324c..68de9e75de 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index 753876840e..e16051412c 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib LISTCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index d70720779d..ee2d79e327 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib MDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in index 6545476e30..e5dd807c9f 100644 --- a/samples/mediaplayer/Makefile.in +++ b/samples/mediaplayer/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib MEDIAPLAYER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in index 283274d636..caba2f0c8c 100644 --- a/samples/memcheck/Makefile.in +++ b/samples/memcheck/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib MEMCHECK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in index c95ced3c7b..ba69a0c901 100644 --- a/samples/menu/Makefile.in +++ b/samples/menu/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/minimal/Info_cocoa.plist b/samples/minimal/Info_cocoa.plist index 38ac7a9f05..3d95ed4145 100644 --- a/samples/minimal/Info_cocoa.plist +++ b/samples/minimal/Info_cocoa.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 3.1.0, (c) 2005-2016 wxWidgets + $(PRODUCT_NAME) version 3.1.1, (c) 2005-2016 wxWidgets CFBundleIconFile wxmac.icns CFBundleIdentifier @@ -22,17 +22,17 @@ it CFBundleLongVersionString - 3.1.0, (c) 2005-2016 wxWidgets + 3.1.1, (c) 2005-2016 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 3.1.0 + 3.1.1 CFBundleSignature ???? CFBundleVersion - 3.1.0 + 3.1.1 NSHumanReadableCopyright Copyright 2005-2016 wxWidgets NSPrincipalClass diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index 57580cc098..992c0fb7b4 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib MINIMAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index 1198474708..2b0a0c2b20 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib NATIVDLG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in index 090a46507b..03f685f533 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib NOTEBOOK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in index 51508f502b..5c9aef6415 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in index 8e4965db18..ed2f2120cb 100644 --- a/samples/opengl/cube/Makefile.in +++ b/samples/opengl/cube/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index e9b6ca84f9..a00bf7532d 100644 --- a/samples/opengl/isosurf/Makefile.in +++ b/samples/opengl/isosurf/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in index daaed9b092..0f2cba9ffc 100644 --- a/samples/opengl/penguin/Makefile.in +++ b/samples/opengl/penguin/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/opengl/pyramid/Makefile.in b/samples/opengl/pyramid/Makefile.in index 5dcc1b69c0..46546ef67d 100644 --- a/samples/opengl/pyramid/Makefile.in +++ b/samples/opengl/pyramid/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib PYRAMID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in index 65ae1c5587..b6b0ff737b 100644 --- a/samples/ownerdrw/Makefile.in +++ b/samples/ownerdrw/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib OWNERDRW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in index b8e257b5be..91e6570072 100644 --- a/samples/popup/Makefile.in +++ b/samples/popup/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib POPUP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in index 02d92c32b8..f6e0f150f3 100644 --- a/samples/power/Makefile.in +++ b/samples/power/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib POWER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/preferences/Makefile.in b/samples/preferences/Makefile.in index d2b94005a6..f27c25561e 100644 --- a/samples/preferences/Makefile.in +++ b/samples/preferences/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib PREFERENCES_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index 856d359021..7ff37fde6c 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/propgrid/Makefile.in b/samples/propgrid/Makefile.in index effb7f9b61..dd23cb77dd 100644 --- a/samples/propgrid/Makefile.in +++ b/samples/propgrid/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib PROPGRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index ffe00a9d14..18d6e92f0f 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib REGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in index 54d675b370..8423a762a3 100644 --- a/samples/render/Makefile.in +++ b/samples/render/Makefile.in @@ -51,8 +51,8 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 WX_RELEASE_NODOT = 31 -WX_VERSION = $(WX_RELEASE).0 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 +WX_VERSION = $(WX_RELEASE).1 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1 LIBDIRNAME = $(wx_top_builddir)/lib PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0) RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ diff --git a/samples/render/makefile.bcc b/samples/render/makefile.bcc index bea9a23d54..6dd40d2e90 100644 --- a/samples/render/makefile.bcc +++ b/samples/render/makefile.bcc @@ -22,7 +22,7 @@ BCCDIR = $(MAKEDIR)\.. ### Variables: ### WX_RELEASE_NODOT = 31 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1 COMPILER_PREFIX = bcc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) diff --git a/samples/render/makefile.gcc b/samples/render/makefile.gcc index 15a5201b65..db9de08669 100644 --- a/samples/render/makefile.gcc +++ b/samples/render/makefile.gcc @@ -14,7 +14,7 @@ include ../../build/msw/config.gcc CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 31 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1 COMPILER_PREFIX = gcc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) diff --git a/samples/render/makefile.vc b/samples/render/makefile.vc index 753c6fee99..47f1deaf95 100644 --- a/samples/render/makefile.vc +++ b/samples/render/makefile.vc @@ -13,7 +13,7 @@ ### Variables: ### WX_RELEASE_NODOT = 31 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1 COMPILER_PREFIX = vc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) diff --git a/samples/render/render_vc7_renddll.vcproj b/samples/render/render_vc7_renddll.vcproj index 203a104135..618238cd45 100644 --- a/samples/render/render_vc7_renddll.vcproj +++ b/samples/render/render_vc7_renddll.vcproj @@ -36,7 +36,7 @@ BufferSecurityCheck="TRUE" RuntimeTypeInfo="TRUE" ObjectFile="vc_mswuddll\renddll\" - ProgramDataBaseFileName="vc_mswuddll\renddll_mswud310_vc.pdb" + ProgramDataBaseFileName="vc_mswuddll\renddll_mswud311_vc.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -47,12 +47,12 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" - OutputFile="vc_mswuddll\renddll_mswud310_vc.dll" + OutputFile="vc_mswuddll\renddll_mswud311_vc.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="vc_mswuddll\renddll_mswud310_vc.pdb" + ProgramDatabaseFile="vc_mswuddll\renddll_mswud311_vc.pdb" TargetMachine="1"/> diff --git a/samples/render/render_vc8_renddll.vcproj b/samples/render/render_vc8_renddll.vcproj index db3fd66ae4..88fafb9251 100644 --- a/samples/render/render_vc8_renddll.vcproj +++ b/samples/render/render_vc8_renddll.vcproj @@ -62,7 +62,7 @@ BufferSecurityCheck="true" RuntimeTypeInfo="true" ObjectFile="vc_mswuddll\renddll\" - ProgramDataBaseFileName="vc_mswuddll\renddll_mswud310_vc.pdb" + ProgramDataBaseFileName="vc_mswuddll\renddll_mswud311_vc.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -84,13 +84,13 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" - OutputFile="vc_mswuddll\renddll_mswud310_vc.dll" + OutputFile="vc_mswuddll\renddll_mswud311_vc.dll" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswuddll\renddll_mswud310_vc.pdb" + ProgramDatabaseFile="vc_mswuddll\renddll_mswud311_vc.pdb" TargetMachine="1" />