Changeset 8565a42 in mainline for contrib/tools

Timestamp:

2018-03-02T20:34:50Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

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

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

Location:

contrib/tools

Files:

• font/bdf2c.pl (modified) (7 diffs)
• gen_vga323.c (modified) (1 diff)
• random_check.sh (modified) (5 diffs)
• toolchain_check.sh (modified) (1 diff)

contrib/tools/font/bdf2c.pl

@@ -53 +53 @@
         /^FONTBOUNDINGBOX\s/ and do {
                 ($skip, $width, $height, $offset_x, $offset_y) = (split);
-                
+
                 die("Font width is not 8px\n") if ($width != 8);
                 die("Font height is not 16px\n") if ($height != 16);
@@ -70 +70 @@
                 my @glyph = ();
                 my $y;
-                
+
                 # Add empty lines at top
                 my $empties = $height + $offset_y - $goffset_y - $gheight;
-                
+
                 for ($y = 0; $y < $empties; $y++) {
                         $glyph[$y] = 0;
                 }
-                
+
                 # Scan the hex bitmap
                 for ($y = $empties; $y < $empties + $gheight; $y++) {
@@ -83 +83 @@
                         $glyph[$y] = hex(substr($_, 0, 2)) >> $goffset_x;
                 }
-                
+
                 # Add empty lines at bottom
                 my $fill = $height - $gheight - $empties;
@@ -89 +89 @@
                         $glyph[$y] = 0;
                 }
-                
+
                 if ($index != 0) {
                         $glyphs[$index] = (\@glyph);
@@ -125 +125 @@
                                 print "\t\treturn (ch - " . ($start - $start_pos) . ");\n";
                         }
-                        
+
                         print "\t\n";
                 }
-                
+
                 $start = $index;
                 $start_pos = $pos;
         }
-        
+
         $pos++;
         $prev = $index;
@@ -145 +145 @@
 for $index (@chars) {
         print "\n\t{";
-        
+
         my $y;
         for ($y = 0; $y < $height; $y++) {
@@ -151 +151 @@
                 printf "0x%.2x", $glyphs[$index]->[$y];
         }
-        
+
         print "},";
 }

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