Merge pull request #308 from UniFormal/devel

Prepare Release 10

.travis.yml

@@ -1,5 +1,4 @@
 
-
 # +===============================================================+
 # |THIS FILE HAS BEEN AUTO-GENERATED USING `sbt genTravisYML`     |
 # |ANY CHANGES WILL BE OVERWRITTEN                                |
@@ -13,185 +12,191 @@ env:
   - ENCRYPTION_LABEL: "25a07036478c"
   - COMMIT_AUTHOR_EMAIL: "tkw01536@gmail.com"
 
-# using trusty and scala
-dist: trusty
-language: scala
+# use java, and install sbt on OS X
+language: java
+
+
+# meta -- email notification for builds
+notifications:
+  email:
+    on_success: change
+    on_failure: always
+    on_error: always
+    on_start: never
+    on_cancel: never
+
 
 # speed up cloning of the git repository
 # we only need a clone depth of '1'
 git:
   depth: 1
 
-# everything below this line is automatically generated using the configuration in src/travis.sbt
-stages: 
-  - name: SelfCheck
-  - name: CompileCheck
-  - name: DeployCheck
-  - name: test
-  - name: deploy
-    if: branch = master
-jobs: 
-  include: 
+# +===============================================================+
+# |Anything below this line has been generated automatically      |
+# |from src/travis.sbt.                                           |
+# +===============================================================+
+before_install:
+  - 'if [[ "$TRAVIS_OS_NAME" = "osx" ]]; then brew update; brew install sbt; fi'
+before_script:
+  - 'if [ "$TRAVIS_BRANCH" == "devel" ]; then export TEST_USE_ARCHIVE_HEAD=1; fi'
+  - 'if [ "$TRAVIS_BRANCH" == "devel" ]; then export TEST_USE_DEVEL=1; fi'
+install:
+  - "cd src && (cat /dev/null | sbt ++2.12.3 update) && cd .."
+jobs:
+  include:
     # check that 'sbt genTravisYML' has been run
-    - stage: SelfCheck
-      scala: 2.11.12
-      script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 genTravisYML) && cd .."
-        - '(git diff --quiet --exit-code ".travis.yml")'
+    - dist: trusty
+      env:
+        - "INFO='Check that `sbt genTravisYML` has been run'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: openjdk8
-      env: 
-        - INFO='Check that `sbt genTravisYML` has been run'
-    # check that the code complies and conforms to standarssa
-    - stage: CompileCheck
-      scala: 2.11.12
-      script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 scalastyle) && cd .."
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 compile) && cd .."
-      jdk: openjdk7
-      env: 
-        - INFO='Check that the code compiles'
-    - script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 scalastyle) && cd .."
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 compile) && cd .."
-      scala: 2.11.12
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 genTravisYML) && cd .."
+        - '(git diff --quiet --exit-code ".travis.yml")'
+      stage: SelfCheck
+    # Check that our tests run and the code compiles
+    - dist: trusty
+      env:
+        - "INFO='Check that the code compiles and the test runs run and the code compiles'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: openjdk8
-      env: 
-        - INFO='Check that the code compiles'
-    - script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 scalastyle) && cd .."
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 compile) && cd .."
-      scala: 2.11.12
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 scalastyle) && cd .."
+        - "cd src && (cat /dev/null | sbt ++2.12.3 compile) && cd .."
+        - "cd src && (cat /dev/null | sbt ++2.12.3 test) && cd .."
+      stage: CompileAndCheck
+    - dist: trusty
+      env:
+        - "INFO='Check that the code compiles and the test runs run and the code compiles'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: oraclejdk8
-      env: 
-        - INFO='Check that the code compiles'
-    - script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 scalastyle) && cd .."
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 compile) && cd .."
-      scala: 2.11.12
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 scalastyle) && cd .."
+        - "cd src && (cat /dev/null | sbt ++2.12.3 compile) && cd .."
+        - "cd src && (cat /dev/null | sbt ++2.12.3 test) && cd .."
+    - dist: trusty
+      env:
+        - "INFO='Check that the code compiles and the test runs run and the code compiles'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: oraclejdk9
-      env: 
-        - INFO='Check that the code compiles'
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 scalastyle) && cd .."
+        - "cd src && (cat /dev/null | sbt ++2.12.3 compile) && cd .."
+        - "cd src && (cat /dev/null | sbt ++2.12.3 test) && cd .."
     # check that the 'apidoc', 'deploy' and 'deployFull' targets work
-    - stage: DeployCheck
-      scala: 2.11.12
-      script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 deploy) && cd .."
-        - '[[ -f "deploy/mmt.jar" ]]'
-      jdk: openjdk7
-      env: 
-        - INFO='Check mmt.jar generation using `sbt deploy`'
-    - script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 deploy) && cd .."
-        - '[[ -f "deploy/mmt.jar" ]]'
-      scala: 2.11.12
+    - dist: trusty
+      env:
+        - "INFO='Check mmt.jar generation using `sbt deploy`'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: openjdk8
-      env: 
-        - INFO='Check mmt.jar generation using `sbt deploy`'
-    - script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 deploy) && cd .."
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 deploy) && cd .."
         - '[[ -f "deploy/mmt.jar" ]]'
-      scala: 2.11.12
+      stage: DeployCheck
+    - dist: trusty
+      env:
+        - "INFO='Check mmt.jar generation using `sbt deploy`'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: oraclejdk8
-      env: 
-        - INFO='Check mmt.jar generation using `sbt deploy`'
-    - script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 deploy) && cd .."
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 deploy) && cd .."
         - '[[ -f "deploy/mmt.jar" ]]'
-      scala: 2.11.12
+    - dist: trusty
+      env:
+        - "INFO='Check mmt.jar generation using `sbt deploy`'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: oraclejdk9
-      env: 
-        - INFO='Check mmt.jar generation using `sbt deploy`'
-    - script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 deployFull) && cd .."
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 deploy) && cd .."
         - '[[ -f "deploy/mmt.jar" ]]'
-      scala: 2.11.12
-      jdk: openjdk7
-      env: 
-        - INFO='Check mmt.jar generation using `sbt deployfull`'
-    - script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 deployFull) && cd .."
-        - '[[ -f "deploy/mmt.jar" ]]'
-      scala: 2.11.12
+    - dist: trusty
+      env:
+        - "INFO='Check mmt.jar generation using `sbt deployfull`'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: openjdk8
-      env: 
-        - INFO='Check mmt.jar generation using `sbt deployfull`'
-    - script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 deployFull) && cd .."
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 deployFull) && cd .."
         - '[[ -f "deploy/mmt.jar" ]]'
-      scala: 2.11.12
+    - dist: trusty
+      env:
+        - "INFO='Check mmt.jar generation using `sbt deployfull`'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: oraclejdk8
-      env: 
-        - INFO='Check mmt.jar generation using `sbt deployfull`'
-    - script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 deployFull) && cd .."
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 deployFull) && cd .."
         - '[[ -f "deploy/mmt.jar" ]]'
-      scala: 2.11.12
+    - dist: trusty
+      env:
+        - "INFO='Check mmt.jar generation using `sbt deployfull`'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: oraclejdk9
-      env: 
-        - INFO='Check mmt.jar generation using `sbt deployfull`'
-    - script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 apidoc) && cd .."
-        - '[[ -d "apidoc" ]]'
-      scala: 2.11.12
-      jdk: openjdk7
-      env: 
-        - INFO='Check that apidoc generation works'
-    - script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 apidoc) && cd .."
-        - '[[ -d "apidoc" ]]'
-      scala: 2.11.12
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 deployFull) && cd .."
+        - '[[ -f "deploy/mmt.jar" ]]'
+    - dist: trusty
+      env:
+        - "INFO='Check that apidoc generation works'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: openjdk8
-      env: 
-        - INFO='Check that apidoc generation works'
-    - script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 apidoc) && cd .."
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 apidoc) && cd .."
         - '[[ -d "apidoc" ]]'
-      scala: 2.11.12
+    - dist: trusty
+      env:
+        - "INFO='Check that apidoc generation works'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: oraclejdk8
-      env: 
-        - INFO='Check that apidoc generation works'
-    - script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 apidoc) && cd .."
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 apidoc) && cd .."
         - '[[ -d "apidoc" ]]'
-      scala: 2.11.12
-      jdk: oraclejdk9
-      env: 
-        - INFO='Check that apidoc generation works'
-    # check that our own tests run
-    - stage: test
-      scala: 2.11.12
-      script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 test) && cd .."
-      jdk: openjdk7
-      env: 
-        - INFO='Run MMT Tests'
-    - script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 test) && cd .."
-      scala: 2.11.12
-      jdk: openjdk8
-      env: 
-        - INFO='Run MMT Tests'
-    - script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 test) && cd .."
-      scala: 2.11.12
-      jdk: oraclejdk8
-      env: 
-        - INFO='Run MMT Tests'
-    - script: 
-        - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 test) && cd .."
-      scala: 2.11.12
+    - dist: trusty
+      env:
+        - "INFO='Check that apidoc generation works'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: oraclejdk9
-      env: 
-        - INFO='Run MMT Tests'
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 apidoc) && cd .."
+        - '[[ -d "apidoc" ]]'
     # deploy the api documentation
-    - stage: deploy
-      scala: 2.11.12
-      script: 
-        - bash scripts/travis/deploy_doc.sh
-      jdk: openjdk8
-      env: 
+    - dist: trusty
+      env:
         - "INFO='Auto-deploy API documentation'"
-install: 
-  - "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 update) && cd .."
-before_script: 
-  - 'if [ "$TRAVIS_BRANCH" == "devel" ]; then export TEST_USE_ARCHIVE_HEAD=1; fi'
+        - 'SBT_VERSION_CMD="^validate"'
+      jdk: openjdk8
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "bash scripts/travis/deploy_doc.sh"
+      stage: deploy
+stages:
+  - name: SelfCheck
+  - name: CompileAndCheck
+  - name: DeployCheck
+  - if: "branch = master"
+    name: deploy

deploy/.classpath

@@ -3,13 +3,6 @@
 	<classpathentry exported="true" kind="lib" path="lfcatalog/lfcatalog.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/tiscaf.jar"/>
 	<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
-	<classpathentry kind="lib" path="main/mmt-api.jar" sourcepath="/mmt-api/src"/>
-	<classpathentry kind="lib" path="main/mmt-lf.jar"/>
-	<classpathentry kind="lib" path="main/mmt-mizar.jar"/>
-	<classpathentry kind="lib" path="main/mmt-owl.jar"/>
-	<classpathentry kind="lib" path="main/mmt-stex.jar"/>
-	<classpathentry kind="lib" path="main/mmt-tptp.jar"/>
-	<classpathentry kind="lib" path="main/planetary-mmt.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/scala-parser-combinators.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/scala-xml.jar"/>
 	<classpathentry kind="output" path="bin"/>

deploy/mmt

@@ -1,3 +1,3 @@
 #!/bin/bash
 dir="$(dirname $0)"
-java -Xmx2048m -cp "$dir/lib/*:$dir/main/*" info.kwarc.mmt.api.frontend.Run "$@"
+java -Xmx2048m -cp "$dir/lib/*:$dir/mmt.jar" info.kwarc.mmt.api.frontend.Run "$@"

deploy/mmt.bat

@@ -1,4 +1,4 @@
 @echo off
 rem This is the main extry point for running MMT on Windows.
 
-java -Xmx1024m -cp %~dp0/lib/*;%~dp0/main/*;%~dp0/lfcatalog/lfcatalog.jar info.kwarc.mmt.api.frontend.Run %*
+java -Xmx1024m -cp %~dp0/mmt.jar info.kwarc.mmt.api.frontend.Run %*

scripts/logo/Makefile

@@ -1,4 +1,9 @@
-mmtlogo-1.svg: mmtlogo.tex
-    htlatex -scrollmode mmtlogo "xhtml,svg"
-
-
+all: mmtlogo.svg
+mmtlogo.svg: mmtlogo.tex
+	pdflatex --shell-escape mmtlogo.tex
+mmtlogo.pdf: mmtlogo.tex
+	pdflatex mmtlogo.tex
+clean: logclean
+	rm mmtlogo.svg
+logclean:
+	rm *.aux *.log *.pdf