Merge branch 'release' for version 2.1.2

overturetool · Oct 9, 2014 · 2659212 · 2659212
2 parents 31fd8ab + 8e0bacc
commit 2659212
Show file tree

Hide file tree

Showing 6,843 changed files with 149,430 additions and 214,500 deletions.
diff --git a/.gitignore b/.gitignore
@@ -89,13 +89,18 @@ repository/
 #########################
 generated/
 
+
 # Documents copied into the help plugin #
 #########################################
 ide/help/html/OvertureIDEUserGuide.pdf
 ide/help/html/QuickOverviewofVDMOperators.pdf
 ide/help/html/VDM10_lang_man.pdf
 
 
+# VDM Libraries copied into the UI plugin #
+###########################################
+ide/ui/includes/lib/
+
 # Vim Swap Files #
 ##################
 *.swp
diff --git a/.travis.yml b/.travis.yml
@@ -21,5 +21,5 @@ script:
   - mvn -B install
   - echo travis_fold:end:compile_core
   - echo travis_fold:start:compile_ide
-  - mvn -B install -f ide/pom.xml -Dgit-commit-id.skip=true -Pall-platforms
+  - mvn -B install -f ide/pom.xml -Dgit-commit-id.skip=true -Pall-platforms -P!ui-tests
   - echo travis_fold:end:compile_ide
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -16,8 +16,7 @@ This directory contains several subdirectories:
 * Documentation for VDM and Overture is in `documentation`
 * Auxiliary code that supports the build process are found in `tools`
 
-## Tests
-If running on a terminal with no gfx enabled then disable the UI test profile `ui-tests` profile. The maven argument for this is `-P ui-tests` and is used like: `mvn install -P !ui-tests` .
+