From 401067f63741d6c4d61ac9d2e9bcd613415ac184 Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Fri, 2 Jan 2015 22:57:20 +0100 Subject: [PATCH 1/4] Revert #1438: add file extensions with multiple segments --- lib/linguist/languages.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 921c7ed2..aeb44f97 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -419,7 +419,7 @@ CLIPS: CMake: extensions: - .cmake - - .in + - .cmake.in filenames: - CMakeLists.txt ace_mode: text @@ -503,10 +503,10 @@ Clojure: - .cl2 - .cljc - .cljs + - .cljs.hl - .cljscm - .cljx - .hic - - .hl filenames: - riemann.config @@ -1171,6 +1171,7 @@ HTML: extensions: - .html - .htm + - .html.hl - .st - .xht - .xhtml @@ -1196,7 +1197,8 @@ HTML+ERB: - erb extensions: - .erb - - .deface + - .erb.deface + - .html.erb.deface ace_mode: html_ruby HTML+PHP: @@ -1227,7 +1229,8 @@ Haml: type: markup extensions: - .haml - - .deface + - .haml.deface + - .html.haml.deface ace_mode: haml Handlebars: From 546d4163a90dd100d997a82c59bca24fbfff749c Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Sat, 3 Jan 2015 09:27:43 +0100 Subject: [PATCH 2/4] Remove unnecessary file extensions --- lib/linguist/languages.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index aeb44f97..d639ad8d 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1198,7 +1198,6 @@ HTML+ERB: extensions: - .erb - .erb.deface - - .html.erb.deface ace_mode: html_ruby HTML+PHP: @@ -1230,7 +1229,6 @@ Haml: extensions: - .haml - .haml.deface - - .html.haml.deface ace_mode: haml Handlebars: From fbe43b61d48f5a3207206631fbcf788d860b21d9 Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Sat, 3 Jan 2015 09:37:40 +0100 Subject: [PATCH 3/4] Sample file for .cmake.in --- samples/CMake/uninstall.cmake.in | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 samples/CMake/uninstall.cmake.in diff --git a/samples/CMake/uninstall.cmake.in b/samples/CMake/uninstall.cmake.in new file mode 100644 index 00000000..a5b7436f --- /dev/null +++ b/samples/CMake/uninstall.cmake.in @@ -0,0 +1,22 @@ +IF (NOT EXISTS "@PROJECT_BINARY_DIR@/install_manifest.txt") + MESSAGE (FATAL_ERROR "Cannot find install manifest: \"@PROJECT_BINARY_DIR@/install_manifest.txt\"") +ENDIF (NOT EXISTS "@PROJECT_BINARY_DIR@/install_manifest.txt") + +FILE (READ "@PROJECT_BINARY_DIR@/install_manifest.txt" files) +STRING (REGEX REPLACE "\n" ";" files "${files}") +FOREACH (file ${files}) + MESSAGE (STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"") + IF (EXISTS "$ENV{DESTDIR}${file}") + EXEC_PROGRAM ( + "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" + OUTPUT_VARIABLE rm_out + RETURN_VALUE rm_retval + ) + IF (NOT "${rm_retval}" STREQUAL 0) + MESSAGE (FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"") + ENDIF (NOT "${rm_retval}" STREQUAL 0) + ELSE (EXISTS "$ENV{DESTDIR}${file}") + MESSAGE (STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.") + ENDIF (EXISTS "$ENV{DESTDIR}${file}") +ENDFOREACH (file) + From 2f86bd8bda1aaaf7dc587439686589bb30267299 Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Sat, 3 Jan 2015 09:37:50 +0100 Subject: [PATCH 4/4] Sample file for .html.hl --- samples/HTML/index.html.hl | 328 +++++++++++++++++++++++++++++++++++++ 1 file changed, 328 insertions(+) create mode 100644 samples/HTML/index.html.hl diff --git a/samples/HTML/index.html.hl b/samples/HTML/index.html.hl new file mode 100644 index 00000000..65491957 --- /dev/null +++ b/samples/HTML/index.html.hl @@ -0,0 +1,328 @@ + + + + + + + + +
+

Example 1

+ + + + + +
+ + +
+ +

~{x}

+ +
+
+
+ + +
+

Example 2

+ + + + + +
+ + +
+ +

~{x}

+ +
+
+
+ + +
+

Example 3

+ + + + + +
+ + + +
+ +

~{x}

+ +
+
+
+ + +
+

Example 4

+ + + + + +
+ + +
+
+
+ + +
+

Example 5

+ + + + + +
+ + +
+
+
+ + +
+

Example 6

+ + + + + +
+ + +
+
+ +

~{x}

+ +
+
+
+
+ + +
+

Example 7

+ + + + + +
+ + +
+
+ +

~{x}

+ +
+
+
+
+ + +
+

Example 8

+ + + + + +
+ + +
+
+ +

~{x}

+ +
+
+
+
+ + +
+

Example 9

+ + + + + +
+ + +
+
+ + +
+

Example 10

+ + + + + +
+ + + +
+
+ +