Skip to content

Commit d462723

Browse files
author
jef
committed
update astyle-all.sh
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12481 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 6d0b492 commit d462723

File tree

1 file changed

+13
-17
lines changed

1 file changed

+13
-17
lines changed

scripts/astyle-all.sh

+13-17
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,20 @@ export elcr="$(tput el)$(tput cr)"
88

99
find src -type f -print | while read f; do
1010
case "$f" in
11+
src/core/spatialite/*)
12+
continue
13+
;;
14+
15+
1116
*.cpp|*.h|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H)
17+
cmd=astyle.sh
1218
;;
1319

20+
*.ui|*.qgm|*.txt|*.t2t|*.py|*.sip|resources/context_help/*)
21+
cmd="flip -ub"
22+
;;
23+
24+
1425
*)
1526
continue
1627
;;
@@ -26,23 +37,8 @@ find src -type f -print | while read f; do
2637
touch -r "$f" "$f.astyle"
2738
fi
2839

29-
echo -ne "Reformating $f$elcr"
30-
astyle.sh "$f"
40+
echo -ne "Reformating $f $elcr"
41+
$cmd "$f"
3142
done
3243

3344
echo
34-
35-
# convert CRLF to LF
36-
find .. -type f \
37-
! -path "*/.svn/*" \
38-
! -path "*/win_build/*" \
39-
! -name "*.def" \
40-
! -name "*.rc" \
41-
! -name "*.png" \
42-
-exec file {} \; |
43-
grep CRLF |
44-
cut -d: -f1 |
45-
while read f; do
46-
echo -ne "Flipping $f$elcr"
47-
flip -ub "$f"
48-
done

0 commit comments

Comments
 (0)