From c8b793b4dc15ba9c3783aacbefed991770e26227 Mon Sep 17 00:00:00 2001 From: Andrew Udvare Date: Sun, 6 Dec 2020 06:22:34 -0500 Subject: [PATCH 01/23] Include Highlight in the bundle * Should build on systems with either MacPorts or Homebrew * colorize.sh: specify resource directory as data path to highlight * Common: only use highlight in the bundle * Add highlight and lua submodules * Apply patches target (runs before building Lua) * Add note about building * Fix CI * Remove check for BUILD_STYLE * readme: add note about installation from MacPorts --- .gitmodules | 6 + .travis.yml | 7 +- QLColorCode.xcodeproj/project.pbxproj | 340 +++++++++++++++++++++++++- README.md | 9 +- hl/apply-patches.sh | 11 + hl/highlight | 1 + hl/highlight.patch | 24 ++ hl/lua | 1 + hl/lua.hpp | 9 + hl/lua.patch | 17 ++ src/Common.m | 21 +- src/colorize.sh | 6 +- 12 files changed, 423 insertions(+), 29 deletions(-) create mode 100644 .gitmodules create mode 100755 hl/apply-patches.sh create mode 160000 hl/highlight create mode 100644 hl/highlight.patch create mode 160000 hl/lua create mode 100644 hl/lua.hpp create mode 100644 hl/lua.patch diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..d9ed053 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "hl/highlight"] + path = hl/highlight + url = https://gitlab.com/saalen/highlight.git +[submodule "hl/lua"] + path = hl/lua + url = https://github.com/lua/lua.git diff --git a/.travis.yml b/.travis.yml index e384eea..b8ab0cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +addons: + homebrew: + packages: + - boost language: objective-c -xcode_project: QLColorCode.xcodeproj -xcode_scheme: Travis +script: set -o pipefail && xcodebuild -project QLColorCode.xcodeproj -scheme Travis build | xcpretty diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj index afa9935..c7fd927 100644 --- a/QLColorCode.xcodeproj/project.pbxproj +++ b/QLColorCode.xcodeproj/project.pbxproj @@ -19,10 +19,26 @@ name = Package; productName = Package; }; + 26BACA63257CF90200486D28 /* Apply patches */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 26BACA67257CF90200486D28 /* Build configuration list for PBXAggregateTarget "Apply patches" */; + buildPhases = ( + 26BACA66257CF90200486D28 /* ShellScript */, + ); + dependencies = ( + ); + name = "Apply patches"; + productName = Package; + }; /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ 0ECBBA6C0CFCA37500416538 /* QLColorCode.qlgenerator in Copy to Library */ = {isa = PBXBuildFile; fileRef = 8D576316048677EA00EA77CD /* QLColorCode.qlgenerator */; }; + 26BACA53257CF04E00486D28 /* plugins in Resources */ = {isa = PBXBuildFile; fileRef = 26BACA52257CF04A00486D28 /* plugins */; }; + 26BACA54257CF04E00486D28 /* filetypes.conf in Resources */ = {isa = PBXBuildFile; fileRef = 26BACA51257CF01B00486D28 /* filetypes.conf */; }; + 26BACA58257CF06200486D28 /* highlight in Resources */ = {isa = PBXBuildFile; fileRef = 26BACA57257CF06200486D28 /* highlight */; }; + 26BACA5C257CF17400486D28 /* themes in Resources */ = {isa = PBXBuildFile; fileRef = 26BACA5B257CF17400486D28 /* themes */; }; + 26BACA60257CF60700486D28 /* langDefs in Resources */ = {isa = PBXBuildFile; fileRef = 26BACA5F257CF60600486D28 /* langDefs */; }; EA43671C15F6BF9C009DA6C0 /* colorize.sh in Resources */ = {isa = PBXBuildFile; fileRef = EA43671615F6BF9C009DA6C0 /* colorize.sh */; }; EA43671D15F6BF9C009DA6C0 /* Common.h in Headers */ = {isa = PBXBuildFile; fileRef = EA43671715F6BF9C009DA6C0 /* Common.h */; }; EA43671E15F6BF9C009DA6C0 /* Common.m in Sources */ = {isa = PBXBuildFile; fileRef = EA43671815F6BF9C009DA6C0 /* Common.m */; }; @@ -42,6 +58,27 @@ remoteGlobalIDString = 8D57630D048677EA00EA77CD; remoteInfo = QLColorCode; }; + 26BAC9C4257CE96D00486D28 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 089C1669FE841209C02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 26BAC9AB257CE89900486D28; + remoteInfo = highlight; + }; + 26BAC9C6257CE97100486D28 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 089C1669FE841209C02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 26BAC9BC257CE93200486D28; + remoteInfo = lua; + }; + 26BACA6E257CF94500486D28 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 089C1669FE841209C02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 26BACA63257CF90200486D28; + remoteInfo = "Apply patches"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -59,6 +96,11 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 26BACA51257CF01B00486D28 /* filetypes.conf */ = {isa = PBXFileReference; lastKnownFileType = text; name = filetypes.conf; path = hl/highlight/filetypes.conf; sourceTree = ""; }; + 26BACA52257CF04A00486D28 /* plugins */ = {isa = PBXFileReference; lastKnownFileType = folder; name = plugins; path = hl/highlight/plugins; sourceTree = ""; }; + 26BACA57257CF06200486D28 /* highlight */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = highlight; path = hl/highlight/src/highlight; sourceTree = ""; }; + 26BACA5B257CF17400486D28 /* themes */ = {isa = PBXFileReference; lastKnownFileType = folder; name = themes; path = hl/highlight/themes; sourceTree = ""; }; + 26BACA5F257CF60600486D28 /* langDefs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = langDefs; path = hl/highlight/langDefs; sourceTree = ""; }; 8D576316048677EA00EA77CD /* QLColorCode.qlgenerator */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = QLColorCode.qlgenerator; sourceTree = BUILT_PRODUCTS_DIR; }; EA43671615F6BF9C009DA6C0 /* colorize.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = colorize.sh; path = src/colorize.sh; sourceTree = ""; }; EA43671715F6BF9C009DA6C0 /* Common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Common.h; path = src/Common.h; sourceTree = ""; }; @@ -86,6 +128,11 @@ 089C166AFE841209C02AAC07 /* QLColorCode */ = { isa = PBXGroup; children = ( + 26BACA5F257CF60600486D28 /* langDefs */, + 26BACA5B257CF17400486D28 /* themes */, + 26BACA57257CF06200486D28 /* highlight */, + 26BACA52257CF04A00486D28 /* plugins */, + 26BACA51257CF01B00486D28 /* filetypes.conf */, EACE3C6924E8D93800B58A51 /* CHANGELOG.md */, EA43672C15F6C1B8009DA6C0 /* COPYING */, EAE9D2CB169E2B3500A67B2F /* README.md */, @@ -138,6 +185,39 @@ }; /* End PBXHeadersBuildPhase section */ +/* Begin PBXLegacyTarget section */ + 26BAC9AB257CE89900486D28 /* highlight */ = { + isa = PBXLegacyTarget; + buildArgumentsString = "-j9 cli"; + buildConfigurationList = 26BAC9AC257CE89900486D28 /* Build configuration list for PBXLegacyTarget "highlight" */; + buildPhases = ( + ); + buildToolPath = /usr/bin/make; + buildWorkingDirectory = hl/highlight; + dependencies = ( + 26BAC9C7257CE97100486D28 /* PBXTargetDependency */, + ); + name = highlight; + passBuildSettingsInEnvironment = 1; + productName = highlight; + }; + 26BAC9BC257CE93200486D28 /* lua */ = { + isa = PBXLegacyTarget; + buildArgumentsString = "-j9 $(ACTION)"; + buildConfigurationList = 26BAC9BD257CE93200486D28 /* Build configuration list for PBXLegacyTarget "lua" */; + buildPhases = ( + ); + buildToolPath = /usr/bin/make; + buildWorkingDirectory = hl/lua; + dependencies = ( + 26BACA6F257CF94500486D28 /* PBXTargetDependency */, + ); + name = lua; + passBuildSettingsInEnvironment = 1; + productName = lua; + }; +/* End PBXLegacyTarget section */ + /* Begin PBXNativeTarget section */ 8D57630D048677EA00EA77CD /* QLColorCode */ = { isa = PBXNativeTarget; @@ -153,6 +233,7 @@ buildRules = ( ); dependencies = ( + 26BAC9C5257CE96D00486D28 /* PBXTargetDependency */, ); name = QLColorCode; productInstallPath = /Library/QuickLook; @@ -168,6 +249,14 @@ attributes = { BuildIndependentTargetsInParallel = YES; LastUpgradeCheck = 1200; + TargetAttributes = { + 26BAC9AB257CE89900486D28 = { + CreatedOnToolsVersion = 12.2; + }; + 26BAC9BC257CE93200486D28 = { + CreatedOnToolsVersion = 12.2; + }; + }; }; buildConfigurationList = 2CA326220896AD4900168862 /* Build configuration list for PBXProject "QLColorCode" */; compatibilityVersion = "Xcode 3.2"; @@ -183,6 +272,9 @@ targets = ( 8D57630D048677EA00EA77CD /* QLColorCode */, 0E0E34E90D0097020086C1E6 /* Package */, + 26BAC9AB257CE89900486D28 /* highlight */, + 26BAC9BC257CE93200486D28 /* lua */, + 26BACA63257CF90200486D28 /* Apply patches */, ); }; /* End PBXProject section */ @@ -192,6 +284,11 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 26BACA60257CF60700486D28 /* langDefs in Resources */, + 26BACA5C257CF17400486D28 /* themes in Resources */, + 26BACA58257CF06200486D28 /* highlight in Resources */, + 26BACA53257CF04E00486D28 /* plugins in Resources */, + 26BACA54257CF04E00486D28 /* filetypes.conf in Resources */, EA43671C15F6BF9C009DA6C0 /* colorize.sh in Resources */, EACE3C6A24E8D93800B58A51 /* CHANGELOG.md in Resources */, EA43673015F6C1B8009DA6C0 /* COPYING in Resources */, @@ -213,7 +310,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/bin/zsh -x"; - shellScript = "# shell script goes here\nif [ $BUILD_STYLE != \"Release\" ]; then\n echo \"Error: Must use Release build style\"\n exit 1\nfi\n\ncd $PROJECT_DIR\nmkdir -vp release\ncd release\npkgDir=QLColorCode-$CURRENT_PROJECT_VERSION\nrm -rf $pkgDir\nmkdir $pkgDir\ncp -rp $TARGET_BUILD_DIR/*.qlgenerator $pkgDir\ncp ../ReadMe.txt $pkgDir\ncp ../LICENSE.txt $pkgDir\ncp ../ChangeLog.txt $pkgDir\n# For some reason Xcode has been producing world-writable output on occasion\nchmod -R o-w $pkgDir\ntar cvzf $pkgDir.tgz $pkgDir\nopen $PROJECT_DIR/release"; + shellScript = "# shell script goes here\ncd $PROJECT_DIR\nmkdir -vp release\ncd release\npkgDir=QLColorCode-$CURRENT_PROJECT_VERSION\nrm -rf $pkgDir\nmkdir $pkgDir\ncp -rp $TARGET_BUILD_DIR/*.qlgenerator $pkgDir\ncp ../ReadMe.txt $pkgDir\ncp ../LICENSE.txt $pkgDir\ncp ../ChangeLog.txt $pkgDir\n# For some reason Xcode has been producing world-writable output on occasion\nchmod -R o-w $pkgDir\ntar cvzf $pkgDir.tgz $pkgDir\nopen $PROJECT_DIR/release\n"; }; 0E1280381061C3EA0078EC05 /* Reset quicklookd */ = { isa = PBXShellScriptBuildPhase; @@ -230,6 +327,19 @@ shellScript = "qlmanage -r\n"; showEnvVarsInLog = 0; }; + 26BACA66257CF90200486D28 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cd hl\n./apply-patches.sh\n"; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -252,6 +362,21 @@ target = 8D57630D048677EA00EA77CD /* QLColorCode */; targetProxy = 0E0E34ED0D0097280086C1E6 /* PBXContainerItemProxy */; }; + 26BAC9C5257CE96D00486D28 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 26BAC9AB257CE89900486D28 /* highlight */; + targetProxy = 26BAC9C4257CE96D00486D28 /* PBXContainerItemProxy */; + }; + 26BAC9C7257CE97100486D28 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 26BAC9BC257CE93200486D28 /* lua */; + targetProxy = 26BAC9C6257CE97100486D28 /* PBXContainerItemProxy */; + }; + 26BACA6F257CF94500486D28 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 26BACA63257CF90200486D28 /* Apply patches */; + targetProxy = 26BACA6E257CF94500486D28 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -283,6 +408,192 @@ }; name = Release; }; + 26BAC9AD257CE89900486D28 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CODE_SIGN_STYLE = Automatic; + DEBUGGING_SYMBOLS = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + DEVELOPMENT_TEAM = EU5R2QY9HJ; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 26BAC9AE257CE89900486D28 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = EU5R2QY9HJ; + ENABLE_NS_ASSERTIONS = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + 26BAC9BE257CE93200486D28 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CODE_SIGN_STYLE = Automatic; + DEBUGGING_SYMBOLS = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + DEVELOPMENT_TEAM = EU5R2QY9HJ; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 26BAC9BF257CE93200486D28 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = EU5R2QY9HJ; + ENABLE_NS_ASSERTIONS = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + 26BACA68257CF90200486D28 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + INFOPLIST_FILE = "Package copy-Info.plist"; + PRODUCT_NAME = "$(TARGET_NAME)"; + RUN_CLANG_STATIC_ANALYZER = YES; + }; + name = Debug; + }; + 26BACA69257CF90200486D28 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + INFOPLIST_FILE = "Package copy-Info.plist"; + PRODUCT_NAME = "$(TARGET_NAME)"; + RUN_CLANG_STATIC_ANALYZER = YES; + ZERO_LINK = NO; + }; + name = Release; + }; 2CA3261F0896AD4900168862 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -451,6 +762,33 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 26BAC9AC257CE89900486D28 /* Build configuration list for PBXLegacyTarget "highlight" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 26BAC9AD257CE89900486D28 /* Debug */, + 26BAC9AE257CE89900486D28 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 26BAC9BD257CE93200486D28 /* Build configuration list for PBXLegacyTarget "lua" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 26BAC9BE257CE93200486D28 /* Debug */, + 26BAC9BF257CE93200486D28 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 26BACA67257CF90200486D28 /* Build configuration list for PBXAggregateTarget "Apply patches" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 26BACA68257CF90200486D28 /* Debug */, + 26BACA69257CF90200486D28 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 2CA3261E0896AD4900168862 /* Build configuration list for PBXNativeTarget "QLColorCode" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/README.md b/README.md index 1663016..6836fd5 100644 --- a/README.md +++ b/README.md @@ -7,14 +7,17 @@ This is a Quick Look plug-in that renders source code with syntax highlighting, using the [Highlight library](http://www.andre-simon.de). -To install Highlight, [download the library manually](http://www.andre-simon.de/zip/download.php), or use Homebrew `brew install highlight` - To install the plug-in, just drag it to `~/Library/QuickLook`. You may need to create that folder if it doesn't already exist. -Alternative, if you use [Homebrew Cask](https://github.com/caskroom/homebrew-cask), +Alternatively, if you use [Homebrew Cask](https://github.com/caskroom/homebrew-cask), install with `brew cask install qlcolorcode`. +Also available on MacPorts: `port install QLColorCode`. + +To build the project, you must have Boost headers on your system in +`/opt/local/include` or `/usr/local/include`. + ## Settings If you want to configure `QLColorCode`, there are several `defaults` commands that could be useful: diff --git a/hl/apply-patches.sh b/hl/apply-patches.sh new file mode 100755 index 0000000..0d2eb96 --- /dev/null +++ b/hl/apply-patches.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -e +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" +cd "$DIR" +for i in lua highlight +do + pushd "$i" + git checkout . || true + patch -p1 < "../${i}.patch" + popd +done diff --git a/hl/highlight b/hl/highlight new file mode 160000 index 0000000..e55d1fd --- /dev/null +++ b/hl/highlight @@ -0,0 +1 @@ +Subproject commit e55d1fd5949cc5dc4444a1b9cbbb6a0ab1a93a3f diff --git a/hl/highlight.patch b/hl/highlight.patch new file mode 100644 index 0000000..b3e4afd --- /dev/null +++ b/hl/highlight.patch @@ -0,0 +1,24 @@ +diff --git a/src/makefile b/src/makefile +index 9d0a08e..0a7a833 100644 +--- a/src/makefile ++++ b/src/makefile +@@ -43,8 +43,8 @@ ifeq (${LUA_TEST},1) + LUA_PKG_NAME=lua + endif + +-LUA_CFLAGS=$(shell pkg-config --cflags ${LUA_PKG_NAME}) +-LUA_LIBS=$(shell pkg-config --libs ${LUA_PKG_NAME}) ++LUA_CFLAGS=-I../../lua -I../.. ++LUA_LIBS=../../lua/liblua.a + + # luajit lib + # LUA_LIBS=$(shell pkg-config --libs luajit) +@@ -75,7 +75,7 @@ LDFLAGS = -ldl + #LDFLAGS = ${LDFLAGS} -s + #LDFLAGS= -Wl,--as-needed + +-CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS} ++CXX_COMPILE=${CXX} ${CFLAGS} -c -I /opt/local/include -I /usr/local/include -I ${INCLUDE_DIR} ${LUA_CFLAGS} + + # Data directories (data dir, configuration file dir) + CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\" diff --git a/hl/lua b/hl/lua new file mode 160000 index 0000000..9d067ab --- /dev/null +++ b/hl/lua @@ -0,0 +1 @@ +Subproject commit 9d067ab73b6befa0a5418f1df35c711f6c6918b3 diff --git a/hl/lua.hpp b/hl/lua.hpp new file mode 100644 index 0000000..ec417f5 --- /dev/null +++ b/hl/lua.hpp @@ -0,0 +1,9 @@ +// lua.hpp +// Lua header files for C++ +// <> not supplied automatically because Lua also compiles as C++ + +extern "C" { +#include "lua.h" +#include "lualib.h" +#include "lauxlib.h" +} diff --git a/hl/lua.patch b/hl/lua.patch new file mode 100644 index 0000000..23b2174 --- /dev/null +++ b/hl/lua.patch @@ -0,0 +1,17 @@ +diff --git a/makefile b/makefile +index 9e537dcc..d275b809 100644 +--- a/makefile ++++ b/makefile +@@ -60,9 +60,9 @@ LOCAL = $(TESTS) $(CWARNS) + + + # enable Linux goodies +-MYCFLAGS= $(LOCAL) -std=c99 -DLUA_USE_LINUX -DLUA_USE_READLINE +-MYLDFLAGS= $(LOCAL) -Wl,-E +-MYLIBS= -ldl -lreadline ++MYCFLAGS= $(LOCAL) -std=c99 ++MYLDFLAGS= $(LOCAL) ++MYLIBS= -ldl + + + CC= gcc diff --git a/src/Common.m b/src/Common.m index 8b57741..1b8290b 100644 --- a/src/Common.m +++ b/src/Common.m @@ -73,25 +73,6 @@ NSMutableDictionary *env = [NSMutableDictionary dictionaryWithDictionary: [[NSProcessInfo processInfo] environment]]; - NSString *path = [env objectForKey: @"PATH"]; - NSString *newPath = [path stringByAppendingString: @":/opt/local/bin:/usr/local/bin:/usr/local/sbin"]; - [env setObject: newPath forKey: @"PATH"]; - - // Try to find highlight location - NSString *highlightPath = [[defaults persistentDomainForName:myDomain] valueForKey:@"pathHL"]; - if (highlightPath == nil) { - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; - NSData* data = runTask(@"which highlight", env, status); - highlightPath = [[[[NSString alloc] initWithData: data encoding: NSUTF8StringEncoding] autorelease] stringByTrimmingCharactersInSet:[NSCharacterSet newlineCharacterSet]]; - if (*status == 0 && [highlightPath hasPrefix: @"/"] && [highlightPath hasSuffix: @"highlight"]) { // i.e. highlightPath looks like the actual path - NSMutableDictionary *newDefaults = [NSMutableDictionary dictionaryWithObject:highlightPath forKey:@"pathHL"]; - [newDefaults addEntriesFromDictionary: [defaults persistentDomainForName:myDomain]]; - [userDefaults setPersistentDomain: newDefaults forName:myDomain]; - [userDefaults synchronize]; - } - [userDefaults release]; - } - [env addEntriesFromDictionary:[NSDictionary dictionaryWithObjectsAndKeys: #ifdef DEBUG @"1", @"qlcc_debug", @@ -103,7 +84,7 @@ @"edit-xcode", @"hlTheme", // @"-lz -j 3 -t 4 --kw-case=capitalize ", @"extraHLFlags", @"-t 4 ", @"extraHLFlags", - @"/opt/local/bin/highlight", @"pathHL", + [rsrcEsc stringByAppendingString:@"/highlight"], @"pathHL", @"", @"maxFileSize", @"UTF-8", @"textEncoding", @"UTF-8", @"webkitTextEncoding", nil]]; diff --git a/src/colorize.sh b/src/colorize.sh index ce6a266..8392a12 100755 --- a/src/colorize.sh +++ b/src/colorize.sh @@ -138,11 +138,11 @@ go4it () { debug "Generating the preview" if [ "${thumb}" = "1" ]; then - ${reader} | head -n 100 | head -c 20000 | ${cmd} ${cmdOpts} && exit 0 + ${reader} | head -n 100 | head -c 20000 | ${cmd} -D "${rsrcDir}" ${cmdOpts} && exit 0 elif [ -n "${maxFileSize}" ]; then - ${reader} | head -c ${maxFileSize} | ${cmd} -T "${target}" ${cmdOpts} && exit 0 + ${reader} | head -c ${maxFileSize} | ${cmd} -D "${rsrcDir}" -T "${target}" ${cmdOpts} && exit 0 else - ${reader} | ${cmd} -T "${target}" ${cmdOpts} && exit 0 + ${reader} | ${cmd} -D "${rsrcDir}" -T "${target}" ${cmdOpts} && exit 0 fi } From 8d453886db7077935c1b0ece5eb0b4426d5c998c Mon Sep 17 00:00:00 2001 From: Adam Bulgatz Date: Sun, 25 Oct 2020 16:34:42 -0500 Subject: [PATCH 02/23] Add powershell to info.plist Add powershell "dyn.ah62d4rv4ge81a63v" to info.plist --- Info.plist | 1 + 1 file changed, 1 insertion(+) diff --git a/Info.plist b/Info.plist index a7721f1..6db60fa 100644 --- a/Info.plist +++ b/Info.plist @@ -94,6 +94,7 @@ com.apple.xcode.tcsh-script com.apple.xcode.yacc-source com.apple.xcode.zsh-script + dyn.ah62d4rv4ge81a63v From 3fda23d311c8e9664d9197a5f640ea61427f7eb9 Mon Sep 17 00:00:00 2001 From: Adam Bulgatz Date: Sun, 25 Oct 2020 16:52:58 -0500 Subject: [PATCH 03/23] Added UTImportedTypeDeclarations for PowerShell --- Info.plist | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Info.plist b/Info.plist index 6db60fa..49bf9b1 100644 --- a/Info.plist +++ b/Info.plist @@ -1354,6 +1354,23 @@ + + UTTypeConformsTo + + dyn.ah62d4rv4ge81a63v + + UTTypeDescription + PowerShell + UTTypeIdentifier + org.powershell.source + UTTypeTagSpecification + + public.filename-extension + + ps1 + + + From 1b7e0ca6fc1153fbc552a6e556ab2f17f616c2c9 Mon Sep 17 00:00:00 2001 From: Anthony Gelibert Date: Tue, 15 Dec 2020 20:45:51 +0100 Subject: [PATCH 04/23] Bump version numbers and update according CHANGELOG --- CHANGELOG.md | 43 +++++++++++++++++---------- QLColorCode.xcodeproj/project.pbxproj | 8 ++--- hl/highlight | 2 +- hl/lua | 2 +- 4 files changed, 34 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee80225..653091b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,16 +2,29 @@ All notable changes to this project will be documented in this file. -The format is based on [Keep a Changelog](http://keepachangelog.com/fr/1.0.0/) -and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +The format is based on [Keep a Changelog](http://keepachangelog.com/fr/1.0.0/) and this project adheres to +[Semantic Versioning](http://semver.org/spec/v2.0.0.html). + ## [Unreleased] +- NOTHING + +## [4.0.0] — 2020-12-15 + +**Big Sur support via integrated Lua and Highlight! +Thanks to @tatsh for his amazing work!** + ### Added - `ruby` support. - `lisp` support. - `automake` support. +- `powershell` support (thanks @abulgatz). + +### Fixed + +- CI (thanks @tatsh). ## [3.1.1] — 2020-09-09 @@ -35,7 +48,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Fixed -- `fish` support. +- `fish` support. - `bat` (Windows Batch) support. - `diff` support. - `bash` support. @@ -70,7 +83,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - `jad` support. - ## [3.0.0] — 2020-08-16 ### Added @@ -93,7 +105,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added -- Option to preview file as `RTF` (thanks @silum). +- Option to preview file as `RTF` (thanks @silum). - `Kotlin/Gradle` (thanks @sonique6784). - `C#/Scala` support. - `reduce_filesize` plugin by default. @@ -172,14 +184,12 @@ First version of Anthony GELIBERT. ### Added -- Added qlcc_debug option. To enable, use: - `defaults write org.n8gray.qlcolorcode qlcc_debug 1` -To disable, use: - `defaults delete org.n8gray.qlcolorcode qlcc_debug` +- Added qlcc_debug option. To enable, use: `defaults write org.n8gray.qlcolorcode qlcc_debug 1` To disable, use: + `defaults delete org.n8gray.qlcolorcode qlcc_debug` ### Changed -- Stop redirecting `stdout` of `colorize.sh` to `stdin`. Error output will appear in the console instead of the preview. +- Stop redirecting `stdout` of `colorize.sh` to `stdin`. Error output will appear in the console instead of the preview. ### Fixed @@ -189,13 +199,14 @@ To disable, use: ### Added -- A note about conflict with Xcode 3.2's source code QL plugin. If you're having problems with QLCC on Snow Leopard please read it! +- A note about conflict with Xcode 3.2's source code QL plugin. If you're having problems with QLCC on Snow Leopard + please read it! - Support for `Scala`, `Groovy`, `Interactive Data Language`, and `Coldfusion`. - Build for `x86_64` in addition to `i386` and `ppc`. ### Changed -- Upgrade `highlight` from `2.6.6` to `2.12` -- This was long overdue. It's nice not to have to patch highlight anymore! +- Upgrade `highlight` from `2.6.6` to `2.12` -- This was long overdue. It's nice not to have to patch highlight anymore! ### Removed @@ -209,7 +220,9 @@ To disable, use: ### Added -- Enabled "safe" plain-text handling. In other words, files like foo.txt will be supported, but not files without extensions. The only way to handle extensionless files is to handle -everything-. This can be done, but it requires a more defensive style of operation. +- Enabled "safe" plain-text handling. In other words, files like foo.txt will be supported, but not files without + extensions. The only way to handle extensionless files is to handle -everything-. This can be done, but it requires a + more defensive style of operation. - Support for `textEncoding` option to set encoding for highlight portion of renderer, with default `UTF-8`. - Support for `webkitTextEncoding` option to set encoding for webkit portion of renderer, with default `UTF-8`. - Support for `.cs`, `.el`, `.jnlp` (xml), `.e` (eiffel), and `.vb`. @@ -222,7 +235,7 @@ To disable, use: ### Added -- `Actionscript`, `Lisp`, `IDL`, `Verilog`, `VHDL`, `XHTML` (any others I forgot?). +- `Actionscript`, `Lisp`, `IDL`, `Verilog`, `VHDL`, `XHTML` (any others I forgot?). - `.cls` and `.sty` as LaTeX extensions. - `maxFileSize` option to keep us from hanging on huge files. @@ -270,7 +283,7 @@ To disable, use: ### Changed -- Switched from Pygments to Highlight. This should increase speed-and-language coverage. +- Switched from Pygments to Highlight. This should increase speed-and-language coverage. - Changed `.tex` `UTI` to agree with TeXShop's. - (Try to) let the system pick a different plugin if ours fails. diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj index c7fd927..ec87af3 100644 --- a/QLColorCode.xcodeproj/project.pbxproj +++ b/QLColorCode.xcodeproj/project.pbxproj @@ -650,7 +650,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = "2.1.1+dev"; + CURRENT_PROJECT_VERSION = 4.0.0; DEAD_CODE_STRIPPING = YES; DSTROOT = "/export/tmp/$(PROJECT_NAME).dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -675,7 +675,7 @@ GCC_WARN_UNUSED_PARAMETER = NO; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Info.plist; - MACOSX_DEPLOYMENT_TARGET = 10.15; + MACOSX_DEPLOYMENT_TARGET = 11.1; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.n8gray.qlcolorcode; PRODUCT_NAME = QLColorCode; @@ -717,7 +717,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CURRENT_PROJECT_VERSION = "2.1.1+dev"; + CURRENT_PROJECT_VERSION = 4.0.0; DEAD_CODE_STRIPPING = YES; DSTROOT = "/export/tmp/$(PROJECT_NAME).dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -740,7 +740,7 @@ GCC_WARN_UNUSED_PARAMETER = NO; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Info.plist; - MACOSX_DEPLOYMENT_TARGET = 10.15; + MACOSX_DEPLOYMENT_TARGET = 11.1; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.n8gray.qlcolorcode; PRODUCT_NAME = QLColorCode; diff --git a/hl/highlight b/hl/highlight index e55d1fd..ecf5d4a 160000 --- a/hl/highlight +++ b/hl/highlight @@ -1 +1 @@ -Subproject commit e55d1fd5949cc5dc4444a1b9cbbb6a0ab1a93a3f +Subproject commit ecf5d4aa1341908a6b191a47d67e735197dc430d diff --git a/hl/lua b/hl/lua index 9d067ab..e2ea3b3 160000 --- a/hl/lua +++ b/hl/lua @@ -1 +1 @@ -Subproject commit 9d067ab73b6befa0a5418f1df35c711f6c6918b3 +Subproject commit e2ea3b31c94bb3e1da27c233661cb2a16699c685 From 0599aec16798f884df9b602dbd0e4f011d0c04c9 Mon Sep 17 00:00:00 2001 From: Anthony Gelibert Date: Tue, 15 Dec 2020 20:55:03 +0100 Subject: [PATCH 05/23] Bump version number --- QLColorCode.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj index ec87af3..48a3e45 100644 --- a/QLColorCode.xcodeproj/project.pbxproj +++ b/QLColorCode.xcodeproj/project.pbxproj @@ -650,7 +650,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 4.0.0; + CURRENT_PROJECT_VERSION = "4.0.1+dev"; DEAD_CODE_STRIPPING = YES; DSTROOT = "/export/tmp/$(PROJECT_NAME).dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -717,7 +717,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CURRENT_PROJECT_VERSION = 4.0.0; + CURRENT_PROJECT_VERSION = "4.0.1+dev"; DEAD_CODE_STRIPPING = YES; DSTROOT = "/export/tmp/$(PROJECT_NAME).dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; From 8138cf7d60d04c542fcddda762af94a7ff91f35c Mon Sep 17 00:00:00 2001 From: Anthony Gelibert Date: Tue, 15 Dec 2020 20:59:21 +0100 Subject: [PATCH 06/23] Fix #70: Add TF support --- CHANGELOG.md | 4 +++- Info.plist | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 653091b..25e0e91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/fr/1.0.0/) a ## [Unreleased] -- NOTHING +### Added + +- `tf` support. ## [4.0.0] — 2020-12-15 diff --git a/Info.plist b/Info.plist index 49bf9b1..06eb805 100644 --- a/Info.plist +++ b/Info.plist @@ -95,6 +95,8 @@ com.apple.xcode.yacc-source com.apple.xcode.zsh-script dyn.ah62d4rv4ge81a63v + dyn.ah62d4rv4ge81k3x0qf3hg + dyn.ah62d4rv4ge81k3u @@ -1306,6 +1308,25 @@ + + UTTypeConformsTo + + dyn.ah62d4rv4ge81k3x0qf3hg + dyn.ah62d4rv4ge81k3u + + UTTypeDescription + TensorFlow files + UTTypeIdentifier + org.tf.source + UTTypeTagSpecification + + public.filename-extension + + tfvars + tf + + + UTTypeConformsTo From e72babf8aa61287f0e297875fac5d830b9cc43f3 Mon Sep 17 00:00:00 2001 From: Anthony Gelibert Date: Wed, 16 Dec 2020 09:07:00 +0100 Subject: [PATCH 07/23] Fix CI settings by setting deployment target 11.0 --- CHANGELOG.md | 4 ++++ QLColorCode.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25e0e91..250fb03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/fr/1.0.0/) a - `tf` support. +### Fixed + +- CI (thanks @jeffbyrnes). + ## [4.0.0] — 2020-12-15 **Big Sur support via integrated Lua and Highlight! diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj index 48a3e45..c402c1d 100644 --- a/QLColorCode.xcodeproj/project.pbxproj +++ b/QLColorCode.xcodeproj/project.pbxproj @@ -675,7 +675,7 @@ GCC_WARN_UNUSED_PARAMETER = NO; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Info.plist; - MACOSX_DEPLOYMENT_TARGET = 11.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.n8gray.qlcolorcode; PRODUCT_NAME = QLColorCode; @@ -740,7 +740,7 @@ GCC_WARN_UNUSED_PARAMETER = NO; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Info.plist; - MACOSX_DEPLOYMENT_TARGET = 11.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.n8gray.qlcolorcode; PRODUCT_NAME = QLColorCode; From 499b9f520e7fea6d6bbf9aa71e2b9ce0b7f68e6e Mon Sep 17 00:00:00 2001 From: Anthony Gelibert Date: Wed, 16 Dec 2020 09:10:59 +0100 Subject: [PATCH 08/23] Fix CI settings by setting deployment target 10.15 --- QLColorCode.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj index c402c1d..751ec82 100644 --- a/QLColorCode.xcodeproj/project.pbxproj +++ b/QLColorCode.xcodeproj/project.pbxproj @@ -675,7 +675,7 @@ GCC_WARN_UNUSED_PARAMETER = NO; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Info.plist; - MACOSX_DEPLOYMENT_TARGET = 11.0; + MACOSX_DEPLOYMENT_TARGET = 10.15; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.n8gray.qlcolorcode; PRODUCT_NAME = QLColorCode; @@ -740,7 +740,7 @@ GCC_WARN_UNUSED_PARAMETER = NO; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Info.plist; - MACOSX_DEPLOYMENT_TARGET = 11.0; + MACOSX_DEPLOYMENT_TARGET = 10.15; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.n8gray.qlcolorcode; PRODUCT_NAME = QLColorCode; From 5b04e64cd14deffb22aca4c08aa6e73060018f9a Mon Sep 17 00:00:00 2001 From: Anthony Gelibert Date: Wed, 16 Dec 2020 09:16:59 +0100 Subject: [PATCH 09/23] Bump version numbers and update according CHANGELOG --- CHANGELOG.md | 4 ++++ QLColorCode.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 250fb03..73c6d65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/fr/1.0.0/) a ## [Unreleased] +- NOTHING + +## [4.0.1] — 2020-12-16 + ### Added - `tf` support. diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj index 751ec82..5cc1a60 100644 --- a/QLColorCode.xcodeproj/project.pbxproj +++ b/QLColorCode.xcodeproj/project.pbxproj @@ -650,7 +650,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = "4.0.1+dev"; + CURRENT_PROJECT_VERSION = 4.0.1; DEAD_CODE_STRIPPING = YES; DSTROOT = "/export/tmp/$(PROJECT_NAME).dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -717,7 +717,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CURRENT_PROJECT_VERSION = "4.0.1+dev"; + CURRENT_PROJECT_VERSION = 4.0.1; DEAD_CODE_STRIPPING = YES; DSTROOT = "/export/tmp/$(PROJECT_NAME).dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; From 4c6e4258bc4fb8108ba84f15a3dbed24bdaa70d5 Mon Sep 17 00:00:00 2001 From: Anthony Gelibert Date: Wed, 16 Dec 2020 13:32:34 +0100 Subject: [PATCH 10/23] Bump version numbers and update according CHANGELOG --- CHANGELOG.md | 6 ++++++ QLColorCode.xcodeproj/project.pbxproj | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73c6d65..1fd8d18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/fr/1.0.0/) a - NOTHING +## [4.0.2] — 2020-12-16 + +### Fixed + +- Version number in the final binary. + ## [4.0.1] — 2020-12-16 ### Added diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj index 5cc1a60..a8b9797 100644 --- a/QLColorCode.xcodeproj/project.pbxproj +++ b/QLColorCode.xcodeproj/project.pbxproj @@ -599,9 +599,9 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 3.1.1; + CURRENT_PROJECT_VERSION = 4.0.2; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 3.1.1; + MARKETING_VERSION = 4.0.2; OTHER_CFLAGS = "-DDEBUG"; }; name = Debug; @@ -611,9 +611,9 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 3.1.1; + CURRENT_PROJECT_VERSION = 4.0.2; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 3.1.1; + MARKETING_VERSION = 4.0.2; }; name = Release; }; @@ -650,7 +650,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 4.0.1; + CURRENT_PROJECT_VERSION = 4.0.2; DEAD_CODE_STRIPPING = YES; DSTROOT = "/export/tmp/$(PROJECT_NAME).dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -717,7 +717,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CURRENT_PROJECT_VERSION = 4.0.1; + CURRENT_PROJECT_VERSION = 4.0.2; DEAD_CODE_STRIPPING = YES; DSTROOT = "/export/tmp/$(PROJECT_NAME).dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; From a906cab3dd422c9a78a869f9bc24ce72e0c35fb1 Mon Sep 17 00:00:00 2001 From: Anthony Gelibert Date: Wed, 16 Dec 2020 13:47:47 +0100 Subject: [PATCH 11/23] Update README --- README.md | 105 +++++++++++++++++++++++------------------------------- 1 file changed, 44 insertions(+), 61 deletions(-) diff --git a/README.md b/README.md index 6836fd5..76ecd5e 100644 --- a/README.md +++ b/README.md @@ -4,25 +4,23 @@ **Original project:** -This is a Quick Look plug-in that renders source code with syntax highlighting, -using the [Highlight library](http://www.andre-simon.de). +This is a Quick Look plug-in that renders source code with syntax highlighting, using the +[Highlight library](http://www.andre-simon.de). -To install the plug-in, just drag it to `~/Library/QuickLook`. -You may need to create that folder if it doesn't already exist. +To install the plug-in, just drag it to `~/Library/QuickLook`. You may need to create that folder if it doesn't already +exist. -Alternatively, if you use [Homebrew Cask](https://github.com/caskroom/homebrew-cask), -install with `brew cask install qlcolorcode`. +Alternatively, if you use [Homebrew Cask](https://github.com/caskroom/homebrew-cask), install with +`brew cask install qlcolorcode`. Also available on [MacPorts](https://www.macports.org): `port install QLColorCode`. -Also available on MacPorts: `port install QLColorCode`. - -To build the project, you must have Boost headers on your system in -`/opt/local/include` or `/usr/local/include`. +**To build the project, you must have Boost headers on your system in `/opt/local/include` or `/usr/local/include`.** ## Settings If you want to configure `QLColorCode`, there are several `defaults` commands that could be useful: -Setting the text encoding (default is `UTF-8`). Two settings are required. The first sets Highlight's encoding, the second sets Webkit's: +Setting the text encoding (default is `UTF-8`). Two settings are required. The first sets Highlight's encoding, the +second sets Webkit's: defaults write org.n8gray.QLColorCode textEncoding UTF-16 defaults write org.n8gray.QLColorCode webkitTextEncoding UTF-16 @@ -35,7 +33,8 @@ Setting the font size (default is `10`): defaults write org.n8gray.QLColorCode fontSizePoints 9 -Setting the color style for `light` and `dark` mode (see [all available themes](http://www.andre-simon.de/doku/highlight/theme-samples.php)): +Setting the color style for `light` and `dark` mode (see +[all available themes](http://www.andre-simon.de/doku/highlight/theme-samples.php)): defaults write org.n8gray.QLColorCode lightTheme solarized-light defaults write org.n8gray.QLColorCode darkTheme solarized-dark @@ -48,7 +47,7 @@ Setting the maximum size (in bytes, deactivated by default) for previewed files: defaults write org.n8gray.QLColorCode maxFileSize 1000000 -Setting any extra command-line flags for Highlight (see below): +zSetting any extra command-line flags for Highlight (see below): defaults write org.n8gray.QLColorCode extraHLFlags '-l -W' @@ -83,13 +82,8 @@ Here are some useful 'highlight' command-line flags (from the man page): --kw-case= control case of case insensitive keywords -**Warning:** my fork uses an external `Highlight`. It will attempt to find `highlight` on your `PATH` (so it should work out of the box for Homebrew and MacPorts), but if it can't find it, it'll use `/opt/local/bin/highlight` (MacPorts default). This can be changed: - - defaults write org.n8gray.QLColorCode pathHL /path/to/your/highlight - -It is also possible to have the HTML preview converted to RTF. Using RTF -allows the contents of the file to be displayed instead of an icon -- similar -to QLStephen. +It is also possible to have the HTML preview converted to RTF. Using RTF allows the contents of the file to be displayed +instead of an icon -- similar to QLStephen. defaults write org.n8gray.QLColorCode rtfRender true @@ -110,7 +104,7 @@ QLColorCode decompiles some formats: QLColorCode enables some Highlight plug-ins : -- In all languages: `outhtml_codefold` and `reduce_filesize`. +- In all languages: `outhtml_codefold` and `reduce_filesize`. - Java (sources and classes): `java_library`. - C/C++: `cpp_syslog`, `cpp_ref_cplusplus_com` and `cpp_ref_local_includes`. - Perl: `perl_ref_perl_org`. @@ -120,63 +114,52 @@ QLColorCode enables some Highlight plug-ins : #### Handled languages -Highlight can handle lots and lots of languages, but this plug-in will only be -invoked for file types that the OS knows are type "source-code". Since the OS -only knows about a limited number of languages, I've added Universal Type -Identifier (UTI) declarations for several "interesting" languages. If I've -missed your favorite language, take a look at the Info.plist file inside the -plug-in bundle and look for the UTImportedTypeDeclarations section. I -haven't added all the languages that Highlight can handle because it's rumored -that having two conflicting UTI declarations for the same file extension can -cause problems. Note that if you do edit the Info.plist file you need to -nudge the system to tell it something has changed. Moving the plug-in to the -desktop then back to its installed location should do the trick. - -As an aside, by changing colorize.sh you can use this plug-in to render any file -type that you can convert to HTML. Have fun, and let me know if you do anything -cool! +Highlight can handle lots and lots of languages, but this plug-in will only be invoked for file types that the OS knows +are type "source-code". Since the OS only knows about a limited number of languages, I've added Universal Type +Identifier (UTI) declarations for several "interesting" languages. If I've missed your favorite language, take a look at +the Info.plist file inside the plug-in bundle and look for the UTImportedTypeDeclarations section. I haven't added all +the languages that Highlight can handle because it's rumored that having two conflicting UTI declarations for the same +file extension can cause problems. Note that if you do edit the Info.plist file you need to nudge the system to tell it +something has changed. Moving the plug-in to the desktop then back to its installed location should do the trick. + +As an aside, by changing colorize.sh you can use this plug-in to render any file type that you can convert to HTML. Have +fun, and let me know if you do anything cool! ##### Adding Language Types -If QLColorCode doesn't display PHP and JavaScript code properly, their types may -need to be added to Info.plist. Finding the right type string to use is the -tricky part. Getting the type strings and getting Info.plist edits to take effect -is easy by following the steps below, which explain how to add support for PHP: +If QLColorCode doesn't display PHP and JavaScript code properly, their types may need to be added to Info.plist. Finding +the right type string to use is the tricky part. Getting the type strings and getting Info.plist edits to take effect is +easy by following the steps below, which explain how to add support for PHP: 1. In Terminal.app (or any shell prompt), enter the command: - ``` bash - mdls -name kMDItemContentType /full/path/to/file.php - ``` +```bash +mdls -name kMDItemContentType /full/path/to/file.php +``` - Use the path to any PHP file. The response will be: +Use the path to any PHP file. The response will be: - ``` txt - kMDItemContentType = "public.php-script" - ``` +```txt +kMDItemContentType = "public.php-script" +``` - The string `public.php-script` is the type string needed in a later step. +The string `public.php-script` is the type string needed in a later step. 2. Again at a shell prompt, enter the command: - ``` bash - open ~/Library/QuickLook/QLColorCode.qlgenerator/Contents/Info.plist - ``` +```bash +open ~/Library/QuickLook/QLColorCode.qlgenerator/Contents/Info.plist +``` - This will open Info.plist in Xcode.app. +This will open Info.plist in Xcode.app. 3. In Xcode.app's edit window for Info.plist, go to: - Document types > Item 0 > Document Content Type UTIs +`Document types > Item 0 > Document Content Type UTIs` - (If the editor is showing raw keys, that's: - CFBundleDocumentTypes > Item 0 > LSItemContentTypes) +(If the editor is showing raw keys, that's: CFBundleDocumentTypes > Item 0 > LSItemContentTypes) 4. Add an item for `public.php-script`, the type string found in the first step. 5. Save the updated Info.plist file. -6. Try it in Finder. (It's usually unnecessary to move/return the QLColorCode extension, restart QuickLook, or restart the Finder, but it wouldn't be surprising that some users might need to do so.) - -The Info.plist included with this version of QLColorCode already contains types -for PHP and JavaScript code, but these steps show how easy it is to add other -types. (Maybe somebody will develop a Preference Pane for QLColorCode to make -this even easier.) +6. Try it in Finder. (It's usually unnecessary to move/return the QLColorCode extension, restart QuickLook, or restart + the Finder, but it wouldn't be surprising that some users might need to do so.) From e943875aa7646212cf5aa0397b4a4c81daefab82 Mon Sep 17 00:00:00 2001 From: Anthony Gelibert Date: Thu, 17 Dec 2020 09:52:00 +0100 Subject: [PATCH 12/23] Add XSL support --- CHANGELOG.md | 4 +++- Info.plist | 2 ++ QLColorCode.xcodeproj/project.pbxproj | 12 ++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fd8d18..5809a08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/fr/1.0.0/) a ## [Unreleased] -- NOTHING +### Added + +- `xsl` support. ## [4.0.2] — 2020-12-16 diff --git a/Info.plist b/Info.plist index 06eb805..ca2f568 100644 --- a/Info.plist +++ b/Info.plist @@ -97,6 +97,7 @@ dyn.ah62d4rv4ge81a63v dyn.ah62d4rv4ge81k3x0qf3hg dyn.ah62d4rv4ge81k3u + dyn.ah62d4rv4ge81u65q @@ -1356,6 +1357,7 @@ dyn.ah62d4rv4ge81u7k dyn.ah62d4rv4ge81u6pr dyn.ah62d4rv4ge81u6k + dyn.ah62d4rv4ge81u65q UTTypeDescription XSD/XQuery/XSL/XML Source File diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj index a8b9797..1fb8f4a 100644 --- a/QLColorCode.xcodeproj/project.pbxproj +++ b/QLColorCode.xcodeproj/project.pbxproj @@ -599,9 +599,9 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 4.0.2; + CURRENT_PROJECT_VERSION = "4.0.3+dev"; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 4.0.2; + MARKETING_VERSION = "4.0.3+dev"; OTHER_CFLAGS = "-DDEBUG"; }; name = Debug; @@ -611,9 +611,9 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 4.0.2; + CURRENT_PROJECT_VERSION = "4.0.3+dev"; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 4.0.2; + MARKETING_VERSION = "4.0.3+dev"; }; name = Release; }; @@ -650,7 +650,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 4.0.2; + CURRENT_PROJECT_VERSION = "4.0.3+dev"; DEAD_CODE_STRIPPING = YES; DSTROOT = "/export/tmp/$(PROJECT_NAME).dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -717,7 +717,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CURRENT_PROJECT_VERSION = 4.0.2; + CURRENT_PROJECT_VERSION = "4.0.3+dev"; DEAD_CODE_STRIPPING = YES; DSTROOT = "/export/tmp/$(PROJECT_NAME).dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; From a2a277a9b4ae970b60f594cbe0c2a2829a9d5161 Mon Sep 17 00:00:00 2001 From: Anthony Gelibert Date: Thu, 17 Dec 2020 11:26:10 +0100 Subject: [PATCH 13/23] Bump version numbers and update according CHANGELOG --- CHANGELOG.md | 4 ++++ QLColorCode.xcodeproj/project.pbxproj | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5809a08..bc3e180 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/fr/1.0.0/) a ## [Unreleased] +- NOTHING + +## [4.0.3] — 2020-12-17 + ### Added - `xsl` support. diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj index 1fb8f4a..01b42bf 100644 --- a/QLColorCode.xcodeproj/project.pbxproj +++ b/QLColorCode.xcodeproj/project.pbxproj @@ -599,9 +599,9 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = "4.0.3+dev"; + CURRENT_PROJECT_VERSION = 4.0.3; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = "4.0.3+dev"; + MARKETING_VERSION = 4.0.3; OTHER_CFLAGS = "-DDEBUG"; }; name = Debug; @@ -611,9 +611,9 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = "4.0.3+dev"; + CURRENT_PROJECT_VERSION = 4.0.3; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = "4.0.3+dev"; + MARKETING_VERSION = 4.0.3; }; name = Release; }; @@ -650,7 +650,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = "4.0.3+dev"; + CURRENT_PROJECT_VERSION = 4.0.3; DEAD_CODE_STRIPPING = YES; DSTROOT = "/export/tmp/$(PROJECT_NAME).dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -717,7 +717,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CURRENT_PROJECT_VERSION = "4.0.3+dev"; + CURRENT_PROJECT_VERSION = 4.0.3; DEAD_CODE_STRIPPING = YES; DSTROOT = "/export/tmp/$(PROJECT_NAME).dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; From 835aa2324e56760edcaa248b9229a887feef0d9e Mon Sep 17 00:00:00 2001 From: Anthony Gelibert Date: Thu, 17 Dec 2020 11:32:36 +0100 Subject: [PATCH 14/23] Update CHANGELOG --- CHANGELOG.md | 6 +++++- QLColorCode.xcodeproj/project.pbxproj | 12 ++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc3e180..9eebd4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/fr/1.0.0/) a - NOTHING +### Changed + +- Compilation of `highlight`/`lua` (thanks @Tatsh). + ## [4.0.3] — 2020-12-17 ### Added @@ -63,7 +67,7 @@ Thanks to @tatsh for his amazing work!** - `kts` (kotlin) support. - `xsh` support. -- `pyc` support (decompilation with `uncompyle6` [has to be in `/usr/local/bin`]) +- `pyc` support (decompilation with `uncompyle6` [has to be in `/usr/local/bin`]). - `rst` support. - `perl` support. - `bats` (Bash Automated Testing System) support. diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj index 01b42bf..d2c300c 100644 --- a/QLColorCode.xcodeproj/project.pbxproj +++ b/QLColorCode.xcodeproj/project.pbxproj @@ -599,9 +599,9 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 4.0.3; + CURRENT_PROJECT_VERSION = "4.1.0+dev"; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 4.0.3; + MARKETING_VERSION = "4.1.0+dev"; OTHER_CFLAGS = "-DDEBUG"; }; name = Debug; @@ -611,9 +611,9 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 4.0.3; + CURRENT_PROJECT_VERSION = "4.1.0+dev"; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 4.0.3; + MARKETING_VERSION = "4.1.0+dev"; }; name = Release; }; @@ -650,7 +650,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 4.0.3; + CURRENT_PROJECT_VERSION = "4.1.0+dev"; DEAD_CODE_STRIPPING = YES; DSTROOT = "/export/tmp/$(PROJECT_NAME).dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -717,7 +717,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CURRENT_PROJECT_VERSION = 4.0.3; + CURRENT_PROJECT_VERSION = "4.1.0+dev"; DEAD_CODE_STRIPPING = YES; DSTROOT = "/export/tmp/$(PROJECT_NAME).dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; From 139f38e6b02f20841701893752cf6deb19d8c1bd Mon Sep 17 00:00:00 2001 From: Andrew Udvare Date: Thu, 17 Dec 2020 04:03:09 -0500 Subject: [PATCH 15/23] No patching submodules --- QLColorCode.xcodeproj/project.pbxproj | 130 +++++++++++--------------- README.md | 4 + hl/apply-patches.sh | 11 --- hl/highlight.patch | 24 ----- hl/lua.patch | 17 ---- 5 files changed, 61 insertions(+), 125 deletions(-) delete mode 100755 hl/apply-patches.sh delete mode 100644 hl/highlight.patch delete mode 100644 hl/lua.patch diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj index d2c300c..2b050d7 100644 --- a/QLColorCode.xcodeproj/project.pbxproj +++ b/QLColorCode.xcodeproj/project.pbxproj @@ -19,16 +19,16 @@ name = Package; productName = Package; }; - 26BACA63257CF90200486D28 /* Apply patches */ = { + 26653B3A258B55350021CDD8 /* Copy lua.hpp */ = { isa = PBXAggregateTarget; - buildConfigurationList = 26BACA67257CF90200486D28 /* Build configuration list for PBXAggregateTarget "Apply patches" */; + buildConfigurationList = 26653B3B258B55350021CDD8 /* Build configuration list for PBXAggregateTarget "Copy lua.hpp" */; buildPhases = ( - 26BACA66257CF90200486D28 /* ShellScript */, + 26653B41258B55390021CDD8 /* ShellScript */, ); dependencies = ( ); - name = "Apply patches"; - productName = Package; + name = "Copy lua.hpp"; + productName = "Copy lua.hpp"; }; /* End PBXAggregateTarget section */ @@ -58,6 +58,13 @@ remoteGlobalIDString = 8D57630D048677EA00EA77CD; remoteInfo = QLColorCode; }; + 26653B42258B55570021CDD8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 089C1669FE841209C02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 26653B3A258B55350021CDD8; + remoteInfo = "Copy lua.hpp"; + }; 26BAC9C4257CE96D00486D28 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 089C1669FE841209C02AAC07 /* Project object */; @@ -72,13 +79,6 @@ remoteGlobalIDString = 26BAC9BC257CE93200486D28; remoteInfo = lua; }; - 26BACA6E257CF94500486D28 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 089C1669FE841209C02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 26BACA63257CF90200486D28; - remoteInfo = "Apply patches"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -114,16 +114,6 @@ EAE9D2CB169E2B3500A67B2F /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = ""; }; /* End PBXFileReference section */ -/* Begin PBXFrameworksBuildPhase section */ - 8D576313048677EA00EA77CD /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - /* Begin PBXGroup section */ 089C166AFE841209C02AAC07 /* QLColorCode */ = { isa = PBXGroup; @@ -188,7 +178,7 @@ /* Begin PBXLegacyTarget section */ 26BAC9AB257CE89900486D28 /* highlight */ = { isa = PBXLegacyTarget; - buildArgumentsString = "-j9 cli"; + buildArgumentsString = "-j9 cli LUA_LIBS=../../lua/liblua.a 'CXX_COMPILE=clang++ -Wall -O2 -std=c++11 -D_FILE_OFFSET_BITS=64 -c -I /opt/local/include -I /usr/local/include -I ./include -I ../../lua'"; buildConfigurationList = 26BAC9AC257CE89900486D28 /* Build configuration list for PBXLegacyTarget "highlight" */; buildPhases = ( ); @@ -196,6 +186,7 @@ buildWorkingDirectory = hl/highlight; dependencies = ( 26BAC9C7257CE97100486D28 /* PBXTargetDependency */, + 26653B43258B55570021CDD8 /* PBXTargetDependency */, ); name = highlight; passBuildSettingsInEnvironment = 1; @@ -203,14 +194,13 @@ }; 26BAC9BC257CE93200486D28 /* lua */ = { isa = PBXLegacyTarget; - buildArgumentsString = "-j9 $(ACTION)"; + buildArgumentsString = "-j9 $(ACTION) MYCFLAGS=-std=c99 MYLDFLAGS= MYLIBS=-ldl"; buildConfigurationList = 26BAC9BD257CE93200486D28 /* Build configuration list for PBXLegacyTarget "lua" */; buildPhases = ( ); buildToolPath = /usr/bin/make; buildWorkingDirectory = hl/lua; dependencies = ( - 26BACA6F257CF94500486D28 /* PBXTargetDependency */, ); name = lua; passBuildSettingsInEnvironment = 1; @@ -226,7 +216,6 @@ 8D57630E048677EA00EA77CD /* Headers */, 8D57630F048677EA00EA77CD /* Resources */, 8D576311048677EA00EA77CD /* Sources */, - 8D576313048677EA00EA77CD /* Frameworks */, 0ECBBA6F0CFCA39E00416538 /* Copy to Library */, 0E1280381061C3EA0078EC05 /* Reset quicklookd */, ); @@ -250,6 +239,9 @@ BuildIndependentTargetsInParallel = YES; LastUpgradeCheck = 1200; TargetAttributes = { + 26653B3A258B55350021CDD8 = { + CreatedOnToolsVersion = 12.3; + }; 26BAC9AB257CE89900486D28 = { CreatedOnToolsVersion = 12.2; }; @@ -274,7 +266,7 @@ 0E0E34E90D0097020086C1E6 /* Package */, 26BAC9AB257CE89900486D28 /* highlight */, 26BAC9BC257CE93200486D28 /* lua */, - 26BACA63257CF90200486D28 /* Apply patches */, + 26653B3A258B55350021CDD8 /* Copy lua.hpp */, ); }; /* End PBXProject section */ @@ -327,18 +319,22 @@ shellScript = "qlmanage -r\n"; showEnvVarsInLog = 0; }; - 26BACA66257CF90200486D28 /* ShellScript */ = { + 26653B41258B55390021CDD8 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( ); + outputFileListPaths = ( + ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cd hl\n./apply-patches.sh\n"; + shellScript = "cp hl/lua.hpp hl/lua/lua.hpp\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -362,6 +358,11 @@ target = 8D57630D048677EA00EA77CD /* QLColorCode */; targetProxy = 0E0E34ED0D0097280086C1E6 /* PBXContainerItemProxy */; }; + 26653B43258B55570021CDD8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 26653B3A258B55350021CDD8 /* Copy lua.hpp */; + targetProxy = 26653B42258B55570021CDD8 /* PBXContainerItemProxy */; + }; 26BAC9C5257CE96D00486D28 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 26BAC9AB257CE89900486D28 /* highlight */; @@ -372,11 +373,6 @@ target = 26BAC9BC257CE93200486D28 /* lua */; targetProxy = 26BAC9C6257CE97100486D28 /* PBXContainerItemProxy */; }; - 26BACA6F257CF94500486D28 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 26BACA63257CF90200486D28 /* Apply patches */; - targetProxy = 26BACA6E257CF94500486D28 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -408,6 +404,24 @@ }; name = Release; }; + 26653B3C258B55350021CDD8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = EU5R2QY9HJ; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 26653B3D258B55350021CDD8 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = EU5R2QY9HJ; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; 26BAC9AD257CE89900486D28 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -564,36 +578,6 @@ }; name = Release; }; - 26BACA68257CF90200486D28 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - INFOPLIST_FILE = "Package copy-Info.plist"; - PRODUCT_NAME = "$(TARGET_NAME)"; - RUN_CLANG_STATIC_ANALYZER = YES; - }; - name = Debug; - }; - 26BACA69257CF90200486D28 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - INFOPLIST_FILE = "Package copy-Info.plist"; - PRODUCT_NAME = "$(TARGET_NAME)"; - RUN_CLANG_STATIC_ANALYZER = YES; - ZERO_LINK = NO; - }; - name = Release; - }; 2CA3261F0896AD4900168862 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -762,29 +746,29 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 26BAC9AC257CE89900486D28 /* Build configuration list for PBXLegacyTarget "highlight" */ = { + 26653B3B258B55350021CDD8 /* Build configuration list for PBXAggregateTarget "Copy lua.hpp" */ = { isa = XCConfigurationList; buildConfigurations = ( - 26BAC9AD257CE89900486D28 /* Debug */, - 26BAC9AE257CE89900486D28 /* Release */, + 26653B3C258B55350021CDD8 /* Debug */, + 26653B3D258B55350021CDD8 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 26BAC9BD257CE93200486D28 /* Build configuration list for PBXLegacyTarget "lua" */ = { + 26BAC9AC257CE89900486D28 /* Build configuration list for PBXLegacyTarget "highlight" */ = { isa = XCConfigurationList; buildConfigurations = ( - 26BAC9BE257CE93200486D28 /* Debug */, - 26BAC9BF257CE93200486D28 /* Release */, + 26BAC9AD257CE89900486D28 /* Debug */, + 26BAC9AE257CE89900486D28 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 26BACA67257CF90200486D28 /* Build configuration list for PBXAggregateTarget "Apply patches" */ = { + 26BAC9BD257CE93200486D28 /* Build configuration list for PBXLegacyTarget "lua" */ = { isa = XCConfigurationList; buildConfigurations = ( - 26BACA68257CF90200486D28 /* Debug */, - 26BACA69257CF90200486D28 /* Release */, + 26BAC9BE257CE93200486D28 /* Debug */, + 26BAC9BF257CE93200486D28 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/README.md b/README.md index 76ecd5e..7043405 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,10 @@ Alternatively, if you use [Homebrew Cask](https://github.com/caskroom/homebrew-c **To build the project, you must have Boost headers on your system in `/opt/local/include` or `/usr/local/include`.** +Note that the build may fail if you have a version of `liblua.a` in a library +path such as `/usr/local/lib`. In that case, temporarily uninstall Lua using +the appropriate package manager. + ## Settings If you want to configure `QLColorCode`, there are several `defaults` commands that could be useful: diff --git a/hl/apply-patches.sh b/hl/apply-patches.sh deleted file mode 100755 index 0d2eb96..0000000 --- a/hl/apply-patches.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash -set -e -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" -cd "$DIR" -for i in lua highlight -do - pushd "$i" - git checkout . || true - patch -p1 < "../${i}.patch" - popd -done diff --git a/hl/highlight.patch b/hl/highlight.patch deleted file mode 100644 index b3e4afd..0000000 --- a/hl/highlight.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/makefile b/src/makefile -index 9d0a08e..0a7a833 100644 ---- a/src/makefile -+++ b/src/makefile -@@ -43,8 +43,8 @@ ifeq (${LUA_TEST},1) - LUA_PKG_NAME=lua - endif - --LUA_CFLAGS=$(shell pkg-config --cflags ${LUA_PKG_NAME}) --LUA_LIBS=$(shell pkg-config --libs ${LUA_PKG_NAME}) -+LUA_CFLAGS=-I../../lua -I../.. -+LUA_LIBS=../../lua/liblua.a - - # luajit lib - # LUA_LIBS=$(shell pkg-config --libs luajit) -@@ -75,7 +75,7 @@ LDFLAGS = -ldl - #LDFLAGS = ${LDFLAGS} -s - #LDFLAGS= -Wl,--as-needed - --CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS} -+CXX_COMPILE=${CXX} ${CFLAGS} -c -I /opt/local/include -I /usr/local/include -I ${INCLUDE_DIR} ${LUA_CFLAGS} - - # Data directories (data dir, configuration file dir) - CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\" diff --git a/hl/lua.patch b/hl/lua.patch deleted file mode 100644 index 23b2174..0000000 --- a/hl/lua.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/makefile b/makefile -index 9e537dcc..d275b809 100644 ---- a/makefile -+++ b/makefile -@@ -60,9 +60,9 @@ LOCAL = $(TESTS) $(CWARNS) - - - # enable Linux goodies --MYCFLAGS= $(LOCAL) -std=c99 -DLUA_USE_LINUX -DLUA_USE_READLINE --MYLDFLAGS= $(LOCAL) -Wl,-E --MYLIBS= -ldl -lreadline -+MYCFLAGS= $(LOCAL) -std=c99 -+MYLDFLAGS= $(LOCAL) -+MYLIBS= -ldl - - - CC= gcc From 1134d60752fd2f39a33322b3b521ab12d12d1fc7 Mon Sep 17 00:00:00 2001 From: Anthony Gelibert Date: Thu, 17 Dec 2020 11:36:33 +0100 Subject: [PATCH 16/23] Bump version numbers and update according CHANGELOG --- CHANGELOG.md | 2 ++ QLColorCode.xcodeproj/project.pbxproj | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9eebd4a..945913f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/fr/1.0.0/) a - NOTHING +## [4.1.0] — 2020-12-17 + ### Changed - Compilation of `highlight`/`lua` (thanks @Tatsh). diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj index 2b050d7..4517d20 100644 --- a/QLColorCode.xcodeproj/project.pbxproj +++ b/QLColorCode.xcodeproj/project.pbxproj @@ -583,9 +583,9 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = "4.1.0+dev"; + CURRENT_PROJECT_VERSION = 4.1.0; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = "4.1.0+dev"; + MARKETING_VERSION = 4.1.0; OTHER_CFLAGS = "-DDEBUG"; }; name = Debug; @@ -595,9 +595,9 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = "4.1.0+dev"; + CURRENT_PROJECT_VERSION = 4.1.0; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = "4.1.0+dev"; + MARKETING_VERSION = 4.1.0; }; name = Release; }; @@ -634,7 +634,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = "4.1.0+dev"; + CURRENT_PROJECT_VERSION = 4.1.0; DEAD_CODE_STRIPPING = YES; DSTROOT = "/export/tmp/$(PROJECT_NAME).dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -701,7 +701,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CURRENT_PROJECT_VERSION = "4.1.0+dev"; + CURRENT_PROJECT_VERSION = 4.1.0; DEAD_CODE_STRIPPING = YES; DSTROOT = "/export/tmp/$(PROJECT_NAME).dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; From 04a30771706054b1d1e1150ca0e2aa7ed165a152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AB=E3=83=AF=E3=83=AA=E3=83=9F=E4=BA=BA=E5=BD=A2?= Date: Mon, 21 Dec 2020 16:12:00 +0900 Subject: [PATCH 17/23] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7043405..c91ada3 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ To install the plug-in, just drag it to `~/Library/QuickLook`. You may need to c exist. Alternatively, if you use [Homebrew Cask](https://github.com/caskroom/homebrew-cask), install with -`brew cask install qlcolorcode`. Also available on [MacPorts](https://www.macports.org): `port install QLColorCode`. +`brew install --cask qlcolorcode`. Also available on [MacPorts](https://www.macports.org): `port install QLColorCode`. **To build the project, you must have Boost headers on your system in `/opt/local/include` or `/usr/local/include`.** From 59fc5dc59713e1482ef3f300b2a087a55e745fd1 Mon Sep 17 00:00:00 2001 From: Anthony Gelibert Date: Wed, 30 Dec 2020 16:54:38 +0100 Subject: [PATCH 18/23] Update PLIST file --- Info.plist | 1532 +++++----------------------------------------------- 1 file changed, 142 insertions(+), 1390 deletions(-) diff --git a/Info.plist b/Info.plist index ca2f568..2960ed6 100644 --- a/Info.plist +++ b/Info.plist @@ -1,1399 +1,151 @@ - - CFBundleDevelopmentRegion - English - CFBundleDocumentTypes - - - CFBundleTypeName - - CFBundleTypeRole - QLGenerator - LSItemContentTypes - - public.source-code - public.ruby-script - public.yaml - public.php-script - com.netscape.javascript-source - com.microsoft.c-sharp - com.microsoft.f-sharp - public.css - com.apple.applescript.script - public.xml - com.apple.property-list - org.tug.tex - com.sun.java-class - com.sun.java-source - org.vim.vim-script - org.tug.lua - public.tex - public.text - public.shell-script - public.c-header - public.objective-c-source - public.c-source - public.c-plus-plus-source - public.c-plus-plus-header - public.objective-c-plus-plus-source - public.assembly-source - com.apple.rez-source - public.mig-source - public.swift-source - public.pascal-source - com.apple.symbol-export - public.csh-script - public.zsh-script - com.apple.terminal.shell-script - com.apple.terminal.session - com.apple.terminal.settings - public.python-script - com.apple.xcode.strings-text - dyn.ah62d4rv4ge81g6pq - dyn.ah62d4rv4ge8007a - dyn.ah62d4rv4ge80s6xbqv0gn - dyn.ah62d4rv4ge81g25brvuu - dyn.ah62d4rv4ge80g62 - dyn.ah62d4rv4ge80w5pq - dyn.ah62d4rv4ge80s52 - dyn.ah62d4rv4ge80g2pcqf0a - dyn.ah62d4rv4ge81e62 - dyn.ah62d4rv4ge80u62 - dyn.ah62d4rv4ge80g6u - dyn.ah62d4rv4ge80g3xh - dyn.ah62d4rv4ge81q7pf - dyn.ah62d4rv4ge81a6xtsbw1e7dmqz3u - dyn.ah62d4rv4ge80e2p4qz0a - dyn.ah62d4rv4ge80e8xq - dyn.ah62d4rv4ge81u65e - dyn.ah62d4rv4ge81u6pzqz3hw - org.vim.xsl-file - dyn.ah62d4rv4ge81u7k - dyn.ah62d4rv4ge81u6pr - dyn.ah62d4rv4ge81u6k - dyn.ah62d4rv4ge8007dx - dyn.ah62d4rv4ge80e2py - dyn.ah62d4rv4ge80q4pxra - dyn.ah62d4rv4ge81u65k - dyn.ah62d4rv4ge81a8pd - dyn.ah62d4rv4ge81e65y - dyn.ah62d4rv4ge80n5a - dyn.ah62d4rv4ge80w5u - dyn.ah62d4rv4ge81k - dyn.ah62d4rv4ge80c5k - dyn.ah62d4rv4ge80c3dtqq - public.perl-script - dyn.ah62d4rv4ge80e2pysq - public.patch-file - public.bash-script - com.apple.xcode.bash-script - com.apple.xcode.csh-script - com.apple.xcode.ksh-script - com.apple.xcode.tcsh-script - com.apple.xcode.yacc-source - com.apple.xcode.zsh-script - dyn.ah62d4rv4ge81a63v - dyn.ah62d4rv4ge81k3x0qf3hg - dyn.ah62d4rv4ge81k3u - dyn.ah62d4rv4ge81u65q - - - - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundleShortVersionString - $(MARKETING_VERSION) - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - CFPlugInDynamicRegisterFunction - - CFPlugInDynamicRegistration - NO - CFPlugInFactories - C044543D-70A1-46D8-A908-4B8AEA1197A4 - QuickLookGeneratorPluginFactory - - CFPlugInTypes - - 5E2D9680-5022-40FA-B806-43349622E5B9 + CFBundleDevelopmentRegion + English + CFBundleDocumentTypes - C044543D-70A1-46D8-A908-4B8AEA1197A4 - - - CFPlugInUnloadFunction - - QLNeedsToBeRunInMainThread - - QLPreviewHeight - 800 - QLPreviewWidth - 800 - QLSupportsConcurrentRequests - - QLThumbnailMinimumSize - 9 - UTImportedTypeDeclarations - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - Logos Source File - UTTypeIdentifier - com.dhowett.logos - UTTypeTagSpecification - - public.filename-extension - - xm - - - - - UTTypeIdentifier - org.ocaml.ocaml-source - UTTypeReferenceURL - http://www.ocaml.org/ - UTTypeTagSpecification - - public.filename-extension - - ml - mll - mly - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - OCaml Interface File - UTTypeIdentifier - org.ocaml.ocaml-interface - UTTypeReferenceURL - http://www.ocaml.org/ - UTTypeTagSpecification - - public.filename-extension - - mli - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - Haskell Source File - UTTypeIdentifier - org.haskell.haskell-source - UTTypeReferenceURL - http://www.haskell.org/ - UTTypeTagSpecification - - public.filename-extension - - hs - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - Literate Haskell Source File - UTTypeIdentifier - org.haskell.literate-haskell-source - UTTypeReferenceURL - http://www.haskell.org/ - UTTypeTagSpecification - - public.filename-extension - - lhs - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - scheme Source File - UTTypeIdentifier - org.n8gray.scheme-source - UTTypeTagSpecification - - public.filename-extension - - scm - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - .ini Source File - UTTypeIdentifier - org.n8gray.ini-source - UTTypeTagSpecification - - public.filename-extension - - ini - - public.mime-type - text/x-ini - - - - UTTypeConformsTo - - public.tex - - UTTypeDescription - TeX text file - UTTypeIdentifier - public.tex - UTTypeTagSpecification - - public.filename-extension - - tex - latex - ltx - texi - ctx - sty - cls - - - - - UTTypeConformsTo - - public.yaml - - UTTypeDescription - YAML file - UTTypeIdentifier - public.yaml - UTTypeTagSpecification - - public.filename-extension - - yaml - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - Erlang Source File - UTTypeIdentifier - org.erlang.erlang-source - UTTypeTagSpecification - - public.filename-extension - - erl - hrl - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - Standard ML Source File - UTTypeIdentifier - org.n8gray.standard-ml-source - UTTypeTagSpecification - - public.filename-extension - - sml - - - - - UTTypeConformsTo - - public.source-code - dyn.ah62d4rv4ge81g6pq - - UTTypeDescription - SQL Source File - UTTypeIdentifier - org.n8gray.structured-query-language-source - UTTypeTagSpecification - - public.filename-extension - - sql - - - - - UTTypeConformsTo - - public.script - public.patch-file - - UTTypeDescription - Diff File - UTTypeIdentifier - org.n8gray.diff-script - UTTypeTagSpecification - - public.filename-extension - - diff - patch - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - CSS File - UTTypeIdentifier - public.css - UTTypeTagSpecification - - public.filename-extension - - css - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - Lua Source File - UTTypeIdentifier - org.lua.lua-source - UTTypeTagSpecification - - public.filename-extension - - lua - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - Tcl Source File - UTTypeIdentifier - tk.tcl.tcl-source - UTTypeTagSpecification - - public.filename-extension - - tcl - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - JSP Source File - UTTypeIdentifier - org.n8gray.jsp-source - UTTypeTagSpecification - - public.filename-extension - - jsp - - - - - UTTypeConformsTo - - public.source-code - dyn.ah62d4rv4ge80e2py - - UTTypeDescription - DOS Batch Source File - UTTypeIdentifier - org.n8gray.bat - UTTypeTagSpecification - - public.filename-extension - - bat - cmd - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - Adobe Flash ActionScript Source File - UTTypeIdentifier - com.adobe.actionscript - UTTypeTagSpecification - - public.filename-extension - - as - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - Lisp Source File - UTTypeIdentifier - org.n8gray.lisp - UTTypeTagSpecification - - public.filename-extension - - sb - lisp - lsp - asd - el - clj - - - - - UTTypeConformsTo - - public.source-code - dyn.ah62d4rv4ge80s52 - - UTTypeDescription - Go Source File - UTTypeIdentifier - org.go.source - UTTypeTagSpecification - - public.filename-extension - - go - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - IDL Source File - UTTypeIdentifier - org.n8gray.idl - UTTypeTagSpecification - - public.filename-extension - - pro - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - Makefile Source File - UTTypeIdentifier - org.n8gray.makefile - UTTypeTagSpecification - - public.filename-extension - - mk - mak - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - Verilog Source File - UTTypeIdentifier - org.n8gray.verilog - UTTypeTagSpecification - - public.filename-extension - - v - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - VHDL Source File - UTTypeIdentifier - org.n8gray.vhdl - UTTypeTagSpecification - - public.filename-extension - - vhdl - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - XHTML Source File - UTTypeIdentifier - org.n8gray.xhtml - UTTypeTagSpecification - - public.filename-extension - - xhtml - - - - - UTTypeConformsTo - - public.xml - - UTTypeDescription - Java Web Installer (XML) - UTTypeIdentifier - org.n8gray.javaInstaller - UTTypeTagSpecification - - public.filename-extension - - jnlp - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - Eiffel source code file - UTTypeIdentifier - com.eiffel.source-code - UTTypeTagSpecification - - public.filename-extension - - e - - - - - UTTypeConformsTo - - public.xml - - UTTypeDescription - EiffelStudio project configuration file - UTTypeIdentifier - com.eiffel.eiffelstudio-project-config - UTTypeTagSpecification - - public.filename-extension - - ecf - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - C# Source File - UTTypeIdentifier - com.microsoft.csharp-source - UTTypeReferenceURL - http://www.microsoft.com/ - UTTypeTagSpecification - - public.filename-extension - - cs - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - Visual Basic Source File - UTTypeIdentifier - com.microsoft.vb-source - UTTypeReferenceURL - http://www.microsoft.com/ - UTTypeTagSpecification - public.filename-extension - - vb + CFBundleTypeName + + CFBundleTypeRole + QLGenerator + LSItemContentTypes + + dyn.ah62d4rv4ge81q4pr + public.source-code + public.ruby-script + public.yaml + public.php-script + com.netscape.javascript-source + com.microsoft.c-sharp + com.microsoft.f-sharp + public.css + com.apple.applescript.script + public.xml + com.apple.property-list + org.tug.tex + com.sun.java-class + com.sun.java-source + org.vim.vim-script + org.tug.lua + public.tex + public.text + public.shell-script + public.c-header + public.objective-c-source + public.c-source + public.c-plus-plus-source + public.c-plus-plus-header + public.objective-c-plus-plus-source + public.assembly-source + com.apple.rez-source + public.mig-source + public.swift-source + public.pascal-source + com.apple.symbol-export + public.csh-script + public.zsh-script + com.apple.terminal.shell-script + com.apple.terminal.session + com.apple.terminal.settings + public.python-script + com.apple.xcode.strings-text + dyn.ah62d4rv4ge81g6pq + dyn.ah62d4rv4ge8007a + dyn.ah62d4rv4ge80s6xbqv0gn + dyn.ah62d4rv4ge81g25brvuu + dyn.ah62d4rv4ge80g62 + dyn.ah62d4rv4ge80w5pq + dyn.ah62d4rv4ge80s52 + dyn.ah62d4rv4ge80g2pcqf0a + dyn.ah62d4rv4ge81e62 + dyn.ah62d4rv4ge80u62 + dyn.ah62d4rv4ge80g6u + dyn.ah62d4rv4ge80g3xh + dyn.ah62d4rv4ge81q7pf + dyn.ah62d4rv4ge81a6xtsbw1e7dmqz3u + dyn.ah62d4rv4ge80e2p4qz0a + dyn.ah62d4rv4ge80e8xq + dyn.ah62d4rv4ge81u65e + dyn.ah62d4rv4ge81u6pzqz3hw + org.vim.xsl-file + dyn.ah62d4rv4ge81u7k + dyn.ah62d4rv4ge81u6pr + dyn.ah62d4rv4ge81u6k + dyn.ah62d4rv4ge8007dx + dyn.ah62d4rv4ge80e2py + dyn.ah62d4rv4ge80q4pxra + dyn.ah62d4rv4ge81u65k + dyn.ah62d4rv4ge81a8pd + dyn.ah62d4rv4ge81e65y + dyn.ah62d4rv4ge80n5a + dyn.ah62d4rv4ge80w5u + dyn.ah62d4rv4ge81k + dyn.ah62d4rv4ge80c5k + dyn.ah62d4rv4ge80c3dtqq + public.perl-script + dyn.ah62d4rv4ge80e2pysq + public.patch-file + public.bash-script + com.apple.xcode.bash-script + com.apple.xcode.csh-script + com.apple.xcode.ksh-script + com.apple.xcode.tcsh-script + com.apple.xcode.yacc-source + com.apple.xcode.zsh-script + dyn.ah62d4rv4ge81a63v + dyn.ah62d4rv4ge81k3x0qf3hg + dyn.ah62d4rv4ge81k3u + dyn.ah62d4rv4ge81u65q + dyn.ah62d4rv4ge80w5xm + dyn.ah62d4rv4ge8023pxsq + dyn.ah62d4rv4ge80g55sq2 - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - Ruby on Rails File - UTTypeIdentifier - org.n8gray.railstemplate - UTTypeTagSpecification - - public.filename-extension - - rhtml - erb - rjs - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - QLColorCode Test File - UTTypeIdentifier - org.n8gray.bogusextension - UTTypeTagSpecification - - public.filename-extension - - bogus_extension - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - Groovy Source Code - UTTypeIdentifier - org.codehaus.groovy-source - UTTypeTagSpecification - - public.filename-extension - - groovy - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - Scala Source Code - UTTypeIdentifier - org.scala.source - UTTypeTagSpecification - - public.filename-extension - - scala - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - Coldfusion Source Code - UTTypeIdentifier - com.adobe.coldfusion - UTTypeTagSpecification - - public.filename-extension - - cfc - cfm - cfml - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - PDE files - UTTypeIdentifier - org.arduino.source - UTTypeTagSpecification - - public.filename-extension - - pde - ino - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - ASCR files - UTTypeIdentifier - org.applescript.source - UTTypeTagSpecification - - public.filename-extension - - ascr - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - RDF files - UTTypeIdentifier - org.rdf.source - UTTypeTagSpecification - - public.filename-extension - - rdf - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - XUL files - UTTypeIdentifier - org.xul.source - UTTypeTagSpecification - - public.filename-extension - - xul - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - INO files - UTTypeIdentifier - org.arduino.ino-source - UTTypeTagSpecification - - public.filename-extension - - ino - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - INF files - UTTypeIdentifier - org.microsoft.inf - UTTypeTagSpecification - - public.filename-extension - - inf - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - MF files - UTTypeIdentifier - com.sun.manifest - UTTypeTagSpecification - - public.filename-extension - - mf - - - - - UTTypeConformsTo - - com.sun.java-class - - UTTypeDescription - Java Class - UTTypeIdentifier - com.sun.java-class - UTTypeTagSpecification - - public.filename-extension - - class - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - JavaFX ML - UTTypeIdentifier - com.sun.javafx - UTTypeTagSpecification - - public.filename-extension - - fxml - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - NFO files - UTTypeIdentifier - org.nfo - UTTypeTagSpecification - - public.filename-extension - - nfo - - - - - UTTypeConformsTo - - public.xml - - UTTypeDescription - ECore files - UTTypeIdentifier - org.omg.ecore - UTTypeTagSpecification - - public.filename-extension - - ecore - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - ATL files - UTTypeIdentifier - org.km3 - UTTypeTagSpecification - - public.filename-extension - - atl - - - - - UTTypeConformsTo - - public.source-code - dyn.ah62d4rv4ge80q4pxra - - UTTypeDescription - Fish source files - UTTypeIdentifier - org.fish.source - UTTypeTagSpecification - - public.filename-extension - - fish - - - - - UTTypeConformsTo - - dyn.ah62d4rv4ge81u65k - - UTTypeDescription - XSH source files - UTTypeIdentifier - org.xsh.source - UTTypeTagSpecification - - public.filename-extension - - xsh - - - - - UTTypeConformsTo - - public.source-code - dyn.ah62d4rv4ge81e62 - - UTTypeDescription - Rust source files - UTTypeIdentifier - org.rust.source - UTTypeTagSpecification - - public.filename-extension - - rs - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - Coffee source files - UTTypeIdentifier - org.coffee.source - UTTypeTagSpecification - - public.filename-extension - - coffee - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - CSON source files - UTTypeIdentifier - org.cson.source - UTTypeTagSpecification - - public.filename-extension - - cson - - - - - UTTypeConformsTo - - public.source-code - dyn.ah62d4rv4ge80e2pysq - public.bash-script - - UTTypeDescription - Shell script - UTTypeIdentifier - org.bash.source - UTTypeTagSpecification - - public.filename-extension - - bashrc - bats - bash - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - INNO source files - UTTypeIdentifier - org.inno.source - UTTypeTagSpecification - - public.filename-extension - - iss - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - ASM source files - UTTypeIdentifier - org.asm.source - UTTypeTagSpecification - - public.filename-extension - - s79 - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - KERMETA source files - UTTypeIdentifier - org.kmt.source - UTTypeTagSpecification - - public.filename-extension - - kmt - - - - - UTTypeConformsTo - - dyn.ah62d4rv4ge8007dx - - UTTypeDescription - Kotlin source files - UTTypeIdentifier - org.kotlin.source - UTTypeTagSpecification - - public.filename-extension - - kts - - - - - UTTypeConformsTo - - public.source-code - - UTTypeDescription - GCC-linked files - UTTypeIdentifier - org.gcc.files - UTTypeTagSpecification - - public.filename-extension - - ld - map - d - - - - - UTTypeConformsTo - - dyn.ah62d4rv4ge8007a - - UTTypeDescription - Kotlin Source File - UTTypeIdentifier - org.kotlinlang.source - UTTypeTagSpecification - - public.filename-extension - - kt - - - - - UTTypeConformsTo - - dyn.ah62d4rv4ge80s6xbqv0gn - - UTTypeDescription - Gradle Source File - UTTypeIdentifier - org.gradle.source - UTTypeTagSpecification - - public.filename-extension - - gradle - - - - - UTTypeConformsTo - - dyn.ah62d4rv4ge80w5pq - - UTTypeDescription - JetBrain Project File - UTTypeIdentifier - com.jetbrain.source - UTTypeTagSpecification - - public.filename-extension - - iml - - - - - UTTypeConformsTo - - dyn.ah62d4rv4ge80g2pcqf0a - - UTTypeDescription - CABAL file - UTTypeIdentifier - public.cabal - UTTypeTagSpecification - - public.filename-extension - - cabal - - - - - UTTypeConformsTo - - dyn.ah62d4rv4ge80u62 - - UTTypeDescription - Haskell file - UTTypeIdentifier - public.haskell - UTTypeTagSpecification - - public.filename-extension - - hs - - - - - UTTypeConformsTo - - dyn.ah62d4rv4ge80g6u - - UTTypeDescription - Crystal Source File - UTTypeIdentifier - org.crystal-lang.source - UTTypeTagSpecification - - public.filename-extension - - cr - - - - - UTTypeConformsTo - - dyn.ah62d4rv4ge81q7pf - - UTTypeDescription - Vue Source File - UTTypeIdentifier - org.vue.source - UTTypeTagSpecification - - public.filename-extension - - vue - - - - - UTTypeConformsTo - - dyn.ah62d4rv4ge81k3x0qf3hg - dyn.ah62d4rv4ge81k3u - - UTTypeDescription - TensorFlow files - UTTypeIdentifier - org.tf.source - UTTypeTagSpecification - - public.filename-extension - - tfvars - tf - - - - - UTTypeConformsTo - - dyn.ah62d4rv4ge80e2p4qz0a - dyn.ah62d4rv4ge80e8xq - - UTTypeDescription - Bazel Source File - UTTypeIdentifier - org.bazel.source - UTTypeTagSpecification - - public.filename-extension - - bazel - bzl - - - - - UTTypeConformsTo - - dyn.ah62d4rv4ge81u65e - dyn.ah62d4rv4ge81u6pzqz3hw - org.vim.xsl-file - public.xml - dyn.ah62d4rv4ge81u7k - dyn.ah62d4rv4ge81u6pr - dyn.ah62d4rv4ge81u6k - dyn.ah62d4rv4ge81u65q - - UTTypeDescription - XSD/XQuery/XSL/XML Source File - UTTypeIdentifier - org.xml-tools.source - UTTypeTagSpecification - - public.filename-extension - - xsd - xquery - xml - xsl - xu - xqm - xq - - - - - UTTypeConformsTo - - dyn.ah62d4rv4ge81a63v - - UTTypeDescription - PowerShell - UTTypeIdentifier - org.powershell.source - UTTypeTagSpecification - - public.filename-extension - - ps1 - - - - - + + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + CFPlugInDynamicRegisterFunction + + CFPlugInDynamicRegistration + NO + CFPlugInFactories + + C044543D-70A1-46D8-A908-4B8AEA1197A4 + QuickLookGeneratorPluginFactory + + CFPlugInTypes + + 5E2D9680-5022-40FA-B806-43349622E5B9 + + C044543D-70A1-46D8-A908-4B8AEA1197A4 + + + CFPlugInUnloadFunction + + QLNeedsToBeRunInMainThread + + QLPreviewHeight + 800 + QLPreviewWidth + 800 + QLSupportsConcurrentRequests + + QLThumbnailMinimumSize + 17 + From a9ee1dddbc1c9eac50d999c4d675985568c961aa Mon Sep 17 00:00:00 2001 From: Anthony Gelibert Date: Wed, 30 Dec 2020 16:55:31 +0100 Subject: [PATCH 19/23] Bump version number --- QLColorCode.xcodeproj/project.pbxproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj index 4517d20..f04f296 100644 --- a/QLColorCode.xcodeproj/project.pbxproj +++ b/QLColorCode.xcodeproj/project.pbxproj @@ -583,9 +583,9 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 4.1.0; + CURRENT_PROJECT_VERSION = "4.1.1+dev"; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 4.1.0; + MARKETING_VERSION = "4.1.1+dev"; OTHER_CFLAGS = "-DDEBUG"; }; name = Debug; @@ -595,9 +595,9 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 4.1.0; + CURRENT_PROJECT_VERSION = "4.1.1+dev"; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 4.1.0; + MARKETING_VERSION = "4.1.1+dev"; }; name = Release; }; @@ -634,7 +634,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 4.1.0; + CURRENT_PROJECT_VERSION = "4.1.1+dev"; DEAD_CODE_STRIPPING = YES; DSTROOT = "/export/tmp/$(PROJECT_NAME).dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -701,7 +701,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CURRENT_PROJECT_VERSION = 4.1.0; + CURRENT_PROJECT_VERSION = "4.1.1+dev"; DEAD_CODE_STRIPPING = YES; DSTROOT = "/export/tmp/$(PROJECT_NAME).dst"; ENABLE_STRICT_OBJC_MSGSEND = YES; From e4554440da5253c696277d138f6b255a19d1e24e Mon Sep 17 00:00:00 2001 From: Anthony Gelibert Date: Wed, 30 Dec 2020 16:55:45 +0100 Subject: [PATCH 20/23] Remove useless settings --- QLColorCode.xcodeproj/project.pbxproj | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj index f04f296..db203f5 100644 --- a/QLColorCode.xcodeproj/project.pbxproj +++ b/QLColorCode.xcodeproj/project.pbxproj @@ -379,28 +379,16 @@ 0E0E34EA0D0097020086C1E6 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - PRODUCT_NAME = Package; - RUN_CLANG_STATIC_ANALYZER = YES; + PRODUCT_NAME = QLColorCode; }; name = Debug; }; 0E0E34EB0D0097020086C1E6 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - PRODUCT_NAME = Package; - RUN_CLANG_STATIC_ANALYZER = YES; - ZERO_LINK = NO; + PRODUCT_NAME = QLColorCode; }; name = Release; }; From d5ab9cb403e8752be66c75075a9afec7ffbe5410 Mon Sep 17 00:00:00 2001 From: Anthony Gelibert Date: Wed, 30 Dec 2020 16:56:16 +0100 Subject: [PATCH 21/23] Minor cleanings --- src/Common.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Common.m b/src/Common.m index 1b8290b..f8a6eb6 100644 --- a/src/Common.m +++ b/src/Common.m @@ -56,11 +56,11 @@ return targetCFS; } + NSData *colorizeURL(CFBundleRef bundle, CFURLRef url, int *status, int thumbnail) { NSData *output = NULL; CFURLRef rsrcDirURL = CFBundleCopyResourcesDirectoryURL(bundle); - //n8log(@"rsrcDirURL = %@", CFURLGetString(rsrcDirURL)); NSString *rsrcEsc = pathOfURL(rsrcDirURL); CFRelease(rsrcDirURL); n8log(@"url = %@", url); @@ -89,6 +89,7 @@ @"UTF-8", @"textEncoding", @"UTF-8", @"webkitTextEncoding", nil]]; + [env addEntriesFromDictionary:[defaults persistentDomainForName:myDomain]]; // Change hlTheme according to system's darkmode setting. From bf8ddb47e4d2afd4f7ed37779be459b89d3cc48c Mon Sep 17 00:00:00 2001 From: Andrew Udvare Date: Sun, 24 Jan 2021 07:47:11 -0500 Subject: [PATCH 22/23] Fix include path order; update readme --- QLColorCode.xcodeproj/project.pbxproj | 2 +- README.md | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj index db203f5..91aadb5 100644 --- a/QLColorCode.xcodeproj/project.pbxproj +++ b/QLColorCode.xcodeproj/project.pbxproj @@ -178,7 +178,7 @@ /* Begin PBXLegacyTarget section */ 26BAC9AB257CE89900486D28 /* highlight */ = { isa = PBXLegacyTarget; - buildArgumentsString = "-j9 cli LUA_LIBS=../../lua/liblua.a 'CXX_COMPILE=clang++ -Wall -O2 -std=c++11 -D_FILE_OFFSET_BITS=64 -c -I /opt/local/include -I /usr/local/include -I ./include -I ../../lua'"; + buildArgumentsString = "-j9 cli LUA_LIBS=../../lua/liblua.a 'CXX_COMPILE=clang++ -Wall -O2 -std=c++11 -D_FILE_OFFSET_BITS=64 -c -I ../../lua -I /opt/local/include -I /usr/local/include -I ./include'"; buildConfigurationList = 26BAC9AC257CE89900486D28 /* Build configuration list for PBXLegacyTarget "highlight" */; buildPhases = ( ); diff --git a/README.md b/README.md index c91ada3..dd96b57 100644 --- a/README.md +++ b/README.md @@ -15,10 +15,6 @@ Alternatively, if you use [Homebrew Cask](https://github.com/caskroom/homebrew-c **To build the project, you must have Boost headers on your system in `/opt/local/include` or `/usr/local/include`.** -Note that the build may fail if you have a version of `liblua.a` in a library -path such as `/usr/local/lib`. In that case, temporarily uninstall Lua using -the appropriate package manager. - ## Settings If you want to configure `QLColorCode`, there are several `defaults` commands that could be useful: From 18765d8f0dacc9d0b8f01b5e296004b06b974f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dar=C3=ADo=20Here=C3=B1=C3=BA?= Date: Wed, 7 Jul 2021 19:12:32 -0300 Subject: [PATCH 23/23] Minor proposal (line 54) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dd96b57..cf458e5 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ zSetting any extra command-line flags for Highlight (see below): defaults write org.n8gray.QLColorCode extraHLFlags '-l -W' -Here are some useful 'highlight' command-line flags (from the man page): +Here are some useful 'highlight' command-line flags (from the main page): -F, --reformat=