From: bdemsky <bdemsky>
Date: Mon, 18 Aug 2008 20:40:24 +0000 (+0000)
Subject: files
X-Git-Tag: buildscript^4~12
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e5785a6da10e47864aed10f0f3a425b88eb0ede1;p=IRC.git

files
---

diff --git a/Robust/src/Makefile b/Robust/src/Makefile
index 03fd6e95..91de7309 100644
--- a/Robust/src/Makefile
+++ b/Robust/src/Makefile
@@ -122,7 +122,8 @@ JAVAFILES=IR/*.java \
 	Util/*.java \
 	ClassLibrary/*.java \
 	ClassLibrary/gnu/*.java \
-	Interface/*.java
+	Interface/*.java \
+	Lex/*.java
 
 CFILES=Runtime/*.c \
 	Runtime/*.h \
@@ -147,8 +148,8 @@ Parse/Parser.java Parse/Sym.java: Parse/java14.cup
 	javac -cp ../cup:.:$(CLASSPATH) $<
 
 tabbing: 
-	uncrustify -c standard.cfg --no-backup $(JAVAFILES)
-	uncrustify -c standard.cfg --no-backup $(CFILES)
+	uncrustify -c java.cfg --no-backup $(JAVAFILES)
+	uncrustify -c c.cfg --no-backup $(CFILES)
 
 commit: tabbing
 	cvs commit .
@@ -157,8 +158,8 @@ update:	tabbing
 	cvs update -d .
 
 mytabbing:
-	uncrustify -c my.cfg --no-backup $(JAVAFILES)
-	uncrustify -c my.cfg --no-backup $(CFILES)
+	uncrustify -c myjava.cfg --no-backup $(JAVAFILES)
+	uncrustify -c myc.cfg --no-backup $(CFILES)
 
 javadoc:
 	mkdir javadoc
diff --git a/Robust/src/c.cfg b/Robust/src/c.cfg
new file mode 100644
index 00000000..a3fa1677
--- /dev/null
+++ b/Robust/src/c.cfg
@@ -0,0 +1,19 @@
+indent_columns = 2
+nl_if_brace = Remove
+nl_brace_else = Remove
+nl_elseif_brace = Remove
+nl_struct_brace = Remove
+nl_union_brace = Remove
+nl_fcall_brace = Remove
+nl_fdef_brace = Remove
+nl_while_brace = Remove
+nl_do_brace = Remove
+nl_brace_while = Remove
+nl_switch_brace = Remove
+nl_before_case = True
+sp_func_proto_paren = Remove
+sp_func_def_paren = Remove
+sp_inside_fparens = remove
+sp_inside_fparen = remove
+sp_func_call_paren = Remove
+sp_fparen_brace = Add
\ No newline at end of file
diff --git a/Robust/src/java.cfg b/Robust/src/java.cfg
new file mode 100644
index 00000000..7f851242
--- /dev/null
+++ b/Robust/src/java.cfg
@@ -0,0 +1,19 @@
+indent_columns = 4
+nl_if_brace = Remove
+nl_brace_else = Remove
+nl_elseif_brace = Remove
+nl_struct_brace = Remove
+nl_union_brace = Remove
+nl_fcall_brace = Remove
+nl_fdef_brace = Remove
+nl_while_brace = Remove
+nl_do_brace = Remove
+nl_brace_while = Remove
+nl_switch_brace = Remove
+nl_before_case = True
+sp_func_proto_paren = Remove
+sp_func_def_paren = Remove
+sp_inside_fparens = remove
+sp_inside_fparen = remove
+sp_func_call_paren = Remove
+sp_fparen_brace = Add
\ No newline at end of file
diff --git a/Robust/src/standard.cfg b/Robust/src/standard.cfg
deleted file mode 100644
index a3fa1677..00000000
--- a/Robust/src/standard.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-indent_columns = 2
-nl_if_brace = Remove
-nl_brace_else = Remove
-nl_elseif_brace = Remove
-nl_struct_brace = Remove
-nl_union_brace = Remove
-nl_fcall_brace = Remove
-nl_fdef_brace = Remove
-nl_while_brace = Remove
-nl_do_brace = Remove
-nl_brace_while = Remove
-nl_switch_brace = Remove
-nl_before_case = True
-sp_func_proto_paren = Remove
-sp_func_def_paren = Remove
-sp_inside_fparens = remove
-sp_inside_fparen = remove
-sp_func_call_paren = Remove
-sp_fparen_brace = Add
\ No newline at end of file