Make file system watcher compile on Mac OS 106, and add a runtime-call to test if the system suppor…

runtime/bin/file_system_watcher_macos.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 #if defined(TARGET_OS_MACOS)
 
 #include "bin/file_system_watcher.h"
 
 #include <errno.h>  // NOLINT
 #include <fcntl.h>  // NOLINT
 #include <unistd.h>  // NOLINT
 #include <CoreServices/CoreServices.h>  // NOLINT
 
 #include "bin/eventhandler.h"
 #include "bin/fdutils.h"
 #include "bin/socket.h"
 #include "bin/thread.h"
 
 
+#ifndef MAC_OS_X_VERSION_10_7
+enum {
+  kFSEventStreamCreateFlagFileEvents = 0x00000010
+};
+enum {
+  kFSEventStreamEventFlagItemCreated = 0x00000100,
+  kFSEventStreamEventFlagItemRemoved = 0x00000200,
+  kFSEventStreamEventFlagItemInodeMetaMod = 0x00000400,
+  kFSEventStreamEventFlagItemRenamed = 0x00000800,
+  kFSEventStreamEventFlagItemModified = 0x00001000,
+  kFSEventStreamEventFlagItemFinderInfoMod = 0x00002000,
+  kFSEventStreamEventFlagItemChangeOwner = 0x00004000,
+  kFSEventStreamEventFlagItemXattrMod = 0x00008000,
+  kFSEventStreamEventFlagItemIsFile = 0x00010000,
+  kFSEventStreamEventFlagItemIsDir = 0x00020000,
+  kFSEventStreamEventFlagItemIsSymlink = 0x00040000
+};
+#endif
+
+
 namespace dart {
 namespace bin {
 
 static Mutex* watcher_mutex = new Mutex();
 static Monitor* watcher_monitor = new Monitor();
 
 class FSEventsWatcher;
 static FSEventsWatcher* watcher = NULL;
 
 union FSEvent {
@@ skipping 153 matching lines @@
       memmove(event.data.path, path, strlen(path) + 1);
       write(node->write_fd(), event.bytes, sizeof(event));
     }
   }
 
   CFRunLoopRef run_loop_;
   int users_;
 };
 
 
+bool FileSystemWatcher::IsSupported() {
+  SInt32 version = 0;
+  Gestalt(gestaltSystemVersion, &version);

[kustermann, 2013/09/03 15:18:58]

Seems like 'Gestalt' is deprecated / will be removed:

http://stackoverflow.com/questions/11072804/mac-os-x-10-8-replacement-for-ges...

Building on 10.8 will emit the deprecation warnings (I don't know if they're
considered fatal or not) -- i.e. this could break a 10.8 build?

This returns an OSError. We may not want to ignore it.


"Never infer the availability of hardware or software features from the value
that the Gestalt function returns when you pass it the gestaltSystemVersion
selector.":
https://developer.apple.com/library/mac/documentation/Carbon/reference/Gestal...

[Anders Johnsen, 2013/09/03 15:32:56]

Nicely spotted, changed.

+  return version >= 0x1070;
+}
+
+
 intptr_t FileSystemWatcher::WatchPath(const char* path,
                                       int events,
                                       bool recursive) {
   MutexLocker lock(watcher_mutex);
   FSEventsWatcher::Increment();
 
   FSEventsWatcher::Node* node = watcher->AddPath(path, events, recursive);
   node->Start();
   return reinterpret_cast<intptr_t>(node);
 }
@@ skipping 43 matching lines @@
   }
   return events;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_MACOS)