Merge pull request #18 from xtuml/master

Update with xtuml

VandMC_testing/mctest/assoc_unformal/.externalToolBuilders/Model Compiler.launch

@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.debug.core.ATTR_REFRESH_RECURSIVE" value="true"/>
-<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;&#13;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1350488610446_1&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/assoc_unformal&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="MGLS_ATTR_DISPLAY" value="_6652"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="${workspace_loc:/assoc_unformal}/mc_out.txt"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="C:/MentorGraphics/BridgePoint/eclipse_extensions/BridgePoint/eclipse/plugins/com.mentor.nucleus.bp.mc.c.source_3.6.0/mc3020/bin/xtumlmc_build.exe"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value=" -home &quot;C:/MentorGraphics/BridgePoint/eclipse_extensions/BridgePoint/eclipse/plugins/com.mentor.nucleus.bp.mc.c.source_3.6.0/&quot;  -l3s  -e -d code_generation -O ../../src/"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${build_project}/gen"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.debug.core.ATTR_REFRESH_RECURSIVE" value="true"/>
+<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;&#13;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1350488610446_1&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/assoc_unformal&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="MGLS_ATTR_DISPLAY" value="_6652"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="${workspace_loc:/assoc_unformal}/mc_out.txt"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/Users/cort/xtuml/m6150.2018-08-22-1056/BridgePoint.app/Contents/Eclipse/tools/mc/bin/xtumlmc_build"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value=" -home &quot;/Users/cort/xtuml/m6150.2018-08-22-1056/BridgePoint.app/Contents/Eclipse/tools/&quot;  -l3s  -e -d code_generation -O ../../src/"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${build_project}/gen"/>
 </launchConfiguration>

VandMC_testing/mctest/assoc_unformal/.project

@@ -5,16 +5,6 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/com.mentor.nucleus.bp.mc.xmiexport.XMIExportBuilder.launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>com.mentor.nucleus.bp.mc.c.source.export_builder</name>
 			<arguments>

VandMC_testing/mctest/assoc_unformal/README.txt

@@ -1,5 +1,8 @@
 This model tests relating and selecting across all of the different
-relationship types.
+relationship types.  In 2018 persistence testing was added/refreshed.
+Turn on persistence by marking (all) classes as persistent in class.mark.
+When testing persistence, run the test twice, once to create the nvs.fil and
+once to use it for initialization.  Verifier does not simulate persistence.
 
 To run in Verifier, launch assoc_unformal1.
 assoc_unformal::Port1:start_test is marked to execute.
@@ -17,4 +20,4 @@ These init functions are marked for running the generated code.
 Run as a local C/C++ app.
 
 Expect:
-PASSED - LOG::LogSuccess:  Made it to the end.
+PASSED - LOG::LogSuccess:  Made it to the end.

VandMC_testing/mctest/assoc_unformal/gen/class.mark

@@ -0,0 +1,2 @@
+.invoke MarkPersistentClass( "*", "*", "*" )
+.//

applications/einstein/.project

@@ -12,6 +12,7 @@
 		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
 			<arguments>
 				<dictionary>
 					<key>LaunchConfigHandle</key>
@@ -20,15 +21,23 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
 			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.cdt.managedbuilder.core.genmakebuilder.launch</value>
+				</dictionary>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
 			<triggers>full,incremental,</triggers>
 			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder.launch</value>
+				</dictionary>
 			</arguments>
 		</buildCommand>
 	</buildSpec>

applications/einstein/README.txt

@@ -0,0 +1 @@
+permute.c is example permutation logic

applications/einstein/gen/LOG_bridge.c

@@ -0,0 +1,80 @@
+/*----------------------------------------------------------------------------
+ * Description:   Methods for bridging to an external entity.
+ *
+ * External Entity:  Logging (LOG)
+ * 
+ * your copyright statement can go here (from te_copyright.body)
+ *--------------------------------------------------------------------------*/
+
+#include "einstein_sys_types.h"
+#include "LOG_bridge.h"
+
+/*
+ * Bridge:  LogSuccess
+ */
+void
+LOG_LogSuccess( c_t p_message[ESCHER_SYS_MAX_STRING_LEN] )
+{
+  /* Replace/Insert your implementation code here... */
+}
+
+
+/*
+ * Bridge:  LogFailure
+ */
+void
+LOG_LogFailure( c_t p_message[ESCHER_SYS_MAX_STRING_LEN] )
+{
+  /* Replace/Insert your implementation code here... */
+}
+
+
+/*
+ * Bridge:  LogInfo
+ */
+void
+LOG_LogInfo( c_t p_message[ESCHER_SYS_MAX_STRING_LEN] )
+{
+  printf( "%s\n", p_message );
+}
+
+
+/*
+ * Bridge:  LogDate
+ */
+void
+LOG_LogDate( Escher_Date_t p_d, c_t p_message[ESCHER_SYS_MAX_STRING_LEN] )
+{
+  /* Replace/Insert your implementation code here... */
+}
+
+
+/*
+ * Bridge:  LogTime
+ */
+void
+LOG_LogTime( c_t p_message[ESCHER_SYS_MAX_STRING_LEN], Escher_TimeStamp_t p_t )
+{
+  /* Replace/Insert your implementation code here... */
+}
+
+
+/*
+ * Bridge:  LogReal
+ */
+void
+LOG_LogReal( c_t p_message[ESCHER_SYS_MAX_STRING_LEN], const r_t p_r )
+{
+  /* Replace/Insert your implementation code here... */
+}
+
+
+/*
+ * Bridge:  LogInteger
+ */
+void
+LOG_LogInteger( const i_t p_message )
+{
+  printf( "%d\n", p_message );
+}
+