[Libphidget-cvs-commits] CVS: libphidget indent.defs,1.1,1.2 Makefile.am,1.6,1.7 indent.rules,1.1,1.2

[Vadim T. <vt...@us...>]

Update of /cvsroot/libphidget/libphidget
In directory usw-pr-cvs1:/tmp/cvs-serv4358

Modified Files:
	Makefile.am indent.rules 
Added Files:
	indent.defs 
Log Message:
Merged back the results of INDENT branch changes



Index: Makefile.am
===================================================================
RCS file: /cvsroot/libphidget/libphidget/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.am	9 Sep 2002 22:57:32 -0000	1.6
--- Makefile.am	12 Sep 2002 00:24:28 -0000	1.7
***************
*** 16,21 ****
  
  	@ for FILE in `@FIND@ . -name "*.h" -o -name "*.c" -o -name "*.cc"` ; do \
! 	    @INDENT@ --ignore-profile --standard-output `@CAT@ ./indent.rules` $$FILE > $$FILE.indent; \
  	    if @TEST@ -n "`@DIFF@ $$FILE $$FILE.indent`" ; then \
  	        @MV@ $$FILE.indent $$FILE; \
  	    else \
--- 16,26 ----
  
  	@ for FILE in `@FIND@ . -name "*.h" -o -name "*.c" -o -name "*.cc"` ; do \
! 	    @INDENT@ --ignore-profile --standard-output `@CAT@ ./indent.rules` `@CAT@ ./indent.defs` $$FILE > $$FILE.indent; \
  	    if @TEST@ -n "`@DIFF@ $$FILE $$FILE.indent`" ; then \
+ 	        if @TEST@ ! -s $$FILE.indent ; then \
+ 	            @ECHO@ "@INDENT@ run resulted in an empty file: $$FILE.indent; most probably the options in ./indent.rules are wrong"; \
+ 	            @RM@ $$FILE.indent; \
+ 	            exit 1; \
+ 	        fi; \
  	        @MV@ $$FILE.indent $$FILE; \
  	    else \
***************
*** 32,37 ****
  
  	@ for FILE in `@FIND@ . -name "*.h" -o -name "*.c" -o -name "*.cc"` ; do \
! 	    @INDENT@ --standard-output $$FILE > $$FILE.indent; \
  	    if @TEST@ -n "`@DIFF@ $$FILE $$FILE.indent`" ; then \
  	        @MV@ $$FILE.indent $$FILE; \
  	    else \
--- 37,47 ----
  
  	@ for FILE in `@FIND@ . -name "*.h" -o -name "*.c" -o -name "*.cc"` ; do \
! 	    @INDENT@ --standard-output `@CAT@ ./indent.defs` $$FILE > $$FILE.indent; \
  	    if @TEST@ -n "`@DIFF@ $$FILE $$FILE.indent`" ; then \
+ 	        if @TEST@ ! -s $$FILE.indent ; then \
+ 	            @ECHO@ "@INDENT@ run resulted in an empty file: $$FILE.indent; most probably the options in ./indent.rules are wrong"; \
+ 	            @RM@ $$FILE.indent; \
+ 	            exit 1; \
+ 	        fi; \
  	        @MV@ $$FILE.indent $$FILE; \
  	    else \

Index: indent.rules
===================================================================
RCS file: /cvsroot/libphidget/libphidget/indent.rules,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** indent.rules	8 Sep 2002 04:24:31 -0000	1.1
--- indent.rules	12 Sep 2002 00:24:28 -0000	1.2
***************
*** 1 ****
! --gnu-style
--- 1,24 ----
! --no-blank-lines-after-declarations
! --blank-lines-after-procedures
! --no-blank-lines-after-commas
! --break-before-boolean-operator
! --braces-on-if-line
! --brace-indent4
! --braces-after-struct-decl-line
! --no-comment-delimiters-on-blank-lines
! --cuddle-else
! --else-endif-column1
! --space-after-cast
! --declaration-indentation4
! --dont-format-first-column-comments
! --dont-format-comments
! --honour-newlines
! --indent-level4
! --parameter-indentation5
! --continue-at-parentheses
! --no-space-after-function-call-names
! --no-space-after-parentheses
! --procnames-start-lines
! --dont-star-comments
! --leave-optional-blank-lines
! --line-length128