Skip to content

Commit c4c9c4e

Browse files
n8grayn8gray
committed
Add support for more langs and fix x86_64 build.
1 parent 203cb0c commit c4c9c4e

4 files changed

Lines changed: 59 additions & 29 deletions

File tree

‎ChangeLog.txt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
2.0:
2-
* Upgrade to highlight 2.12 -- This was long overdue. It's nice not to
3-
have to patch highlight anymore!
2+
* Added a note about conflict with Xcode 3.2's source code QL plugin. If
3+
you're having problems with QLCC on Snow Leopard please read it!
4+
* Fixed a bug that caused QLCC to fail on files whose names contained '%'.
5+
* Added support for Scala, Groovy, Interactive Data Language, and Coldfusion
6+
* Upgrade highlight from 2.6.6 to 2.12 -- This was long overdue. It's nice
7+
not to have to patch highlight anymore!
48
* Removed customized .css language definition -- it was fixed upstream.
59
* Build for x86_64 in addition to i386 and ppc
6-
* Added support for Groovy,
710

811
1.1:
912
* Enabled "safe" plain-text handling. In other words, files like foo.txt

‎Info.plist‎

Lines changed: 49 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -570,25 +570,59 @@
570570
</array>
571571
</dict>
572572
</dict>
573-
574-
<dict>
575-
<key>UTTypeConformsTo</key>
576-
<array>
577-
<string>public.source-code</string>
578-
</array>
579-
<key>UTTypeDescription</key>
580-
<string>Groovy Source Code</string>
581-
<key>UTTypeIdentifier</key>
582-
<string>org.codehaus.groovy-source</string>
583-
<key>UTTypeTagSpecification</key>
584573
<dict>
585-
<key>public.filename-extension</key>
574+
<key>UTTypeConformsTo</key>
586575
<array>
587-
<string>groovy</string>
576+
<string>public.source-code</string>
588577
</array>
578+
<key>UTTypeDescription</key>
579+
<string>Groovy Source Code</string>
580+
<key>UTTypeIdentifier</key>
581+
<string>org.codehaus.groovy-source</string>
582+
<key>UTTypeTagSpecification</key>
583+
<dict>
584+
<key>public.filename-extension</key>
585+
<array>
586+
<string>groovy</string>
587+
</array>
588+
</dict>
589+
</dict>
590+
<dict>
591+
<key>UTTypeConformsTo</key>
592+
<array>
593+
<string>public.source-code</string>
594+
</array>
595+
<key>UTTypeDescription</key>
596+
<string>Scala Source Code</string>
597+
<key>UTTypeIdentifier</key>
598+
<string>org.scala-lang.scala</string>
599+
<key>UTTypeTagSpecification</key>
600+
<dict>
601+
<key>public.filename-extension</key>
602+
<array>
603+
<string>scala</string>
604+
</array>
605+
</dict>
606+
</dict>
607+
<dict>
608+
<key>UTTypeConformsTo</key>
609+
<array>
610+
<string>public.source-code</string>
611+
</array>
612+
<key>UTTypeDescription</key>
613+
<string>Coldfusion Source Code</string>
614+
<key>UTTypeIdentifier</key>
615+
<string>com.adobe.coldfusion</string>
616+
<key>UTTypeTagSpecification</key>
617+
<dict>
618+
<key>public.filename-extension</key>
619+
<array>
620+
<string>cfc</string>
621+
<string>cfm</string>
622+
<string>cfml</string>
623+
</array>
624+
</dict>
589625
</dict>
590-
</dict>
591-
592626
</array>
593627
</dict>
594628
</plist>

‎QLColorCode.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
0E913A110D10B84D0067BAD6 /* Copy .conf Files */,
245245
0E9139D70D10A8320067BAD6 /* Install highlight */,
246246
0ECBBA6F0CFCA39E00416538 /* Copy to Library */,
247-
0E1280381061C3EA0078EC05 /* Reset qlmanage */,
247+
0E1280381061C3EA0078EC05 /* Reset quicklookd */,
248248
);
249249
buildRules = (
250250
);
@@ -300,14 +300,14 @@
300300
shellPath = "/bin/zsh -x";
301301
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";
302302
};
303-
0E1280381061C3EA0078EC05 /* Reset qlmanage */ = {
303+
0E1280381061C3EA0078EC05 /* Reset quicklookd */ = {
304304
isa = PBXShellScriptBuildPhase;
305305
buildActionMask = 2147483647;
306306
files = (
307307
);
308308
inputPaths = (
309309
);
310-
name = "Reset qlmanage";
310+
name = "Reset quicklookd";
311311
outputPaths = (
312312
);
313313
runOnlyForDeploymentPostprocessing = 0;
@@ -397,14 +397,12 @@
397397
);
398398
GCC_DYNAMIC_NO_PIC = NO;
399399
GCC_ENABLE_FIX_AND_CONTINUE = YES;
400-
GCC_MODEL_TUNING = G5;
401400
GCC_OPTIMIZATION_LEVEL = 0;
402401
GCC_PRECOMPILE_PREFIX_HEADER = NO;
403402
INFOPLIST_FILE = Info.plist;
404403
INSTALL_PATH = /Library/QuickLook;
405404
OTHER_CFLAGS = "-DDEBUG";
406405
PRODUCT_NAME = QLColorCode;
407-
VALID_ARCHS = "i386 ppc";
408406
WRAPPER_EXTENSION = qlgenerator;
409407
ZERO_LINK = YES;
410408
};
@@ -418,12 +416,10 @@
418416
"$(inherited)",
419417
"\"$(DEVELOPER_DIR)/SDKs/MacOSX10.5.sdk/System/Library/Frameworks\"",
420418
);
421-
GCC_MODEL_TUNING = G5;
422419
GCC_PRECOMPILE_PREFIX_HEADER = NO;
423420
INFOPLIST_FILE = Info.plist;
424421
INSTALL_PATH = /Library/QuickLook;
425422
PRODUCT_NAME = QLColorCode;
426-
VALID_ARCHS = "i386 ppc";
427423
WRAPPER_EXTENSION = qlgenerator;
428424
};
429425
name = Release;
@@ -444,9 +440,9 @@
444440
isa = XCBuildConfiguration;
445441
buildSettings = {
446442
ARCHS = (
447-
x86_64,
448443
ppc,
449444
i386,
445+
x86_64,
450446
);
451447
CURRENT_PROJECT_VERSION = 2.0.0;
452448
GCC_WARN_ABOUT_RETURN_TYPE = YES;

‎ReadMe.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ To build from source, you need the Highlight library. Download the source and
8787
uncompress it somewhere, then make a symbolic link to that location from
8888
./highlight
8989

90-
You'll also need to apply the relevant patch-highlight-*.diff patches.
91-
After that you should be able to build as usual from Xcode.
92-
9390
As an aside, by changing colorize.sh you can use this plugin to render any file
9491
type that you can convert to HTML. Have fun, and let me know if you do anything
9592
cool!

0 commit comments

Comments
 (0)