From ecf85bf4cbe99c773b17e04bc3798e3c235df8e6 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Fri, 22 May 2015 02:27:27 +0200 Subject: [PATCH] Remove WXWIN_OS_DESCRIPTION. This constant wasn't very useful as it contained the description of the OS on the machine where the library was built, not the one on which the application using it was running. It also wasn't used anywhere in wxWidgets and apparently wasn't meant to be used outside of it. Finally, putting the output of `uname -r` into it created problems with creating reproducible builds as just a change in the kernel version changed the build results. Closes #17002. --- configure | 13 ------------- configure.in | 15 --------------- docs/changes.txt | 2 ++ include/wx/osx/config_xcode.h | 1 - samples/minimal/makefile.mic | 2 +- samples/widgets/makefile.mic | 2 +- setup.h.in | 3 --- setup.h_vms | 3 --- src/x11/makefile.unx | 2 +- 9 files changed, 5 insertions(+), 38 deletions(-) diff --git a/configure b/configure index 37638ffd31..a9ea1093da 100755 --- a/configure +++ b/configure @@ -37242,19 +37242,6 @@ $as_echo "$as_me: WARNING: GStreamer not available... disabling wxMediaCtrl" >&2 fi -if test "$cross_compiling" != "no"; then - OSINFO="\"$host\"" -else - OSINFO=`uname -s -r -m` - OSINFO="\"$OSINFO\"" -fi - -cat >>confdefs.h <<_ACEOF -#define WXWIN_OS_DESCRIPTION $OSINFO -_ACEOF - - - if test "x$prefix" != "xNONE"; then wxPREFIX=$prefix else diff --git a/configure.in b/configure.in index c10f59aa0f..58722d25dc 100644 --- a/configure.in +++ b/configure.in @@ -7395,21 +7395,6 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then fi fi -dnl --------------------------------------------------------------------------- -dnl get the string with OS info - used by wxGetOsDescription() on MacOS X -dnl --------------------------------------------------------------------------- - -if test "$cross_compiling" != "no"; then - dnl Use best guess from host as we can't use uname when cross compiling - OSINFO="\"$host\"" -else - dnl attualy work out OS version - OSINFO=`uname -s -r -m` - OSINFO="\"$OSINFO\"" -fi - -AC_DEFINE_UNQUOTED(WXWIN_OS_DESCRIPTION, $OSINFO) - dnl --------------------------------------------------------------------------- dnl define the variable containing the installation prefix (used in dcpsg.cpp) dnl --------------------------------------------------------------------------- diff --git a/docs/changes.txt b/docs/changes.txt index 9b3a97f556..62d13a4659 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -33,6 +33,8 @@ Changes in behaviour which may result in build errors - "webview" library is not included in `wx-config --libs` output any more, you need to request it explicitly, e.g. `wx-config --libs std,webview`. +- WXWIN_OS_DESCRIPTION doesn't exist any longer, use wxGetOsDescription(). + 3.1.0: (released 2015-xx-xx) ---------------------------- diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h index 31f726e8cd..b49ced6df2 100644 --- a/include/wx/osx/config_xcode.h +++ b/include/wx/osx/config_xcode.h @@ -122,7 +122,6 @@ #define HAVE_LOCALE_T 1 #define wxHAS_KQUEUE 1 -#define WXWIN_OS_DESCRIPTION "Darwin 7.9.0 Power Macintosh" #define PACKAGE_BUGREPORT "wx-dev@lists.wxwidgets.org" #define PACKAGE_NAME "wxWidgets" #define PACKAGE_STRING "wxWidgets 3.1.0" diff --git a/samples/minimal/makefile.mic b/samples/minimal/makefile.mic index 6cabbbfdcc..46528f9c68 100644 --- a/samples/minimal/makefile.mic +++ b/samples/minimal/makefile.mic @@ -29,7 +29,7 @@ include $(CONFIG) # Directories list for header files INCLUDEDIRS += -I$(WXDIR)/include # Defines for preprocessor -DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ -DwxSIZE_T_IS_UINT -DWXWIN_OS_DESCRIPTION="\"MicroWindows\"" +DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ -DwxSIZE_T_IS_UINT # Compilation flags for C files OTHER than include directories CFLAGS += diff --git a/samples/widgets/makefile.mic b/samples/widgets/makefile.mic index cec3b76cfa..88314e7ece 100644 --- a/samples/widgets/makefile.mic +++ b/samples/widgets/makefile.mic @@ -30,7 +30,7 @@ include $(CONFIG) # Directories list for header files INCLUDEDIRS += -I$(WXDIR)/include # Defines for preprocessor -DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ -DwxSIZE_T_IS_UINT -DWXWIN_OS_DESCRIPTION="\"MicroWindows\"" +DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ -DwxSIZE_T_IS_UINT # Compilation flags for C files OTHER than include directories CFLAGS += diff --git a/setup.h.in b/setup.h.in index 18cc641f92..d9af56147b 100644 --- a/setup.h.in +++ b/setup.h.in @@ -14,9 +14,6 @@ #endif /* __cplusplus */ -/* fill in with the string wxGetOsDescription() will return */ -#undef WXWIN_OS_DESCRIPTION - /* the installation location prefix from configure */ #undef wxINSTALL_PREFIX diff --git a/setup.h_vms b/setup.h_vms index ffadeb77ae..28224912ac 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -30,9 +30,6 @@ #endif /* __cplusplus */ -/* fill in with the string wxGetOsDescription() will return */ -#define WXWIN_OS_DESCRIPTION "OpenVMS" - /* the installation location prefix from configure */ #undef wxINSTALL_PREFIX diff --git a/src/x11/makefile.unx b/src/x11/makefile.unx index 60d21f875b..da23b96819 100644 --- a/src/x11/makefile.unx +++ b/src/x11/makefile.unx @@ -274,7 +274,7 @@ include $(CONFIG) # Directories list for header files INCLUDEDIRS += -I$(WXDIR)/include # Defines for preprocessor -DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ -DwxSIZE_T_IS_UINT -DWXWIN_OS_DESCRIPTION="\"MicroWindows\"" +DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ -DwxSIZE_T_IS_UINT # Compilation flags for C files OTHER than include directories CFLAGS +=