Changeset a35b458 in mainline for contrib/tools

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

Location:

contrib/tools

Files:

• gen_vga323.c (modified) (1 diff)
• random_check.sh (modified) (5 diffs)
• toolchain_check.sh (modified) (1 diff)

contrib/tools/gen_vga323.c

@@ -36 +36 @@
 {
         unsigned int i;
-        
+
         for (i = 0; i < 256; i++)
                 printf("\t.byte 0x%02x, 0x%02x, 0x%02x, 0x00\n", BLUE(i) * 9, GREEN(i) * 21, RED(i) * 9);
-        
+
         return 0;
 }

contrib/tools/random_check.sh

@@ -88 +88 @@
         COUNTER=$(( $COUNTER + 1 ))
         echo "Try #$COUNTER ($FAILED failed):" >&2
-        
+
         (
                 echo "  Cleaning after previous build." >&2
                 make distclean -j$JOBS 2>&1 || exit 1
-                
-                
+
+
                 echo "  Preparing random configuration." >&2
                 # It would be nicer to allow set the constraints directly to
@@ -105 +105 @@
                                 exit 2
                         fi
-                        
+
                         make random-config 2>&1 || exit 1
-                        
+
                         tr -d ' ' <Makefile.config >"${FILENAME_PREFIX}config.trimmed"
-                        
+
                         THIS_CONFIG_OKAY=true
                         while read pattern; do
@@ -117 +117 @@
                                 fi
                         done <"$PRUNE_CONFIG_FILE"
-                        
+
                         rm -f "${FILENAME_PREFIX}config.trimmed"
-                        
+
                         if $THIS_CONFIG_OKAY; then
                                 break
                         fi
                 done
-                
-                
+
+
                 # Report basic info about the configuration and build it
                 BASIC_CONFIG=`sed -n \
@@ -134 +134 @@
                         | paste '-sd,' | sed 's#,#, #g'`
                 echo -n "  Building ($BASIC_CONFIG)... " >&2
-        
+
                 make -j$JOBS 2>&1
                 if [ $? -eq 0 ]; then
@@ -143 +143 @@
                         exit 1
                 fi
-                
+
         ) >random_run_$COUNTER.log
         RC=$?
-        
+
         if [ $RC -ne 0 ]; then
                 tail -n 10 random_run_$COUNTER.log | sed 's#.*#    | &#'
                 FAILED=$(( $FAILED + 1 ))
         fi
-        
+
         if [ -e Makefile.config ]; then
                 cp Makefile.config "$FILENAME_PREFIX$COUNTER.Makefile.config"

contrib/tools/toolchain_check.sh

@@ -38 +38 @@
         objcopy_path=`echo "$arch_path"/bin/*-objcopy`
         gdb_path=`echo "$arch_path"/bin/*-gdb`
-        
+
         print_version "$ld_path" "Linker not found!" || continue
-        
+
         print_version "$objcopy_path" "objcopy not found!" || continue
-        
+
         print_version "$gcc_path" "GCC not found!" || continue
         check_define "$gcc_path" "__helenos__" 1 || continue
         check_define "$gcc_path" "helenos_uarch" "$arch" || continue
-        
+
         print_version "$gdb_path" "GDB not found!" || continue
 done