From 62588db16644a21ed85b056ac711fadb251f9adf Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 12 Jan 2017 21:03:30 +0100 Subject: [PATCH] [platform] updates macOS filesystem watcher - unneeded check dropped - system requirements lifted - i386 arch no longer supported --- bin/mac/fsnotifier | Bin 34624 -> 14784 bytes native/fsNotifier/mac/fsnotifier.c | 14 ++++---------- native/fsNotifier/mac/make.sh | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/bin/mac/fsnotifier b/bin/mac/fsnotifier index 02040b8cbf39cef1c7e4c95432b199ee7ab4ebb1..8148a790c7abcfdd9ae6bb1fe7e69b9c9f72c0f4 100755 GIT binary patch literal 14784 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 literal 34624 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 XVc_3b@aKDD!SojuXyN~Z_Y?d#_$?Sf diff --git a/native/fsNotifier/mac/fsnotifier.c b/native/fsNotifier/mac/fsnotifier.c index 45c383a9fcce..c426384c363c 100644 --- a/native/fsNotifier/mac/fsnotifier.c +++ b/native/fsNotifier/mac/fsnotifier.c @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -160,12 +160,6 @@ static void ParseRoots() { } int main(const int argc, const char* argv[]) { - // Checking if necessary API is available (need MacOS X 10.5 or later). - if (FSEventStreamCreate == NULL) { - printf("GIVEUP\n"); - return 1; - } - CFStringRef path = CFSTR("/"); CFArrayRef pathsToWatch = CFArrayCreate(NULL, (const void **)&path, 1, NULL); CFAbsoluteTime latency = 0.3; // Latency in seconds @@ -180,13 +174,13 @@ int main(const int argc, const char* argv[]) { ); if (stream == NULL) { printf("GIVEUP\n"); - return 2; + return 1; } pthread_t threadId; if (pthread_create(&threadId, NULL, EventProcessingThread, stream) != 0) { printf("GIVEUP\n"); - return 3; + return 2; } while (TRUE) { @@ -196,4 +190,4 @@ int main(const int argc, const char* argv[]) { } return 0; -} +} \ No newline at end of file diff --git a/native/fsNotifier/mac/make.sh b/native/fsNotifier/mac/make.sh index 3869c599b820..29004ac07e7d 100755 --- a/native/fsNotifier/mac/make.sh +++ b/native/fsNotifier/mac/make.sh @@ -1,3 +1,3 @@ #!/bin/sh -# Clang can be downloaded from http://llvm.org/releases/download.html or found in XCode 4+ -clang -arch i386 -arch x86_64 -mmacosx-version-min=10.5 -framework CoreServices -o fsnotifier fsnotifier.c + +clang -arch x86_64 -mmacosx-version-min=10.8 -framework CoreServices -o fsnotifier fsnotifier.c \ No newline at end of file