summaryrefslogtreecommitdiffstats
path: root/git_hooks
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>2012-05-23 15:26:22 +0200
committerVincent COUVERT <vincent.couvert@scilab.org>2012-05-23 16:57:21 +0200
commitc00e792cc84620da04e1440edf335f5e5af54af5 (patch)
tree586f1b4d727fa3c9d1cce46476e2e349b37bc044 /git_hooks
parent377813e6945fac2b665eb3cbb63b7c2115121296 (diff)
downloadscilab-c00e792cc84620da04e1440edf335f5e5af54af5.zip
scilab-c00e792cc84620da04e1440edf335f5e5af54af5.tar.gz
* Disable the warning caused by jflex code
* scinotes jflex moved in src/java to match the configuration of helptools * ignore jflex files for the indentation Change-Id: I993e8c17b54224922b5c344d2eee2e5e9835e469
Diffstat (limited to 'git_hooks')
-rwxr-xr-xgit_hooks/pre-commit10
1 files changed, 10 insertions, 0 deletions
diff --git a/git_hooks/pre-commit b/git_hooks/pre-commit
index 6776f15..49cb9b7 100755
--- a/git_hooks/pre-commit
+++ b/git_hooks/pre-commit
@@ -67,6 +67,16 @@ then
67 echo " git config --add astyle.ignored 'scilab/modules/*/src/jni/*.c' " 67 echo " git config --add astyle.ignored 'scilab/modules/*/src/jni/*.c' "
68 echo " git config --add astyle.ignored 'scilab/modules/javasci/src/java/org/scilab/modules/javasci/Call_Scilab*.java' " 68 echo " git config --add astyle.ignored 'scilab/modules/javasci/src/java/org/scilab/modules/javasci/Call_Scilab*.java' "
69 echo " git config --add astyle.ignored 'scilab/modules/renderer/src/java/org/scilab/modules/renderer/FigureScilabCall*.java' " 69 echo " git config --add astyle.ignored 'scilab/modules/renderer/src/java/org/scilab/modules/renderer/FigureScilabCall*.java' "
70 echo " git config --add astyle.ignored 'scilab/modules/helptools/src/java/org/scilab/modules/helptools/SynopsisLexer.java' "
71 echo " git config --add astyle.ignored 'scilab/modules/helptools/src/java/org/scilab/modules/helptools/XML/XMLLexer.java' "
72 echo " git config --add astyle.ignored 'scilab/modules/helptools/src/java/org/scilab/modules/helptools/c/CLexer.java' "
73 echo " git config --add astyle.ignored 'scilab/modules/helptools/src/java/org/scilab/modules/helptools/java/JavaLexer.java' "
74 echo " git config --add astyle.ignored 'scilab/modules/helptools/src/java/org/scilab/modules/helptools/scilab/ScilabLexer.java' "
75 echo " git config --add astyle.ignored 'scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/FunctionScanner.java' "
76 echo " git config --add astyle.ignored 'scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/IndentScanner.java' "
77 echo " git config --add astyle.ignored 'scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/MatchingBlockScanner.java' "
78 echo " git config --add astyle.ignored 'scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabLexer.java' "
79
70 echo 80 echo
71 81
72 ASTYLE_IGNORED="" 82 ASTYLE_IGNORED=""