diff --git a/mozilla/tools/codesighs/autosummary.linux.bash b/mozilla/tools/codesighs/autosummary.linux.bash index e98758a4a78..675b0210355 100755 --- a/mozilla/tools/codesighs/autosummary.linux.bash +++ b/mozilla/tools/codesighs/autosummary.linux.bash @@ -127,23 +127,18 @@ sort -r $RAWTSVFILE > $COPYSORTTSV # If a historical file was specified, diff it with our sorted tsv values. # Run it through a tool to summaries the diffs to the module # level report. +# Otherwise, generate the module level report from our new data. # rm -f $SUMMARYFILE DIFFFILE="$MYTMPDIR/diff.txt" if [ -e $OLDTSVFILE ]; then diff $OLDTSVFILE $COPYSORTTSV > $DIFFFILE ./mozilla/dist/bin/maptsvdifftool --input $DIFFFILE >> $SUMMARYFILE - echo "" >> $SUMMARYFILE - echo "" >> $SUMMARYFILE +else + ./mozilla/dist/bin/codesighs --modules --input $COPYSORTTSV >> $SUMMARYFILE fi -# -# Generate the module level report from our new data. -# -./mozilla/dist/bin/codesighs --modules --input $COPYSORTTSV >> $SUMMARYFILE - - # # Output our numbers, that will let tinderbox specify everything all # at once. @@ -167,4 +162,4 @@ fi # # Remove our temporary directory. # -\rm -rf $MYTMPDIR +rm -rf $MYTMPDIR diff --git a/mozilla/tools/codesighs/autosummary.win.bash b/mozilla/tools/codesighs/autosummary.win.bash index d9af8f664f7..1f47ecbfc12 100755 --- a/mozilla/tools/codesighs/autosummary.win.bash +++ b/mozilla/tools/codesighs/autosummary.win.bash @@ -118,23 +118,18 @@ sort -r $RAWTSVFILE > $COPYSORTTSV # If a historical file was specified, diff it with our sorted tsv values. # Run it through a tool to summaries the diffs to the module # level report. +# Otherwise, generate the module level report from our new data. # rm -f $SUMMARYFILE DIFFFILE="$MYTMPDIR/diff.txt" if [ -e $OLDTSVFILE ]; then diff $OLDTSVFILE $COPYSORTTSV > $DIFFFILE ./mozilla/dist/bin/maptsvdifftool --input $DIFFFILE >> $SUMMARYFILE - echo "" >> $SUMMARYFILE - echo "" >> $SUMMARYFILE +else + ./mozilla/dist/bin/codesighs --modules --input $COPYSORTTSV >> $SUMMARYFILE fi -# -# Generate the module level report from our new data. -# -./mozilla/dist/bin/codesighs --modules --input $COPYSORTTSV >> $SUMMARYFILE - - # # Output our numbers, that will let tinderbox specify everything all # at once. diff --git a/mozilla/tools/codesighs/basesummary.linux.bash b/mozilla/tools/codesighs/basesummary.linux.bash index eeafd3b5aec..ef2f151dc0f 100755 --- a/mozilla/tools/codesighs/basesummary.linux.bash +++ b/mozilla/tools/codesighs/basesummary.linux.bash @@ -132,23 +132,18 @@ sort -r $RAWTSVFILE > $COPYSORTTSV # If a historical file was specified, diff it with our sorted tsv values. # Run it through a tool to summaries the diffs to the module # level report. +# Otherwise, generate the module level report from our new data. # rm -f $SUMMARYFILE DIFFFILE="$MYTMPDIR/diff.txt" if [ -e $OLDTSVFILE ]; then diff $OLDTSVFILE $COPYSORTTSV > $DIFFFILE ./mozilla/dist/bin/maptsvdifftool --input $DIFFFILE >> $SUMMARYFILE - echo "" >> $SUMMARYFILE - echo "" >> $SUMMARYFILE +else + ./mozilla/dist/bin/codesighs --modules --input $COPYSORTTSV >> $SUMMARYFILE fi -# -# Generate the module level report from our new data. -# -./mozilla/dist/bin/codesighs --modules --input $COPYSORTTSV >> $SUMMARYFILE - - # # Output our numbers, that will let tinderbox specify everything all # at once. @@ -172,4 +167,4 @@ fi # # Remove our temporary directory. # -\rm -rf $MYTMPDIR +rm -rf $MYTMPDIR diff --git a/mozilla/tools/codesighs/basesummary.win.bash b/mozilla/tools/codesighs/basesummary.win.bash index a93d31364ba..375f485f512 100755 --- a/mozilla/tools/codesighs/basesummary.win.bash +++ b/mozilla/tools/codesighs/basesummary.win.bash @@ -132,23 +132,18 @@ sort -r $RAWTSVFILE > $COPYSORTTSV # If a historical file was specified, diff it with our sorted tsv values. # Run it through a tool to summaries the diffs to the module # level report. +# Otherwise, generate the module level report from our new data. # rm -f $SUMMARYFILE DIFFFILE="$MYTMPDIR/diff.txt" if [ -e $OLDTSVFILE ]; then diff $OLDTSVFILE $COPYSORTTSV > $DIFFFILE ./mozilla/dist/bin/maptsvdifftool --input $DIFFFILE >> $SUMMARYFILE - echo "" >> $SUMMARYFILE - echo "" >> $SUMMARYFILE +else + ./mozilla/dist/bin/codesighs --modules --input $COPYSORTTSV >> $SUMMARYFILE fi -# -# Generate the module level report from our new data. -# -./mozilla/dist/bin/codesighs --modules --input $COPYSORTTSV >> $SUMMARYFILE - - # # Output our numbers, that will let tinderbox specify everything all # at once.