From: <z-...@us...> - 2008-01-28 19:09:50
|
Revision: 7683 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7683&view=rev Author: z-man Date: 2008-01-28 11:09:54 -0800 (Mon, 28 Jan 2008) Log Message: ----------- Disabling astyle for now. More trouble than it is worth with its changed default behavior. Modified Paths: -------------- armagetronad/branches/0.2.8/armagetronad/Makefile.manual armagetronad/branches/0.2.8/armagetronad/batch/make/beautify armagetronad/branches/0.2.8/armagetronad/config/astylerc Modified: armagetronad/branches/0.2.8/armagetronad/Makefile.manual =================================================================== --- armagetronad/branches/0.2.8/armagetronad/Makefile.manual 2008-01-28 18:21:22 UTC (rev 7682) +++ armagetronad/branches/0.2.8/armagetronad/Makefile.manual 2008-01-28 19:09:54 UTC (rev 7683) @@ -6,20 +6,20 @@ # use this target if you're OK with the project's defaults and # want updated file timestamps rebeautify: - ARTISTIC_STYLE_OPTIONS=$(srcdir)/config/astylerc sh $(srcdir)/batch/make/beautify -t $(srcdir) .beautytag.re +# ARTISTIC_STYLE_OPTIONS=$(srcdir)/config/astylerc sh $(srcdir)/batch/make/beautify -t $(srcdir) .beautytag.re # use this target if you want to switch between your settings # (beautify-personal) and the project defaults to get back to # the defaults (timestamps stay untouched) beautify: rm -f $(srcdir)/.beautytag.personal - ARTISTIC_STYLE_OPTIONS=$(srcdir)/config/astylerc sh $(srcdir)/batch/make/beautify $(srcdir) .beautytag +# ARTISTIC_STYLE_OPTIONS=$(srcdir)/config/astylerc sh $(srcdir)/batch/make/beautify $(srcdir) .beautytag # use this target to run astyle with your personal settings for # it (but remember to do "make beautify" before comitting to Subversion!) beautify-personal: rm -f $(srcdir)/.beautytag $(srcdir)/.beautytag.re - ARTISTIC_STYLE_OPTIONS=~/.astylerc sh $(srcdir)/batch/make/beautify $(srcdir) .beautytag.personal +# ARTISTIC_STYLE_OPTIONS=~/.astylerc sh $(srcdir)/batch/make/beautify $(srcdir) .beautytag.personal ########## # Checks # Modified: armagetronad/branches/0.2.8/armagetronad/batch/make/beautify =================================================================== --- armagetronad/branches/0.2.8/armagetronad/batch/make/beautify 2008-01-28 18:21:22 UTC (rev 7682) +++ armagetronad/branches/0.2.8/armagetronad/batch/make/beautify 2008-01-28 19:09:54 UTC (rev 7683) @@ -11,7 +11,7 @@ SRCDIR="$1" shift -if test "$SRCDIR" == "-t"; then +if test "$SRCDIR" = "-t"; then TOUCH=true SRCDIR="$1" shift Modified: armagetronad/branches/0.2.8/armagetronad/config/astylerc =================================================================== --- armagetronad/branches/0.2.8/armagetronad/config/astylerc 2008-01-28 18:21:22 UTC (rev 7682) +++ armagetronad/branches/0.2.8/armagetronad/config/astylerc 2008-01-28 19:09:54 UTC (rev 7683) @@ -1,2 +1,9 @@ # artistic style configuration: just use defaults mode=c + +# humm, the defaults for those changed recently. +# better keep them around, they cause huge pointless +# changes we don't want as long as there are changes +# from 0.2.8 to merge. + +one-line=keep-blocks This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |