Merge branch 'topic/W207-014' into 'master'

W207-014 Add support for --no-default-gnatcheck-rules

See merge request eng/ide/gnatstudio!29

Author: setton

share/support/core/codepeer_xml.py

@@ -676,12 +676,15 @@ def cpms_combo_box(label, switch, tip):
          <check label="Force analysis" switch="-f" column="2"
           tip="Force analysis of all files, ignoring previous run.
 Also force the generation of all SCIL files." />
-         <check label="Disable default GNATcheck" switch="--no-default-gnatcheck-rules" default="off"
-                column="2" tip="Disable default gnatcheck syntactic analysis." />
          <check label="Disable Infer" switch="--no-infer" default="off"
                 column="2" tip="Disable Infer analysis." />
-         <check label="GNATcheck" switch="--gnatcheck"
-                column="2" tip="Launch GNATcheck and collect its messages." />
+         <check label="User-defined GNATcheck rules" switch="--gnatcheck"
+                column="2" tip="Launch GNATcheck on the list of rules specified in the Check package of the project file, and the default rules (unless overriden by the next option)" />
+         <check label="Skip default GNATcheck rules" switch="--no-default-gnatcheck-rules"
+                column="2" tip="Do not launch GNATcheck with the rules enabled by default in CodePeer" />
+         <check label="GNAT warnings" switch="--gnat-warnings"
+                column="2"
+                tip="Launch GNAT front-end and collect its warnings" />
 """
 
 xmlTrailer = """

share/support/core/codepeer_xml_old.py

@@ -728,8 +728,10 @@
          <check label="Force analysis" switch="-f" column="2"
           tip="Force analysis of all files, ignoring previous run.
 Also force the generation of all SCIL files." />
-         <check label="GNATcheck" switch="--gnatcheck"
-                column="2" tip="Launch GNATcheck and collect its messages" />
+         <check label="User-defined GNATcheck rules" switch="--gnatcheck"
+                column="2" tip="Launch GNATcheck on the list of rules specified in the Check package of the project file, and the default rules (unless overriden by the next option)" />
+         <check label="Skip default GNATcheck rules" switch="--no-default-gnatcheck-rules"
+                column="2" tip="Do not launch GNATcheck with the rules enabled by default in CodePeer" />
          <check label="GNAT warnings" switch="--gnat-warnings"
                 column="2"
                 tip="Launch GNAT front-end and collect its warnings" />