osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Change some names to reflect Apple's new UNIX-for-Macs name. 

{OS_X,os_x} -> {MACOS,macos}.

Change-Id: Icebea6ab566c65996ee97bacb88fac7e84ec32de
Reviewed-on: https://code.wireshark.org/review/22161
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2017-06-16 01:49:44 -07:00
parent 63b91ad311
commit 5039d0e576
9 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1155,7 +1155,7 @@ if(APPLE)
# We assume that APPLE means macOS so that we have the macOS # We assume that APPLE means macOS so that we have the macOS
# frameworks. # frameworks.
# #
set(HAVE_OS_X_FRAMEWORKS 1) set(HAVE_MACOS_FRAMEWORKS 1)
FIND_LIBRARY (APPLE_APPLICATION_SERVICES_LIBRARY ApplicationServices) FIND_LIBRARY (APPLE_APPLICATION_SERVICES_LIBRARY ApplicationServices)
FIND_LIBRARY (APPLE_CORE_FOUNDATION_LIBRARY CoreFoundation) FIND_LIBRARY (APPLE_CORE_FOUNDATION_LIBRARY CoreFoundation)
FIND_LIBRARY (APPLE_SYSTEM_CONFIGURATION_LIBRARY SystemConfiguration) FIND_LIBRARY (APPLE_SYSTEM_CONFIGURATION_LIBRARY SystemConfiguration)

6
Makefile.am
View File

@ -988,7 +988,7 @@ libtool: $(LIBTOOL_DEPS)
# #
install-data-local: install-data-local:
if BUILDING_WIRESHARK if BUILDING_WIRESHARK
if NOT_OS_X if NOT_MACOS
mkdir -p $(DESTDIR)$(datadir)/mime/packages mkdir -p $(DESTDIR)$(datadir)/mime/packages
install -m 644 $(srcdir)/wireshark-mime-package.xml $(DESTDIR)$(datadir)/mime/packages/wireshark.xml install -m 644 $(srcdir)/wireshark-mime-package.xml $(DESTDIR)$(datadir)/mime/packages/wireshark.xml
mkdir -p $(DESTDIR)$(datadir)/appdata mkdir -p $(DESTDIR)$(datadir)/appdata
@ -1013,7 +1013,7 @@ endif
uninstall-local: uninstall-local:
if BUILDING_WIRESHARK if BUILDING_WIRESHARK
if NOT_OS_X if NOT_MACOS
rm -f $(DESTDIR)$(datadir)/appdata/wireshark.appdata.xml rm -f $(DESTDIR)$(datadir)/appdata/wireshark.appdata.xml
rm -f $(DESTDIR)$(datadir)/applications/wireshark.desktop rm -f $(DESTDIR)$(datadir)/applications/wireshark.desktop
rm -f $(DESTDIR)$(datadir)/applications/wireshark-gtk.desktop rm -f $(DESTDIR)$(datadir)/applications/wireshark-gtk.desktop
@ -1059,7 +1059,7 @@ uninstall-hook: update-databases-and-caches-uninstall
# #
update-databases-and-caches-common: update-databases-and-caches-common:
if BUILDING_WIRESHARK if BUILDING_WIRESHARK
if NOT_OS_X if NOT_MACOS
@echo "You may need to run \"ldconfig\" as root" @echo "You may need to run \"ldconfig\" as root"
@echo "You may need to run \"update-desktop-database $(datadir)/applications\"" @echo "You may need to run \"update-desktop-database $(datadir)/applications\""
@echo "You may need to run \"update-mime-database $(datadir)/mime\"" @echo "You may need to run \"update-mime-database $(datadir)/mime\""

6
cmake/modules/FindOS_X_FRAMEWORKS.cmake
View File

@ -5,7 +5,7 @@
# APPLE_APPLICATION_SERVICES_LIBRARY - ApplicationServices framework # APPLE_APPLICATION_SERVICES_LIBRARY - ApplicationServices framework
# APPLE_CORE_FOUNDATION_LIBRARY - CoreFoundation frameowkr # APPLE_CORE_FOUNDATION_LIBRARY - CoreFoundation frameowkr
# APPLE_SYSTEM_CONFIGURATION_LIBRARY - SystemConfiguration framework # APPLE_SYSTEM_CONFIGURATION_LIBRARY - SystemConfiguration framework
# HAVE_OS_X_FRAMEWORKS - True if we're on macOS # HAVE_MACOS_FRAMEWORKS - True if we're on macOS
if(APPLE) if(APPLE)
@ -13,8 +13,8 @@ if(APPLE)
# We assume that APPLE means macOS so that we have the macOS # We assume that APPLE means macOS so that we have the macOS
# frameworks. # frameworks.
# #
set(HAVE_OS_X_FRAMEWORKS 1) set(HAVE_MACOS_FRAMEWORKS 1)
set(OS_X_FRAMEWORKS_FOUND TRUE) set(MACOS_FRAMEWORKS_FOUND TRUE)
FIND_LIBRARY (APPLE_APPLICATION_SERVICES_LIBRARY ApplicationServices) FIND_LIBRARY (APPLE_APPLICATION_SERVICES_LIBRARY ApplicationServices)
FIND_LIBRARY (APPLE_CORE_FOUNDATION_LIBRARY CoreFoundation) FIND_LIBRARY (APPLE_CORE_FOUNDATION_LIBRARY CoreFoundation)
FIND_LIBRARY (APPLE_SYSTEM_CONFIGURATION_LIBRARY SystemConfiguration) FIND_LIBRARY (APPLE_SYSTEM_CONFIGURATION_LIBRARY SystemConfiguration)

2
cmakeconfig.h.in
View File

@ -218,7 +218,7 @@
#cmakedefine HAVE_NTDDNDIS_H 1 #cmakedefine HAVE_NTDDNDIS_H 1
/* Define to 1 if you have macOS frameworks */ /* Define to 1 if you have macOS frameworks */
#cmakedefine HAVE_OS_X_FRAMEWORKS 1 #cmakedefine HAVE_MACOS_FRAMEWORKS 1
/* Define to 1 if you have the macOS CFPropertyListCreateWithStream function */ /* Define to 1 if you have the macOS CFPropertyListCreateWithStream function */
#cmakedefine HAVE_CFPROPERTYLISTCREATEWITHSTREAM 1 #cmakedefine HAVE_CFPROPERTYLISTCREATEWITHSTREAM 1

10
configure.ac
View File

@ -517,7 +517,7 @@ AC_SUBST(HAVE_OSX_PACKAGING)
# don't look for Darwin). # don't look for Darwin).
# #
AC_CHECK_PROG(have_sw_vers, sw_vers, "yes", "no") AC_CHECK_PROG(have_sw_vers, sw_vers, "yes", "no")
AM_CONDITIONAL(NOT_OS_X, test "x$have_sw_vers" = "xno") AM_CONDITIONAL(NOT_MACOS, test "x$have_sw_vers" = "xno")
# Shellcheck # Shellcheck
AC_CHECK_PROG(HAVE_SHELLCHECK, shellcheck, "yes", "no") AC_CHECK_PROG(HAVE_SHELLCHECK, shellcheck, "yes", "no")
@ -1130,11 +1130,11 @@ AC_SUBST(LDFLAGS_SHAREDLIB)
# get version information from plists and thus need Core Foundation # get version information from plists and thus need Core Foundation
# to process those plists. # to process those plists.
# #
have_os_x_frameworks=no have_macos_frameworks=no
case "$host_os" in case "$host_os" in
darwin*) darwin*)
have_os_x_frameworks=yes have_macos_frameworks=yes
AC_DEFINE(HAVE_OS_X_FRAMEWORKS, 1, [Define to 1 if you have macOS frameworks]) AC_DEFINE(HAVE_MACOS_FRAMEWORKS, 1, [Define to 1 if you have macOS frameworks])
APPLICATIONSERVICES_FRAMEWORKS="-framework ApplicationServices" APPLICATIONSERVICES_FRAMEWORKS="-framework ApplicationServices"
SYSTEMCONFIGURATION_FRAMEWORKS="-framework SystemConfiguration" SYSTEMCONFIGURATION_FRAMEWORKS="-framework SystemConfiguration"
COREFOUNDATION_FRAMEWORKS="-framework CoreFoundation" COREFOUNDATION_FRAMEWORKS="-framework CoreFoundation"
@ -1157,7 +1157,7 @@ esac
AC_SUBST(APPLICATIONSERVICES_FRAMEWORKS) AC_SUBST(APPLICATIONSERVICES_FRAMEWORKS)
AC_SUBST(SYSTEMCONFIGURATION_FRAMEWORKS) AC_SUBST(SYSTEMCONFIGURATION_FRAMEWORKS)
AC_SUBST(COREFOUNDATION_FRAMEWORKS) AC_SUBST(COREFOUNDATION_FRAMEWORKS)
AM_CONDITIONAL(HAVE_OS_X_FRAMEWORKS, [test "x$have_os_x_frameworks" = "xyes"]) AM_CONDITIONAL(HAVE_MACOS_FRAMEWORKS, [test "x$have_macos_frameworks" = "xyes"])
# #
# If we're running Solaris, and LD_LIBRARY_PATH is defined, add it as a # If we're running Solaris, and LD_LIBRARY_PATH is defined, add it as a

6
ui/gtk/webbrowser.c
View File

@ -124,7 +124,7 @@
#include <wsutil/unicode-utils.h> #include <wsutil/unicode-utils.h>
/* if WIN32_LEAN_AND_MEAN is defined, shellapi.h is needed too */ /* if WIN32_LEAN_AND_MEAN is defined, shellapi.h is needed too */
#include <shellapi.h> #include <shellapi.h>
#elif defined (HAVE_OS_X_FRAMEWORKS) #elif defined (HAVE_MACOS_FRAMEWORKS)
/* macOS - use Launch Services to start a browser */ /* macOS - use Launch Services to start a browser */
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
@ -159,7 +159,7 @@ browser_open_url (const gchar *url)
return ((intptr_t) ShellExecute (HWND_DESKTOP, _T("open"), utf_8to16(url), NULL, NULL, SW_SHOWNORMAL) > 32); return ((intptr_t) ShellExecute (HWND_DESKTOP, _T("open"), utf_8to16(url), NULL, NULL, SW_SHOWNORMAL) > 32);
#elif defined(HAVE_OS_X_FRAMEWORKS) #elif defined(HAVE_MACOS_FRAMEWORKS)
CFStringRef url_CFString; CFStringRef url_CFString;
CFURLRef url_CFURL; CFURLRef url_CFURL;
@ -291,7 +291,7 @@ filemanager_open_directory (const gchar *path)
g_free(xpath); g_free(xpath);
return (ret > 32); return (ret > 32);
#elif defined(HAVE_OS_X_FRAMEWORKS) #elif defined(HAVE_MACOS_FRAMEWORKS)
CFStringRef path_CFString; CFStringRef path_CFString;
CFURLRef path_CFURL; CFURLRef path_CFURL;

2
wsutil/CMakeLists.txt
View File

@ -80,7 +80,7 @@ if(WIN32)
ENDIF(WIN32) ENDIF(WIN32)
if(HAVE_OS_X_FRAMEWORKS) if(HAVE_MACOS_FRAMEWORKS)
list(APPEND WSUTIL_FILES cfutils.c) list(APPEND WSUTIL_FILES cfutils.c)
endif() endif()

4
wsutil/Makefile.am
View File

@ -32,7 +32,7 @@ AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DWS_BUILD_DLL \
# Optional headers for ABI checking # Optional headers for ABI checking
wsutil_optional_abi_includes = wsutil_optional_abi_includes =
if HAVE_OS_X_FRAMEWORKS if HAVE_MACOS_FRAMEWORKS
wsutil_optional_abi_includes += cfutils.h wsutil_optional_abi_includes += cfutils.h
endif endif
@ -160,7 +160,7 @@ libwsutil_la_SOURCES = \
wsjsmn.c \ wsjsmn.c \
xtea.c xtea.c
if HAVE_OS_X_FRAMEWORKS if HAVE_MACOS_FRAMEWORKS
libwsutil_la_SOURCES += cfutils.c cfutils.h libwsutil_la_SOURCES += cfutils.c cfutils.h
endif endif

10
wsutil/os_version_info.c
View File

@ -29,7 +29,7 @@
#include <sys/utsname.h> #include <sys/utsname.h>
#endif #endif
#ifdef HAVE_OS_X_FRAMEWORKS #ifdef HAVE_MACOS_FRAMEWORKS
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <wsutil/cfutils.h> #include <wsutil/cfutils.h>
#endif #endif
@ -49,7 +49,7 @@ typedef void (WINAPI *nativesi_func_ptr)(LPSYSTEM_INFO);
* from macOS (we want the macOS version, not the Darwin version, the latter * from macOS (we want the macOS version, not the Darwin version, the latter
* being easy to get with uname()). * being easy to get with uname()).
*/ */
#ifdef HAVE_OS_X_FRAMEWORKS #ifdef HAVE_MACOS_FRAMEWORKS
/* /*
* Fetch a string, as a UTF-8 C string, from a dictionary, given a key. * Fetch a string, as a UTF-8 C string, from a dictionary, given a key.
@ -437,7 +437,7 @@ get_os_version_info(GString *str)
* On *BSD and Darwin/macOS, it's a long string giving * On *BSD and Darwin/macOS, it's a long string giving
* a build date, config file name, etc., etc., etc.. * a build date, config file name, etc., etc., etc..
*/ */
#ifdef HAVE_OS_X_FRAMEWORKS #ifdef HAVE_MACOS_FRAMEWORKS
/* /*
* On macOS, report the macOS version number as the OS * On macOS, report the macOS version number as the OS
* version if we can, and put the Darwin information * version if we can, and put the Darwin information
@ -450,7 +450,7 @@ get_os_version_info(GString *str)
/* Failure - just use the Darwin information. */ /* Failure - just use the Darwin information. */
g_string_append_printf(str, "%s %s", name.sysname, name.release); g_string_append_printf(str, "%s %s", name.sysname, name.release);
} }
#else /* HAVE_OS_X_FRAMEWORKS */ #else /* HAVE_MACOS_FRAMEWORKS */
/* /*
* XXX - on Linux, are there any APIs to get the distribution * XXX - on Linux, are there any APIs to get the distribution
* name and version number? I think some distributions have * name and version number? I think some distributions have
@ -503,7 +503,7 @@ get_os_version_info(GString *str)
* releases. * releases.
*/ */
g_string_append_printf(str, "%s %s", name.sysname, name.release); g_string_append_printf(str, "%s %s", name.sysname, name.release);
#endif /* HAVE_OS_X_FRAMEWORKS */ #endif /* HAVE_MACOS_FRAMEWORKS */
} }
#else #else
g_string_append(str, "an unknown OS"); g_string_append(str, "an unknown OS");