diff --git a/build.gradle b/build.gradle index 3a08e87a3..2a79a7048 100644 --- a/build.gradle +++ b/build.gradle @@ -282,11 +282,17 @@ task build_languages(type: BuildLanguages, dependsOn: [build_allScripts]) { script scriptFile('languages/build.xml') } -task run_tests(type: TestLanguages, dependsOn: build_languages) { +task build_tests(type: BuildLanguages, dependsOn: build_languages) { description "Will execute all tests from command line" script scriptFile('tests/build.xml') } +task run_tests(type: TestLanguages, dependsOn: build_tests) { + description "Will execute all tests from command line" + script scriptFile('tests/build.xml') + targets 'check' +} + task install_nativelibs(type: Copy, dependsOn: build_languages) { from "$rootDir/artifacts/de.itemis.mps.extensions/" include "de.itemis.mps.nativelibs.loader/" diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index fce829a1b..0052f976e 100644 --- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps +++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps @@ -14489,6 +14489,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -14941,6 +15194,10 @@ + + + + diff --git a/code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/de.itemis.mps.editor.htmlcell.demolang.mpl b/code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/de.itemis.mps.editor.htmlcell.demolang.mpl index 699ef7ec9..a5b75297f 100644 --- a/code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/de.itemis.mps.editor.htmlcell.demolang.mpl +++ b/code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/de.itemis.mps.editor.htmlcell.demolang.mpl @@ -12,7 +12,7 @@ - + diff --git a/code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/lib/resources.jar b/code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/lib/resources.jar new file mode 100644 index 000000000..6ea3d5540 Binary files /dev/null and b/code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/lib/resources.jar differ diff --git a/code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/resources/html_3.2_demo.html b/code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/resources/html_3.2_demo.html deleted file mode 100644 index 17d703418..000000000 --- a/code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/resources/html_3.2_demo.html +++ /dev/null @@ -1,602 +0,0 @@ - These tags imply some meaning and structure to the document. - The appearance they are given is controlled by the browser and its preferences. -

- - - - -
- -

Presentation Formatting

-
- - These tags allow the document's author to control the appearance of the document. -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TAG Name Example
- B - Bold Bold
I Italic Italic
STRIKE Strikeout Strikeout
SUB Subscript Subscript
SUP Superscript Superscript
SMALL Small Font Size Small Font Size
U Underline Underline
WBR Word Break Word Break exhibit
- - - - - - - -
NOBR No Break - If this line disappears off the right hand side of the page, window, or frame, you are seeing this tag in action. - -
- -

- - - - - - -
-

Block elements

- 		- -
- -
- -
- - These tags cause paragraph breaks. -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TAG Name Attributes Example
- BLOCKQUOTE - Block Quote ALIGN = {left center right justify} - - Science Fiction has some memorable prose -
- In this Universe the night was falling: the shadows were lengthening toward an east that would not know another dawn. - But elsewhere the stars were still young and the light of morning lingered: and along the path he had once followed, Man would one day go again. -
- as exemplified in the justified quote above. -
PRE Preformatted WIDTH = # - 
 Preformatted text with line
-              breaks, and a maximum line width of 30 characters.
-
-
P Paragraph ALIGN = {left center right justify} - Paragraph one. -

Paragraph two. - This paragraph has alignment set to "justify". - Not all browsers support justified alignment. -

After closing tag. Closing tag is optional. -
BR Line Break CLEAR = {left right all} Line
break
exhibit. - CLEAR moves vertically down until left, right, or all margins are clear of images. -
HR Horizontal Rule - ALIGN = {left right center} -
NOSHADE -
SIZE = # -
WIDTH = {% #} - 		Horizontal
rule. No end tag. -
Size = 10
-
No shade
-
Width = 50%
-
Width = 100
-
- -

- - - - - - -
-

Lists

- 		-   -
- -
  - -
- - Lists provide a means of tabulating data. They provide structure to a document. - Formatting is controlled by the browser, paragraph breaks are implied by the tags. - Lists can be nested. -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TAG Name Attributes Example Compact Example
- UL -
LI - 		Unordered List
List item 		- - COMPACT -
TYPE = -
{disk circle square} - - 		-
    Unordered list -
  • Unordered list item -
  • Second unordered list item, Bullet type default -
  • Bullet Type = Disc -
  • Bullet Type = Circle -
  • Bullet Type = Square -
  • Last unordered list item -
- 		-
    Unordered compact list -
  • Unordered list item -
  • Second unordered list item -
  • Last unordered list item -
-
OL
LI 		Ordered List
List item 		- - COMPACT -
START = # -
TYPE = {A a I i 1} -
VALUE = # - - 		-
    Ordered list -
  1. Ordered list item -
  2. Second ordered list item -
  3. Ordinal Type = A -
  4. Ordinal Type = a -
  5. Ordinal Type = I -
  6. Ordinal Type = i -
  7. Ordinal Type = 1 -
  8. Value = 10 -
  9. Last ordered list item -
- 		-
    Ordered compact list Start = 4 -
  1. Ordered list item -
  2. Second ordered list item -
  3. Last ordered list item -
-
FONT Font - SIZE = "size" -
COLOR = "colour" -
FACE = "font names list in order of preference" - - 		Size from 1 to 7, or relative, eg +1, -2. Face is not part of HTML 3.2 -
- 1Aa# - 2Aa# - 3Aa# - 4Aa# - 5Aa# - 6Aa# - 7Aa# -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Alignment Default Baseline Top Center Bottom
Default Rows show ALIGN,
Columns show VALIGN 		Rows show ALIGN,
Columns show VALIGN 		Rows show ALIGN,
Columns show VALIGN 		Rows show ALIGN,
Columns show VALIGN 		Rows show ALIGN,
Columns show VALIGN
Left Rows show ALIGN,
Columns show VALIGN 		Rows show ALIGN,
Columns show VALIGN 		Rows show ALIGN,
Columns show VALIGN 		Rows show ALIGN,
Columns show VALIGN 		Rows show ALIGN,
Columns show VALIGN
Center Rows show ALIGN,
Columns show VALIGN 		Rows show ALIGN,
Columns show VALIGN 		Rows show ALIGN,
Columns show VALIGN 		Rows show ALIGN,
Columns show VALIGN 		Rows show ALIGN,
Columns show VALIGN
Right Rows show ALIGN,
Columns show VALIGN 		Rows show ALIGN,
Columns show VALIGN 		Rows show ALIGN,
Columns show VALIGN 		Rows show ALIGN,
Columns show VALIGN 		Rows show ALIGN,
Columns show VALIGN
- -

- - - - - - -
-

Character Sets

- 		- -
- -
- -
- - Characters and special symbols can be inserted in text and HTML, - either as a numeric character reference - (&#nnnn; where nnnn is a number corresponding to a character in a character set), - or as a named entity reference (&#mnem; where mnem is the mnemonic for the character). - These are described in a number of places, and a include only a few of the more common and useful ones. -
- There are also some circumstances, particularly in URIs where you can use %##, eg %20 for space, - to represent characters that otherwise wouldn't be parsed by the browser. - - - - - - - - - - - - - - - - - - - - - - - - - - -
%20space  %21!  %22" %23#  %24$  %25%  %26&  %27'  %28(  %29)  %2a*  %2b+  %2c,  %2d-  %2e.  %2f/  %3a:  %3b;  %3c<  %3d=  %3e>  %3f?  %40@  
-

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ChrName#DescriptionChrName#DescriptionChrName#Description
 &#09;Horizontal Tab   &#32;Space!! &#33;Exclamation Mark
"""&quot;&#34;Double quotation mark&&&&amp;&#38;Ampersand. . &#46;Full stop (period)
 <<&lt;&#60;Less than >>&gt;&#62;Greater than@ @ &#64;Commercial at
   &nbsp;&#160;Non breaking space ¡¡&iexcl;&#161;Inverted exclamation ¢¢&cent;&#162;Cent
 ££&pound;&#163;Pound sign ¤¤&curren;&#164;Currency sign ¥¥&yen;&#165;Yen sign
 ¦¦&brvbar;&#166;Broken Vertical Bar §§&sect;&#167;Section sign ©©&copy;&#169;Copyright
 ««&laquo;&#171;Left angle quote, guillemot left ¬¬&not;&#172;Not ®®&reg;&#174;Registered sign
 ±±&plusmn;&#177;Plus minus sign &para;&#182;Paragraph sign »»&raquo;&#187;Right angle quote, guillemot right
 ¼¼&frac14;&#188;One quarter fraction ½½&frac12;&#189;One half fraction ¾¾&frac34;&#190;Three quarters fraction
 ¿¿&iquest;&#191;Inverted question mark ××&times;&#215;Times ÷÷&divide;&#247;Division sign
 ••&bull;&#8226;bullet ……&hellip;&#8230;horizontal ellipsis ′′&prime;&#8242;prime = minutes = feet
 &Primt;″&Prime;&#8243;double prime = seconds = inches ‾‾&oline;&#8254;overline ⁄⁄&frasl;&#8260;fraction slash
 ←←&larr;&#8592;leftwards arrow ↑↑&uarr;&#8593;upwards arrow →→&rarr;&#8594;right arrow
 ↓↓&darr;&#8595;downwards arrow ↔↔&harr;&#8596;left right arrow ↵↵&crarr;&#8629;downwards arrow with corner leftwards
\ No newline at end of file diff --git a/code/jackson/solutions/com.fasterxml.jackson/com.fasterxml.jackson.msd b/code/jackson/solutions/com.fasterxml.jackson/com.fasterxml.jackson.msd deleted file mode 100644 index e69de29bb..000000000 diff --git a/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/com.mbeddr.mpsutil.intentions.sandboxlang.mpl b/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/com.mbeddr.mpsutil.intentions.sandboxlang.mpl index caed9d0fe..a7d203617 100644 --- a/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/com.mbeddr.mpsutil.intentions.sandboxlang.mpl +++ b/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/com.mbeddr.mpsutil.intentions.sandboxlang.mpl @@ -12,7 +12,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/generator/templates/com.mbeddr.mpsutil.intentions.sandboxlang.templates@generator.mps b/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/generator/templates/com.mbeddr.mpsutil.intentions.sandboxlang.generator.templates@generator.mps similarity index 94% rename from code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/generator/templates/com.mbeddr.mpsutil.intentions.sandboxlang.templates@generator.mps rename to code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/generator/templates/com.mbeddr.mpsutil.intentions.sandboxlang.generator.templates@generator.mps index 6fa21f72e..272b7ec30 100644 --- a/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/generator/templates/com.mbeddr.mpsutil.intentions.sandboxlang.templates@generator.mps +++ b/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/generator/templates/com.mbeddr.mpsutil.intentions.sandboxlang.generator.templates@generator.mps @@ -1,5 +1,5 @@ - + diff --git a/code/languages/de.itemis.model.merge.testlang/de.itemis.model.merge.testlang.mpl b/code/languages/de.itemis.model.merge.testlang/de.itemis.model.merge.testlang.mpl deleted file mode 100644 index e69de29bb..000000000 diff --git a/code/languages/de.itemis.model.simple.demo/de.itemis.model.simple.demo.mpl b/code/languages/de.itemis.model.simple.demo/de.itemis.model.simple.demo.mpl deleted file mode 100644 index e69de29bb..000000000 diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.expext/models/transformations.mps b/code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.expext/models/transformations.mps deleted file mode 100644 index e69de29bb..000000000