#344 DSM library/app: processed various review comments.

 - Use correct tooldef tool name.
 - Remove spurious empty lines in test-all.launch.
 - Exclude .dsm files from license header check.
 - The new plugins are now in a feature.
 - Fixed inconsistent build.properties indentation.

common/org.eclipse.escet.common.dsm.app/build.properties

@@ -14,6 +14,6 @@ source.. = src/
 output.. = target/classes/
 src.includes = icons/
 bin.includes = META-INF/,\
-                      icons/,\
-                      plugin.xml,\
-                     .
+               icons/,\
+               plugin.xml,\
+               .

common/org.eclipse.escet.common.dsm.app/examples/pimmler/pimmler.tooldef

@@ -22,7 +22,7 @@ from "lib:common" import *;
 // Wilschut T. System specification and design structuring methods for a
 // lock product platform. Eindhoven: Technische Universiteit Eindhoven, 2018. 178 p.
 
-dsm_clustering("pimmler.dsm",
+dsmclustering("pimmler.dsm",
               "-o pimmler1_out.dsm",
               "-m debug",
               "--evaporation=1.5",
@@ -31,7 +31,7 @@ dsm_clustering("pimmler.dsm",
               "--convergence=1e-10",
               "--stepcount=2");
 
-dsm_clustering("pimmler.dsm",
+dsmclustering("pimmler.dsm",
               "-o pimmler2_out.dsm",
               "-m debug",
               "--evaporation=2.5",
@@ -40,7 +40,7 @@ dsm_clustering("pimmler.dsm",
               "--convergence=1e-10",
               "--stepcount=2");
 
-dsm_clustering("pimmler.dsm",
+dsmclustering("pimmler.dsm",
               "-o pimmler3_out.dsm",
               "-m debug",
               "--evaporation=1.5",
@@ -49,7 +49,7 @@ dsm_clustering("pimmler.dsm",
               "--convergence=1e-10",
               "--stepcount=2");
 
-dsm_clustering("pimmler.dsm",
+dsmclustering("pimmler.dsm",
               "-o pimmler4_out.dsm",
               "-m debug",
               "--evaporation=1.5",
@@ -58,7 +58,7 @@ dsm_clustering("pimmler.dsm",
               "--convergence=1e-10",
               "--stepcount=2");
 
-dsm_clustering("pimmler.dsm",
+dsmclustering("pimmler.dsm",
               "-o pimmler5_out.dsm",
               "-m debug",
               "--evaporation=1.5",

common/org.eclipse.escet.common.dsm.app/examples/theme_park/theme_park.tooldef

@@ -13,7 +13,7 @@
 
 from "lib:common" import *;
 
-dsm_clustering("theme_park.dsm",
+dsmclustering("theme_park.dsm",
               "-m debug",
               "--evaporation=2",
               "--inflation=1.5",

common/org.eclipse.escet.common.feature/feature.xml

@@ -129,4 +129,25 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.escet.common.dsm"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.escet.common.dsm.app"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.escet.common.tooldefs"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

misc/license-header/license-header-check.bash

@@ -46,6 +46,7 @@ EXCLUDE_ARGS="$EXCLUDE_ARGS --exclude=*.slx"
 # Exclude text files that don't support comments.
 EXCLUDE_ARGS="$EXCLUDE_ARGS --exclude=MANIFEST.MF"
 EXCLUDE_ARGS="$EXCLUDE_ARGS --exclude=*.bib"
+EXCLUDE_ARGS="$EXCLUDE_ARGS --exclude=*.dsm"
 EXCLUDE_ARGS="$EXCLUDE_ARGS --exclude=*.json"
 EXCLUDE_ARGS="$EXCLUDE_ARGS --exclude=*.pptx"
 # Exclude text files where Eclipse removes comments when editing them.

releng/org.eclipse.escet.releng.tests/test-all.launch

@@ -5,13 +5,11 @@
     <booleanAttribute key="org.eclipse.debug.core.launchGroup.0.enabled" value="true"/>
     <stringAttribute key="org.eclipse.debug.core.launchGroup.0.mode" value="inherit"/>
     <stringAttribute key="org.eclipse.debug.core.launchGroup.0.name" value="test-chi-codegen"/>
-
     <stringAttribute key="org.eclipse.debug.core.launchGroup.1.action" value="NONE"/>
     <booleanAttribute key="org.eclipse.debug.core.launchGroup.1.adoptIfRunning" value="false"/>
     <booleanAttribute key="org.eclipse.debug.core.launchGroup.1.enabled" value="true"/>
     <stringAttribute key="org.eclipse.debug.core.launchGroup.1.mode" value="inherit"/>
     <stringAttribute key="org.eclipse.debug.core.launchGroup.1.name" value="test-chi-runtime"/>
-
     <stringAttribute key="org.eclipse.debug.core.launchGroup.10.action" value="NONE"/>
     <booleanAttribute key="org.eclipse.debug.core.launchGroup.10.adoptIfRunning" value="false"/>
     <booleanAttribute key="org.eclipse.debug.core.launchGroup.10.enabled" value="true"/>