From 890019405022a105cdf46dbed72aa9efd447b646 Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Thu, 19 Mar 2015 14:50:31 -0700 Subject: [PATCH 1/2] Remove Textmate bundle from contrib this now lives at https://github.com/JuliaLang/Julia.tmbundle --- contrib/Julia.tmbundle/.gitignore | 1 - .../Preferences/Comments.tmPreferences | 52 -- .../Julia.tmbundle/Syntaxes/Julia.tmLanguage | 560 ------------------ contrib/Julia.tmbundle/info.plist | 21 - contrib/README.md | 2 - contrib/install-tmbundle | 2 - 6 files changed, 638 deletions(-) delete mode 100644 contrib/Julia.tmbundle/.gitignore delete mode 100644 contrib/Julia.tmbundle/Preferences/Comments.tmPreferences delete mode 100644 contrib/Julia.tmbundle/Syntaxes/Julia.tmLanguage delete mode 100644 contrib/Julia.tmbundle/info.plist delete mode 100755 contrib/install-tmbundle diff --git a/contrib/Julia.tmbundle/.gitignore b/contrib/Julia.tmbundle/.gitignore deleted file mode 100644 index c3ed10e928961..0000000000000 --- a/contrib/Julia.tmbundle/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.cache diff --git a/contrib/Julia.tmbundle/Preferences/Comments.tmPreferences b/contrib/Julia.tmbundle/Preferences/Comments.tmPreferences deleted file mode 100644 index c7b376902bd32..0000000000000 --- a/contrib/Julia.tmbundle/Preferences/Comments.tmPreferences +++ /dev/null @@ -1,52 +0,0 @@ - - - - - name - Comments - scope - source.julia - settings - - decreaseIndentPattern - ^\s*((end|else|elseif|catch|finally)\b) - increaseIndentPattern - (^\s*(if|while|for|function|macro|immutable|type|let|else|elseif|quote|try|catch|finally)\b.*\s*$)|(^.*\b(do|begin)\b\s*$) - shellVariables - - - name - TM_COMMENT_START - value - # - - - name - TM_COMMENT_START_2 - value - #= - - - name - TM_COMMENT_END_2 - value - =# - - - name - TM_COMMENT_DISABLE_INDENT_2 - value - yes - - - name - TM_COMMENT_MODE_2 - value - block - - - - uuid - EA84B6B5-9953-4662-826D-D9068B37C7F6 - - diff --git a/contrib/Julia.tmbundle/Syntaxes/Julia.tmLanguage b/contrib/Julia.tmbundle/Syntaxes/Julia.tmLanguage deleted file mode 100644 index e0ca3493aef9e..0000000000000 --- a/contrib/Julia.tmbundle/Syntaxes/Julia.tmLanguage +++ /dev/null @@ -1,560 +0,0 @@ - - - - - - fileTypes - - jl - - firstLineMatch - ^#!.*\bjulia\s*$ - foldingStartMarker - ^\s*(?:if|while|for|begin|function|macro|module|baremodule|type|immutable|let)\b(?!.*\bend\b).*$ - foldingStopMarker - ^\s*(?:end)\b.*$ - name - Julia - patterns - - - include - #operator - - - include - #array - - - include - #string - - - include - #bracket - - - include - #function_decl - - - include - #function_call - - - include - #keyword - - - include - #number - - - include - #comment - - - repository - - array - - patterns - - - begin - \[ - end - \]((\.)?'*) - endCaptures - - 1 - - name - keyword.operator.transpose.julia - - - name - array.julia - patterns - - - match - \bend\b - name - constant.numeric.julia - - - include - $self - - - - - - bracket - - patterns - - - match - (?:\(|\)|\[|\]|\{|\}|,)(?!('|(?:\.'))*\.?') - name - bracket.julia - - - - comment - - patterns - - - begin - #= - beginCaptures - - 0 - - name - punctuation.definition.comment.begin.julia - - - end - =# - endCaptures - - 0 - - name - punctuation.definition.comment.end.julia - - - name - comment.block.number-sign-equals.julia - - - captures - - 1 - - name - punctuation.definition.comment.julia - - - match - (?<!\$)(#)(?!\{).*$\n? - name - comment.line.number-sign.julia - - - - function_call - - patterns - - - begin - ([a-zA-Z0-9_]+!?)\w*\( - beginCaptures - - 1 - - name - support.function.julia - - - end - \)(('|(\.'))*\.?')? - endCaptures - - 1 - - name - keyword.operator.transposed-func.julia - - - patterns - - - include - $self - - - - - - function_decl - - patterns - - - match - ^\s*([a-zA-Z0-9\._]+!?)(?=.*\)\s*=(?!=)) - captures - - 1 - - name - entity.name.function.julia - - - - - match - \b(function|macro)\s+([a-zA-Z0-9_\.]+!?)\b - captures - - 1 - - name - keyword.other.julia - - 2 - - name - entity.name.function.julia - - - - - - keyword - - patterns - - - match - \b(?:function|type|immutable|macro|quote|abstract|bitstype|typealias|module|baremodule|new)\b - name - keyword.other.julia - - - match - \b(?:if|else|elseif|while|for|in|begin|let|end|do|try|catch|finally|return|break|continue)\b - name - keyword.control.julia - - - match - \b(?:global|local|const|export|import|importall|using)\b - name - storage.modifier.variable.julia - - - match - @\w+\b - name - support.function.macro.julia - - - - number - - patterns - - - match - ((\b0(x|X)[0-9a-fA-F](_?[0-9a-fA-F])*)|(\b0o[0-7](_?[0-7])*)|(\b0b[0-1](_?[0-1])*)|((\b[0-9](_?[0-9])*\.?(_?[0-9]*))|(\.[0-9](_?[0-9])*))((e|E)(\+|-)?(_?[0-9])*)?(im)?|\bInf(32)?\b|\bNaN(32)?\b) - name - constant.numeric.julia - - - match - \btrue\b|\bfalse\b|\bnothing\b - name - constant.language.julia - - - - operator - - patterns - - - match - (?:=|:=|\+=|-=|\*=|/=|//=|\.//=|\.\*=|\\=|\.\\=|^=|\.^=|%=|\|=|&=|\$=|<<=|>>=) - name - keyword.operator.update.julia - - - match - (?:\?|:) - name - keyword.operator.ternary.julia - - - match - (?:\|\||&&|!) - name - keyword.operator.boolean.julia - - - match - (?:->|<-|-->) - name - keyword.operator.arrow.julia - - - match - (?:>|<|>=|<=|==|!=|\.>|\.<|\.>=|\.>=|\.==|\.!=|\.=|\.!|<:|:>) - name - keyword.operator.relation.julia - - - match - (?::) - name - keyword.operator.range.julia - - - match - (?:<<|>>) - name - keyword.operator.shift.julia - - - match - (?:\||\&|~) - name - keyword.operator.bitwise.julia - - - match - (?:\+|-|\*|\.\*|/|\./|//|\.//|%|\.%|\\|\.\\|\^|\.\^) - name - keyword.operator.arithmetic.julia - - - match - (?:::) - name - keyword.operator.isa.julia - - - match - (?:\.(?=[a-zA-Z])|\.\.+) - name - keyword.operator.dots.julia - - - match - (?:\$(?=.+)) - name - keyword.operator.interpolation.julia - - - captures - - 2 - - name - keyword.operator.transposed-variable.julia - - - match - (\w+)(('|(\.'))*\.?') - - - captures - - 1 - - name - keyword.bracket.end.julia - - 2 - - name - keyword.operator.transposed-matrix.julia - - - match - (\])((?:'|(?:\.'))*\.?') - - - captures - - 1 - - name - keyword.bracket.end.julia - - 2 - - name - keyword.operator.transposed-parens.julia - - - match - (\))((?:'|(?:\.'))*\.?') - - - - string - - patterns - - - match - (?<![a-zA-Z0-9:<]:)(?<=:)[a-zA-Z_][a-zA-Z0-9_]*\b - name - string.quoted.symbol.julia - - - begin - ' - beginCaptures - - 0 - - name - punctuation.definition.string.begin.julia - - - end - ' - endCaptures - - 0 - - name - punctuation.definition.string.end.julia - - - name - string.quoted.single.julia - patterns - - - include - #string_escaped_char - - - - - begin - " - beginCaptures - - 0 - - name - punctuation.definition.string.begin.julia - - - end - " - endCaptures - - 0 - - name - punctuation.definition.string.end.julia - - - name - string.quoted.double.julia - patterns - - - include - #string_escaped_char - - - - - begin - \b\w+" - beginCaptures - - 0 - - name - punctuation.definition.string.begin.julia - - - end - "\w* - endCaptures - - 0 - - name - punctuation.definition.string.end.julia - - - name - string.quoted.custom-double.julia - patterns - - - include - #string_custom_escaped_char - - - - - begin - ` - beginCaptures - - 0 - - name - punctuation.definition.string.begin.julia - - - end - ` - endCaptures - - 0 - - name - punctuation.definition.string.end.julia - - - name - string.quoted.backtick.julia - patterns - - - include - #string_escaped_char - - - - - - string_custom_escaped_char - - patterns - - - match - \\" - name - constant.character.escape.julia - - - - string_escaped_char - - patterns - - - match - \\(\\|[0-3]\d{,2}|[4-7]\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8}|.) - name - constant.character.escape.julia - - - - - scopeName - source.julia - uuid - F5D95417-DF9F-48AD-92DF-21CE62F7C31B - - diff --git a/contrib/Julia.tmbundle/info.plist b/contrib/Julia.tmbundle/info.plist deleted file mode 100644 index 779b9809c0842..0000000000000 --- a/contrib/Julia.tmbundle/info.plist +++ /dev/null @@ -1,21 +0,0 @@ - - - - - contactEmailRot13 - fgrsna.xnecvafxv@cbfg.uneineq.rqh - contactName - Stefan Karpinski - description - The Julia Mathematical Computing Language - name - Julia - ordering - - F5D95417-DF9F-48AD-92DF-21CE62F7C31B - EA84B6B5-9953-4662-826D-D9068B37C7F6 - - uuid - F123BC73-9B19-4E03-847E-D7E47D1931A3 - - diff --git a/contrib/README.md b/contrib/README.md index e3719f9b7121e..af871484736f0 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -29,12 +29,10 @@ Editors + Debuggers |[ ctags ](https://github.com/JuliaLang/julia/blob/master/contrib/ctags) | Add more keywords to ctags regex search tool | |[ debug_bootstrap.gdb ](https://github.com/JuliaLang/julia/blob/master/contrib/debug_bootstrap.gdb) | bootstrap process using the debug build | |[ filterArgs.sh ](https://github.com/JuliaLang/julia/blob/master/contrib/filterArgs.sh) | Update library search code to use only tokens that start with -L | -|[ install-tmbundle ](https://github.com/JuliaLang/julia/blob/master/contrib/install-tmbundle) | TextMate bundle install script | |[ julia.hrc ](https://github.com/JuliaLang/julia/blob/master/contrib/julia.hrc) | Julia syntax highlighting definition for Colorer | |[ julia.lang ](https://github.com/JuliaLang/julia/blob/master/contrib/julia.lang) | GtkSourceView (GTK+ framework) for multiline text editing config file | |[ julia-mode.el ](https://github.com/JuliaLang/julia/blob/master/contrib/julia-mode.el) | Emacs Julia mode config file | |[ Julia_Notepad++.xml ](https://github.com/JuliaLang/julia/blob/master/contrib/Julia_Notepad++.xml) | Notepad++ config file | -|[ Julia.tmbundle/ ](https://github.com/JuliaLang/julia/blob/master/contrib/Julia.tmbundle/) | TextMate support files | |[ julia.xml ](https://github.com/JuliaLang/julia/blob/master/contrib/julia.xml) | KDE editors Kate and Kwrite config file | |[ Notepad++_2_Julia.ahk ](https://github.com/JuliaLang/julia/blob/master/contrib/Notepad++_2_Julia.ahk) | Auto Hotkey for Notepad++ config file | |[ README.ackrc.txt ](https://github.com/JuliaLang/julia/blob/master/contrib/README.ackrc.txt) | README for ackrc config file | diff --git a/contrib/install-tmbundle b/contrib/install-tmbundle deleted file mode 100755 index 76430a1a9ebbb..0000000000000 --- a/contrib/install-tmbundle +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -cp -r Julia.tmbundle ~/Library/Application\ Support/TextMate/Bundles From 351c043b70061ed84e10d9d2a2503ff1b653d297 Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Thu, 19 Mar 2015 14:51:36 -0700 Subject: [PATCH 2/2] remove filterDupLibs.sh, does not appear to be used any more --- contrib/README.md | 1 - contrib/filterDupLibs.sh | 17 ----------------- 2 files changed, 18 deletions(-) delete mode 100755 contrib/filterDupLibs.sh diff --git a/contrib/README.md b/contrib/README.md index af871484736f0..e6ebe13554168 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -6,7 +6,6 @@ Installation |[ build_executable.jl ](https://github.com/JuliaLang/julia/blob/master/contrib/build_executable.jl) | Support building standalone executables | |[ build_sysimg.jl ](https://github.com/JuliaLang/julia/blob/master/contrib/build_sysimg.jl) | Build a system image binary | |[ check-whitespace.sh ](https://github.com/JuliaLang/julia/blob/master/contrib/check-whitespace.sh) | Check for trailing white space | -|[ filterDupLibs.sh ](https://github.com/JuliaLang/julia/blob/master/contrib/filterDupLibs.sh) | script to filter out duplicate libraries | |[ fixup-libgfortran.sh ](https://github.com/JuliaLang/julia/blob/master/contrib/fixup-libgfortran.sh) | Include libgfortran and libquadmath for installations | |[ fixup-libstdc++.sh ](https://github.com/JuliaLang/julia/blob/master/contrib/fixup-libstdc++.sh) | Include libstdc++ for installations | |[ install.sh ](https://github.com/JuliaLang/julia/blob/master/contrib/install.sh) | installation script with different permissions | diff --git a/contrib/filterDupLibs.sh b/contrib/filterDupLibs.sh deleted file mode 100755 index a0367f3dd3318..0000000000000 --- a/contrib/filterDupLibs.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -libnames="" -libpaths="" - -# Loop over all command line arguments -for i in "$@"; do - # Get basename of this argument, check if it is already in libnames - name=$(basename "$i") - - if [[ -z $(echo $libnames | grep "$name") ]]; then - libnames+="$name " - libpaths+="$i " - fi -done - -echo $libpaths