ant add jar task, extract version.file property

[mjc2wsl.git] / src-wsl / metrics.wsl

diff --git a/src-wsl/metrics.wsl b/src-wsl/metrics.wsl
index 1eeceee..8dff9db 100644 (file)
--- a/src-wsl/metrics.wsl
+++ b/src-wsl/metrics.wsl
@@ -1,3 +1,22 @@
+C:"Doni Pracner (c) 2015";
+C:"
+This program is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public
+License as published by the Free Software Foundation; either
+version 3 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied
+warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE. See the GNU General Public License for more
+details.
+
+You should have received a copy of the GNU General Public
+License along with this program. If not, see
+<http://www.gnu.org/licenses/>.
+==========================================================";
+

 C:"This program generates metrics for WSL programs,
 including options for comparing two programs (mainly ment to
 compare different versions) and output differences as direct
 C:"This program generates metrics for WSL programs,
 including options for comparing two programs (mainly ment to
 compare different versions) and output differences as direct


@@ -8,10 +27,6 @@ command line for quick checks but also to be used for
 automation and creation of CSV files for collections of
 programs.";
 
 automation and creation of CSV files for collections of
 programs.";
 

-C:"Doni Pracner (c) 2015";
-
-C:"Released under the terms of the GPL v3 or later";
-

 C:"usage {option} {filename}";
 
 C:"Options";
 C:"usage {option} {filename}";
 
 C:"Options";


@@ -42,24 +57,6 @@ C:"examples;
        files in the specified file
 ";
 
        files in the specified file
 ";
 

-C:"
-This program is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public
-License as published by the Free Software Foundation; either
-version 3 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE. See the GNU General Public License for more
-details.
-
-You should have received a copy of the GNU General Public
-License along with this program. If not, see
-<http://www.gnu.org/licenses/>.
-==========================================================";
-

 Field_Separator := ",";
 
 MW_PROC @Get_New_Name(VAR str) == 
 Field_Separator := ",";
 
 MW_PROC @Get_New_Name(VAR str) == 


@@ -131,9 +128,12 @@ ELSE
                        C:"Header for comparison";
                        @WS("filename");@WS(Field_Separator);
                        @Write_Metrics_List();@WS(Field_Separator);
                        C:"Header for comparison";
                        @WS("filename");@WS(Field_Separator);
                        @Write_Metrics_List();@WS(Field_Separator);

+                       @WS("P2 ");

                        @Write_Metrics_List();@WS(Field_Separator);
                        @Write_Metrics_List();@WS(Field_Separator);

-                       @WS("DIF");@Write_Metrics_List();@WS(Field_Separator);
-                       @WS("%");@Write_Metrics_List();
+                       @WS("DIF ");
+                       @Write_Metrics_List();@WS(Field_Separator);
+                       @WS("% ");
+                       @Write_Metrics_List();

                        @WL("");
                ELSIF filename = "-o" THEN
                        C:"set output";
                        @WL("");
                ELSIF filename = "-o" THEN
                        C:"set output";