diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2016-11-27 13:01:45 +1100 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2016-11-27 13:01:45 +1100 |
| commit | 6bed4e4aa02025e1bd0c294a44c9371fb6b176f1 (patch) | |
| tree | df268915d6db14803088a01373f52798f7e382cf | |
| parent | 5cb3c498162ad434b35980155427fdb6c0555885 (diff) | |
| download | scintilla-mirror-6bed4e4aa02025e1bd0c294a44c9371fb6b176f1.tar.gz | |
Added module map to enable use of Scintilla from Swift.
| -rw-r--r-- | cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj | 6 | ||||
| -rw-r--r-- | cocoa/ScintillaFramework/module.modulemap | 10 | ||||
| -rw-r--r-- | doc/ScintillaHistory.html | 4 |
3 files changed, 20 insertions, 0 deletions
diff --git a/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj b/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj index d89c8ccdf..5e0190ff1 100644 --- a/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj +++ b/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj @@ -216,6 +216,7 @@ 28BC38EC1B74C6AD008BF9EB /* Sci_Position.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BC38EB1B74C6AD008BF9EB /* Sci_Position.h */; settings = {ATTRIBUTES = (Public, ); }; }; 28C40CA81CB7321200B089F2 /* LexJSON.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28C40CA71CB7321200B089F2 /* LexJSON.cxx */; }; 28D191A21DEA72C800159938 /* LexEDIFACT.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28D191A11DEA72C800159938 /* LexEDIFACT.cxx */; }; + 28D1919E1DE69FC100159938 /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; }; 28D516D81830FFCA0047C93D /* info_bar_bg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 28D516D51830FFCA0047C93D /* info_bar_bg@2x.png */; }; 28D516D91830FFCA0047C93D /* mac_cursor_busy@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 28D516D61830FFCA0047C93D /* mac_cursor_busy@2x.png */; }; 28D516DA1830FFCA0047C93D /* mac_cursor_flipped@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 28D516D71830FFCA0047C93D /* mac_cursor_flipped@2x.png */; }; @@ -505,6 +506,7 @@ 08FB77AEFE84172EC02AAC07 /* Classes */ = { isa = PBXGroup; children = ( + 28D1919E1DE69FC100159938 /* module.modulemap */, 2744E4980FC167ED00E85C33 /* Source Files */, 2744E4970FC167E400E85C33 /* Header Files */, ); @@ -1114,6 +1116,7 @@ CLANG_CXX_LIBRARY = "libc++"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; + DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = ".bzr *.nib *.lproj *.framework *.gch (*) CVS .svn *.xcodeproj *.xcode *.pbproj *.pbxproj"; @@ -1134,6 +1137,7 @@ INFOPLIST_FILE = Info.plist; INSTALL_PATH = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.7; + MODULEMAP_FILE = module.modulemap; PRODUCT_BUNDLE_IDENTIFIER = "com.sun.${PRODUCT_NAME:identifier}"; PRODUCT_NAME = Scintilla; SKIP_INSTALL = YES; @@ -1148,6 +1152,7 @@ CLANG_CXX_LIBRARY = "libc++"; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; @@ -1165,6 +1170,7 @@ INFOPLIST_FILE = Info.plist; INSTALL_PATH = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.7; + MODULEMAP_FILE = module.modulemap; PRODUCT_BUNDLE_IDENTIFIER = "com.sun.${PRODUCT_NAME:identifier}"; PRODUCT_NAME = Scintilla; SKIP_INSTALL = YES; diff --git a/cocoa/ScintillaFramework/module.modulemap b/cocoa/ScintillaFramework/module.modulemap new file mode 100644 index 000000000..d09ce2e3b --- /dev/null +++ b/cocoa/ScintillaFramework/module.modulemap @@ -0,0 +1,10 @@ +framework module Scintilla { + umbrella header "ScintillaView.h" + module InfoBar { + header "InfoBar.h" + } + // ILexer.h is not included as Swift doesn't yet interoperate with C++ + exclude header "ILexer.h" + export * + module * { export * } +} diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 5e711a3a9..34881de77 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -556,6 +556,10 @@ <a href="http://sourceforge.net/p/scintilla/feature-requests/1165/">Feature #1165.</a> </li> <li> + On Cocoa, a modulemap file is included to allow Scintilla to be treated as a module. + This makes it easier to use Scintilla from the Swift language. + </li> + <li> Baan folder accomodates sections and lexer fixes definition of SCE_BAAN_FUNCDEF. </li> <li> |