job: #9 Adding another testbench and a sticky note to the modem model.

xtuml · May 20, 2013 · c621c83 · c621c83
1 parent 776d263
commit c621c83
Show file tree

Hide file tree

Showing 11 changed files with 1,816 additions and 89 deletions.
diff --git a/applications/modem/.externalToolBuilders/Model Compiler.launch b/applications/modem/.externalToolBuilders/Model Compiler.launch
@@ -3,7 +3,7 @@
 <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/modelm&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
 <mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="MGLS_ATTR_DISPLAY" value="localhost:10.0_12969"/>
+<mapEntry key="MGLS_ATTR_DISPLAY" value="localhost:10.0_30901"/>
 </mapAttribute>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>

diff --git a/....externalToolBuilders/org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder (1).launch b/....externalToolBuilders/org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder (1).launch
diff --git a/...modem/.externalToolBuilders/org.eclipse.cdt.managedbuilder.core.genmakebuilder (1).launch b/...modem/.externalToolBuilders/org.eclipse.cdt.managedbuilder.core.genmakebuilder (1).launch
diff --git a/applications/modem/.project b/applications/modem/.project
@@ -21,23 +21,69 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>full,incremental,</triggers>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
 			<arguments>
 				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.cdt.managedbuilder.core.genmakebuilder (1).launch</value>
+					<key>?name?</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.append_environment</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
+					<value>all</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildArguments</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildCommand</key>
+					<value>make</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildLocation</key>
+					<value>${workspace_loc:/modelm/Debug}</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+					<value>clean</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.contents</key>
+					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+					<value>false</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
+					<value>all</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.stopOnError</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+					<value>true</value>
 				</dictionary>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>full,incremental,</triggers>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
 			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder (1).launch</value>
-				</dictionary>
 			</arguments>
 		</buildCommand>
 	</buildSpec>

diff --git a/applications/modem/models/modem/components/components.xtuml b/applications/modem/models/modem/components/components.xtuml
@@ -3035,6 +3035,15 @@ INSERT INTO DIM_CON
 	5345.000000,
 	3348.000000,
 	"b4d8957a-9f75-4aa9-b40b-e31b8c13e275");
+INSERT INTO STY_S
+	VALUES ("02bc2009-be94-4e5b-b83a-42d28b5eed99",
+	"b4d8957a-9f75-4aa9-b40b-e31b8c13e275",
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO STY_LCS
+	VALUES ("02bc2009-be94-4e5b-b83a-42d28b5eed99",
+	0,
+	128,
+	0);
 INSERT INTO GD_GE
 	VALUES ("214ef520-689a-4222-ab31-5c370c53aab9",
 	"8060b4be-5ad0-414e-95bc-a4705ed0147e",
@@ -3064,6 +3073,15 @@ INSERT INTO DIM_CON
 	5168.000000,
 	3222.000000,
 	"214ef520-689a-4222-ab31-5c370c53aab9");
+INSERT INTO STY_S
+	VALUES ("0d1f621f-954e-489a-b56e-93c7c6233b58",
+	"214ef520-689a-4222-ab31-5c370c53aab9",
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO STY_LCS
+	VALUES ("0d1f621f-954e-489a-b56e-93c7c6233b58",
+	0,
+	128,
+	0);
 INSERT INTO GD_GE
 	VALUES ("c1ac2f96-864c-4fb6-a3d7-e4e7caae1be3",
 	"8060b4be-5ad0-414e-95bc-a4705ed0147e",
@@ -3108,6 +3126,15 @@ INSERT INTO DIM_CON
 	5137.000000,
 	3438.000000,
 	"c1ac2f96-864c-4fb6-a3d7-e4e7caae1be3");
+INSERT INTO STY_S
+	VALUES ("754b36ab-9b1c-4934-bb24-f047df817e5c",
+	"c1ac2f96-864c-4fb6-a3d7-e4e7caae1be3",
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO STY_LCS
+	VALUES ("754b36ab-9b1c-4934-bb24-f047df817e5c",
+	128,
+	0,
+	0);
 INSERT INTO GD_GE
 	VALUES ("d39229ba-568c-44b4-83a8-d17714969734",
 	"8060b4be-5ad0-414e-95bc-a4705ed0147e",
@@ -3142,6 +3169,15 @@ INSERT INTO DIM_CON
 	5313.000000,
 	3618.000000,
 	"d39229ba-568c-44b4-83a8-d17714969734");
+INSERT INTO STY_S
+	VALUES ("15ba7a5b-95a5-480a-bb89-3fa75db612c1",
+	"d39229ba-568c-44b4-83a8-d17714969734",
+	"00000000-0000-0000-0000-000000000000");
+INSERT INTO STY_LCS
+	VALUES ("15ba7a5b-95a5-480a-bb89-3fa75db612c1",
+	128,
+	0,
+	0);
 INSERT INTO GD_GE
 	VALUES ("2c27614c-5744-48c5-982f-55e7d5f40480",
 	"8060b4be-5ad0-414e-95bc-a4705ed0147e",

diff --git a/applications/modem/models/modem/system/system.xtuml b/applications/modem/models/modem/system/system.xtuml
@@ -106,11 +106,11 @@ INSERT INTO GD_SHP
 INSERT INTO GD_NCS
 	VALUES ("b7c10433-0b11-47e7-b855-247384f413e1");
 INSERT INTO DIM_ND
-	VALUES (125.000000,
+	VALUES (140.000000,
 	97.000000,
 	"b7c10433-0b11-47e7-b855-247384f413e1");
 INSERT INTO DIM_GE
-	VALUES (5024.000000,
+	VALUES (5009.000000,
 	3360.000000,
 	"b7c10433-0b11-47e7-b855-247384f413e1",
 	"00000000-0000-0000-0000-000000000000");