[CMake] Remove the CMakeLists file from apinotes/.

Also, move the ObjectiveC overlay into its own directory, so that we can
use the directory name as an indicator of what overlays exist.

This is in preparation for DevPubs providing the contents of the apinotes/
directory. The downside here is that adding new apinotes files doesn't
automatically trigger a rebuild; I intend to mitigate that somewhat by at
least triggering one when the revision number of the DevPubs repo changes.

Swift SVN r21078

Author: jrose-apple

CMakeLists.txt

@@ -830,26 +830,21 @@ macro(add_swift_library_single target name)
   set(SWIFTLIB_SINGLE_API_NOTES)
   if (SWIFTLIB_SINGLE_API_NOTES_NON_OVERLAY)
     # Adopt all of the non-overlay API notes.
-    list(APPEND SWIFTLIB_SINGLE_API_NOTES 
-      ${SWIFT_API_NOTES_NON_OVERLAY_MODULES})
+    foreach(next_notes_input ${SWIFT_API_NOTES_INPUTS})
+      if (NOT IS_DIRECTORY "${SWIFT_SOURCE_DIR}/stdlib/objc/${next_notes_input}")
+        list(APPEND SWIFTLIB_SINGLE_API_NOTES "${next_notes_input}")
+      endif()
+    endforeach()
   endif()
 
   # Remove the "swift" prefix from the name to determine the module
   # name.
   string(REPLACE swift "" module_name ${name})
-  list(FIND SWIFT_API_NOTES_OVERLAY_MODULES ${module_name} overlay_index)
+  list(FIND SWIFT_API_NOTES_INPUTS ${module_name} overlay_index)
   if (${overlay_index} GREATER -1)
     set(SWIFTLIB_SINGLE_API_NOTES ${module_name})
   endif()
 
-  # Make sure that this module name isn't listed in the "non-overlay"
-  # list. This is a sanity check.
-  list(FIND SWIFT_API_NOTES_NON_OVERLAY_MODULES ${module_name} 
-    non_overlay_index)
-  if (${non_overlay_index} GREATER -1)
-    message(SEND_ERROR "${module_name} module has an SDK overlay, so it should be listed in SWIFT_API_NOTES_OVERLAY_MODULES rather than SWIFT_API_NOTES_NON_OVERLAY_MODULES")
-  endif()
-
   # FIXME: don't actually depend on the libraries in SWIFTLIB_SINGLE_DEPENDS,
   # just any swiftmodule files that are associated with them.
   handle_swift_sources(SWIFTLIB_SINGLE_SOURCES 
@@ -1599,8 +1594,13 @@ include_directories(BEFORE
   ${CMAKE_CURRENT_SOURCE_DIR}/include
   )
 
+file(GLOB SWIFT_API_NOTES_INPUT_FILES "${SWIFT_API_NOTES_PATH}/*.apinotes")
+foreach(file ${SWIFT_API_NOTES_INPUT_FILES})
+  get_filename_component(name "${file}" NAME_WE)
+  list(APPEND SWIFT_API_NOTES_INPUTS ${name})
+endforeach()
+
 # Add all of the subdirectories, where we actually do work.
-add_subdirectory(apinotes)
 if (SWIFT_BUILD_TOOLS)
   add_subdirectory(include)
   add_subdirectory(lib)

apinotes/CMakeLists.txt

@@ -63,23 +63,9 @@ API notes for a given module $MODULE and place them into their
   xcrun swift -apinotes -yaml-to-binary -target x64_64-apple-ios7.0 -o $SWIFT_EXEC/lib/swift/iphonesimulator/$MODULE.apinotesc $MODULE.apinotes
 
 To add API notes for a system module $MODULE that does not have them yet,
-create a new source file $MODULE.apinotes. Then, add this module name
-to the appropriate list in CMakeLists.txt:
- 
-  SWIFT_API_NOTES_OVERLAY_MODULES, when $MODULE already has a Swift
-  overlay. One can check whether a Swift overlay exists for a given
-  module by looking for libswift$MODULE.dylib within the appropriate
-  platform-specific directory:
-
-    OSX             $SWIFT_EXEC/lib/swift/macosx
-    iOS             $SWIFT_EXEC/lib/swift/iphoneos
-    iOS Simulator   $SWIFT_EXEC/lib/swift/iphonesimulator
-
-  SWIFT_API_NOTES_NON_OVERLAY_MODULES, when $MODULE does not have a
-  Swift overlay.
-
-Updated or newly-added API notes will be found by the compiler during
-the next compiler execution.
+create a new source file $MODULE.apinotes. Newly-added API notes will require
+re-running CMake. Updated API notes will be found by the build system during
+the next build.
 
 Note that Swift provides decompilation of binary API notes files via
 the "-apinotes -binary-to-yaml" option, which allows one to inspect

apinotes/README.txt

@@ -2,17 +2,11 @@
 list(APPEND SWIFT_EXTRA_FLAGS
   "-autolink-force-load")
 
-# Build the swiftObjC dylib.
-set(SHARED_LIBRARY ON)
-
-add_swift_library(swiftObjectiveC INSTALL TARGET_LIBRARY
-  ObjectiveC.swift
-  DEPENDS swiftCore swiftDarwin)
-
 add_subdirectory(Darwin)
 add_subdirectory(Dispatch)
 add_subdirectory(CoreGraphics)
 add_subdirectory(Foundation)
+add_subdirectory(ObjectiveC)
 add_subdirectory(SpriteKit)
 
 if (SWIFT_SDKS)

stdlib/objc/CMakeLists.txt

@@ -0,0 +1,5 @@
+set(SHARED_LIBRARY ON)
+
+add_swift_library(swiftObjectiveC INSTALL TARGET_LIBRARY
+  ObjectiveC.swift
+  DEPENDS swiftCore swiftDarwin)