Merge branch 'develop'

gsdlab · Mar 12, 2017 · f3781a0 · f3781a0
2 parents 81c2daa + f8aeb13
commit f3781a0
Show file tree

Hide file tree

Showing 80 changed files with 14,751 additions and 3,419 deletions.
diff --git a/README.md b/README.md
@@ -1,13 +1,13 @@
 [//mbeddr version]: # (nightly-253-MPS-3.3.5)
-[//ClaferMPS zip name]: # (org.clafer.all-0.4.4.3.zip)
-[//ClaferMPS version]: # (v0.4.4.3)
+[//ClaferMPS zip name]: # (org.clafer.all-0.4.4.4.zip)
+[//ClaferMPS version]: # (v0.4.4.4)
 [//MPS version]: # (v3.3.5 (build 143.1301))
 
 
 ClaferMPS
 =========
 
-##### v0.4.4.3
+##### v0.4.4.4
 
 JetBrains Meta-Programming System (MPS) support for Clafer and architectural modeling.
 
@@ -59,7 +59,7 @@ We tested with pre-release [nightly-253-MPS-3.3.5](https://github.com/mbeddr/mbe
 1. Download and install `mbeddr-win-setup.exe` for Windows or `mbeddr-macos.dmg` for Mac from [mbeddr releases](https://github.com/mbeddr/mbeddr.core/releases) to some `<mbeddr directory>`.
     * no need to install the third-party components
 2. Depending on whether you want to install released or development versions
-    * for a released version, download ClaferMPS `org.clafer.all-0.4.4.3.zip` from [ClaferMPS releases](https://github.com/gsdlab/ClaferMPS/releases) and unpack the contents to `<mbeddr directory>` (the folder `plugins` from the archive must be merged with the folder `<mbeddr directory>/plugins`).
+    * for a released version, download ClaferMPS `org.clafer.all-0.4.4.4.zip` from [ClaferMPS releases](https://github.com/gsdlab/ClaferMPS/releases) and unpack the contents to `<mbeddr directory>` (the folder `plugins` from the archive must be merged with the folder `<mbeddr directory>/plugins`).
     * for a development version, go to [ClaferMPS (development version)](#building-ClaferMPS).
 
 
@@ -98,7 +98,7 @@ This method works on all platforms supported by MPS, including Linux.
 2. Download `com.mbeddr.allInOne.zip` [nightly-253-MPS-3.3.5](https://github.com/mbeddr/mbeddr.core/releases/tag/nightly-253-MPS-3.3.5) and unpack the contents to `<MPS directory>` (the folder `plugins` from the archive must be merged with the folder `<MPS directory>/plugins`).
 
 3. Depending on whether you want to install released or development versions
-    * for a released version, download ClaferMPS `org.clafer.all-0.4.4.3.zip` from [ClaferMPS releases](https://github.com/gsdlab/ClaferMPS/releases) and unpack the contents to `<MPS directory>` (the folder `plugins` from the archive must be merged with the folder `<MPS directory>/plugins`).
+    * for a released version, download ClaferMPS `org.clafer.all-0.4.4.4.zip` from [ClaferMPS releases](https://github.com/gsdlab/ClaferMPS/releases) and unpack the contents to `<MPS directory>` (the folder `plugins` from the archive must be merged with the folder `<MPS directory>/plugins`).
     * for a development version, resume [ClaferMPS (development version)](#building-ClaferMPS) from the previous section.
 
 ### MPS + building mbeddr from source
@@ -118,7 +118,7 @@ This method is suitable when working with the latest development versions of mbe
             * `mbeddr.plugins` and give it a value `<target directory>/code/plugins`
 
 3. Depending on whether you want to install released or development versions
-    * for a released version, download ClaferMPS `org.clafer.all-0.4.4.3.zip` from [ClaferMPS releases](https://github.com/gsdlab/ClaferMPS/releases) and unpack the contents to `<MPS directory>` (the folder `plugins` from the archive must be merged with the folder `<MPS directory>/plugins`).
+    * for a released version, download ClaferMPS `org.clafer.all-0.4.4.4.zip` from [ClaferMPS releases](https://github.com/gsdlab/ClaferMPS/releases) and unpack the contents to `<MPS directory>` (the folder `plugins` from the archive must be merged with the folder `<MPS directory>/plugins`).
     * for a development version, resume [ClaferMPS (development version)](#building-ClaferMPS) from the previous section.
 
 Opening the automotive case studies

diff --git a/build.xml b/build.xml
@@ -7,7 +7,7 @@
   <property name="artifacts.root" location="${basedir}/../../MPS/Artifacts" />
   <property name="platform.distribution.artifacts" location="${artifacts.root}/com.mbeddr.platform" />
   <property name="mbeddr.allInOne.artifacts" location="${artifacts.root}/com.mbeddr.allInOne" />
-  <property name="version" value="0.4.4.3" />
+  <property name="version" value="0.4.4.4" />
   <property name="mbeddrVersion" value="253-MPS-3.3.5" />
   <property name="artifacts.mps" location="${mps.home}" />
   <property name="artifacts.jetpad" location="${mps.home}" />

diff --git a/code/languages/org.clafer.mps/.mps/modules.xml b/code/languages/org.clafer.mps/.mps/modules.xml
@@ -10,10 +10,14 @@
       <modulePath path="$PROJECT_DIR$/devkits/org.clafer.devkit" folder="core" />
       <modulePath path="$PROJECT_DIR$/languages/org.clafer.architecture.core/org.clafer.architecture.core.mpl" folder="architecture" />
       <modulePath path="$PROJECT_DIR$/languages/org.clafer.architecture/org.clafer.architecture.mpl" folder="architecture" />
+      <modulePath path="$PROJECT_DIR$/languages/org.clafer.colorChooser/org.clafer.colorChooser.mpl" folder="utils.colorChooser" />
+      <modulePath path="$PROJECT_DIR$/languages/org.clafer.colorChooser/sandbox/org.clafer.colorChooser.sandbox.msd" folder="utils.colorChooser" />
       <modulePath path="$PROJECT_DIR$/languages/org.clafer.core/org.clafer.core.mpl" folder="core" />
       <modulePath path="$PROJECT_DIR$/languages/org.clafer.core/solutions/pluginSolution/org.clafer.core.pluginSolution.msd" folder="core" />
       <modulePath path="$PROJECT_DIR$/languages/org.clafer.expressions/org.clafer.expressions.mpl" folder="core" />
       <modulePath path="$PROJECT_DIR$/languages/org.clafer.referenceModel/org.clafer.referenceModel.mpl" folder="referenceModel" />
+      <modulePath path="$PROJECT_DIR$/languages/org.clafer.slicing/org.clafer.slicing.mpl" folder="utils.slicing" />
+      <modulePath path="$PROJECT_DIR$/languages/org.clafer.slicing/sandbox/org.clafer.slicing.sandbox.msd" folder="utils.slicing" />
       <modulePath path="$PROJECT_DIR$/languages/org.clafer.util.milestone/org.clafer.util.milestone.mpl" folder="utils.milestone" />
       <modulePath path="$PROJECT_DIR$/languages/org.clafer.util.milestone/sandbox/org.clafer.util.milestone.sandbox.msd" folder="utils.milestone" />
       <modulePath path="$PROJECT_DIR$/languages/org.clafer.util.tags/org.clafer.util.tags.mpl" folder="utils.tags" />
@@ -25,6 +29,7 @@
       <modulePath path="$PROJECT_DIR$/solutions/org.clafer.example/org.clafer.sandbox.msd" folder="core" />
       <modulePath path="$PROJECT_DIR$/solutions/org.clafer.mps.build/org.clafer.mps.build.msd" folder="" />
       <modulePath path="$PROJECT_DIR$/solutions/org.clafer.referenceModel.sandbox/org.clafer.referenceModel.sandbox.msd" folder="referenceModel" />
+      <modulePath path="$PROJECT_DIR$/solutions/org.clafer.slices.pluginSolution/org.clafer.slices.pluginSolution.msd" folder="utils.slicing" />
       <modulePath path="$PROJECT_DIR$/solutions/org.clafer.util.milestone.pluginSolution/org.clafer.util.milestone.pluginSolution.msd" folder="utils.milestone" />
       <modulePath path="$PROJECT_DIR$/solutions/tests.clafer.architecture/tests.org.clafer.architecture.msd" folder="architecture" />
       <modulePath path="$PROJECT_DIR$/tests/test.ex.clafer.core/test.ex.clafer.core.msd" folder="core" />

diff --git a/...spreferences/PlatformTemplates/models/org/clafer/mps/__spreferences/PlatformTemplates.mps b/...spreferences/PlatformTemplates/models/org/clafer/mps/__spreferences/PlatformTemplates.mps
@@ -37,10 +37,10 @@
       <node concept="2AWWZL" id="bl22kSm$wf" role="2xbbhh">
         <property role="2AWWZJ" value="gcc" />
         <property role="3r8Kw1" value="gdb" />
-        <property role="3r8Kxs" value="make" />
         <property role="2AWWZI" value="-std=c99" />
         <property role="1FkSt$" value="-g" />
         <property role="3I8uaA" value="" />
+        <property role="3r8Kxs" value="make" />
       </node>
     </node>
   </node>

diff --git a/...g.clafer.mps/devkits/org.clafer.architecture.devkit/org.clafer.architecture.devkit.devkit b/...g.clafer.mps/devkits/org.clafer.architecture.devkit/org.clafer.architecture.devkit.devkit
@@ -2,6 +2,8 @@
 <dev-kit name="org.clafer.architecture.devkit" uuid="ae43b4a1-760c-45a1-9b50-27b4612b75e3">
   <exported-language name="b41ca45b-f035-4e58-bc7d-a14b21b3db45(org.clafer.architecture)" />
   <exported-language name="bb2706c2-79b9-4711-8bf9-d8df74d841ba(org.clafer.architecture.core)" />
+  <exported-language name="5e8d2011-eb6c-491f-9520-19d12014a9bc(org.clafer.referenceModel)" />
+  <exported-language name="3caa48f5-b58c-40e5-8e9c-25dcd3ac80e4(org.clafer.slicing)" />
   <extendedDevKits>
     <extendedDevKit>f5479205-2504-43e0-bdca-f3e2aed0435c(org.clafer)</extendedDevKit>
   </extendedDevKits>