Merge branch 'master' into generated_annotation

.cirrus.yml

@@ -8,7 +8,7 @@ container:
   image: l.gcr.io/google/bazel:3.5.0
   memory: 5G
 
-bazel_build__test_task:
+bazel_build_and_test_task:
   name: Bazel build and test
   bazel_version_script:
   - bazel --bazelrc=.ci.bazelrc info  --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST  release
@@ -17,37 +17,41 @@ bazel_build__test_task:
   test_script:
   - bazel --bazelrc=.ci.bazelrc test  --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST  //jflex/...
   regression_tests_script:
-  - bazel --bazelrc=.ci.bazelrc test  --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST  //javatests/jflex/testcase/...
+  - bazel --bazelrc=.ci.bazelrc test  --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST  //javatests/de/jflex/testcase/...
   test_all_script:
   - bazel --bazelrc=.ci.bazelrc test  --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST  //...
-  always:
-    junit_artifacts:
-      path: "bazel-out/*/testlogs/**/test.xml"
-      type: text/xml
-      format: junit
-
-bazel_artifact_task:
-  name: Bazel artifact
   build_artifact_script:
   - bazel --bazelrc=.ci.bazelrc build --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST  jflex/jflex_bin_deploy.jar
   binary_artifacts:
     path: "bazel-out/*/bin/jflex/jflex_bin_deploy.jar"
     type: application/java-archive
+  manual_artifacts:
+    path: "bazel-out/*/bin/docs/manual.pdf"
+    type: application/pdf
+  always:
+    junit_artifacts:
+      path: "bazel-out/*/testlogs/**/test.xml"
+      type: text/xml
+      format: junit
+  environment:
+    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-measure_coverage_task:
-  name: Measure code coverage
+main_branch_task:
+  name: Measure code coverage & deploy aggregated sources
   measure_coverage_script:
   - bazel --bazelrc=.ci.bazelrc coverage --combined_report=none --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST  //javatests/... //jflex/...
   send_coverage_report_script:
   - scripts/send-code-coverage.sh
+  deploy_aggregated_sources_script:
+  - scripts/prepare-deploy-source-code.sh
   only_if: $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH || $CIRRUS_BRANCH == 'cirrus'
   environment:
     CODACY_PROJECT_TOKEN: ENCRYPTED[2fac1c4b7834a7f75477aa710279eaaa65db5999d9d0219940eb1e9679a38073c9fd99f240904ab318f95aab5eea5af9]
 
 codestyle_task:
   name: Check code style
   container:
-    image: openjdk:8-jdk
+    image: openjdk:11-jdk
   check_java_format_script: scripts/test-java-format.sh
   check_bzl_format_script:  scripts/test-bzl-format.sh
 

.github/dependabot.yml

@@ -0,0 +1,9 @@
+# Dependabot version updates.
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "monthly"

WORKSPACE

@@ -8,10 +8,11 @@ RULES_JVM_EXTERNAL_TAG = "2.10"
 
 RULES_JVM_EXTERNAL_SHA = "1bbf2e48d07686707dd85357e9a94da775e1dbd7c464272b3664283c9c716d26"
 
-git_repository(
+http_archive(
     name = "jflex_rules",
-    commit = "b9a053fa6e461bdd131f0918966afba4f94993c7",  # v9
-    remote = "https://github.com/jflex-de/bazel_rules.git",
+    sha256 = "a4a9d59f39d4055c2deddd8058cf28baee916116a743d200c4bba58a13b9e184",
+    strip_prefix = "bazel_rules-1.8.2",
+    url = "https://github.com/jflex-de/bazel_rules/archive/v1.8.2.tar.gz",
 )
 
 load("@jflex_rules//jflex:deps.bzl", "JFLEX_ARTIFACTS")
@@ -31,8 +32,8 @@ pandoc_repositories()
 # latex rule to build PDF from tex files
 http_archive(
     name = "bazel_latex",
-    strip_prefix = "bazel-latex-0.19",
-    url = "https://github.com/ProdriveTechnologies/bazel-latex/archive/v0.19.tar.gz",
+    strip_prefix = "bazel-latex-1.0",
+    url = "https://github.com/ProdriveTechnologies/bazel-latex/archive/v1.0.tar.gz",
 )
 
 load("@bazel_latex//:repositories.bzl", "latex_repositories")

cup-maven-plugin/src/main/java/jflex/maven/plugin/cup/CliCupInvoker.java

@@ -17,7 +17,7 @@ class CliCupInvoker {
 
   CliCupInvoker(Log log) {
     this.log = log;
-  };
+  }
 
   /**
    * Invokes CUP.

docs/BUILD.bazel

@@ -29,13 +29,18 @@ latex_document(
         ":fig/jflex-black.png",
         ":first_page",
         ":latex_content",
+        "manual.bib",
     ] + TEX_SRCS + [
+        "@bazel_latex//packages:biblatex",
         "@bazel_latex//packages:geometry",
         "@bazel_latex//packages:graphicx",
         "@bazel_latex//packages:hyperref",
         "@bazel_latex//packages:microtype",
         "@bazel_latex//packages:upquote",
+        "@bazel_latex//packages:verbatim",
+        "@texlive_texmf__texmf-dist__fonts__opentype__public__lm",
     ],
+    cmd_flags = ["--bibtex-cmd=biber"],
     main = "manual_full.tex",
 )
 
@@ -50,7 +55,7 @@ genrule(
     name = "latex_content",
     srcs = TEX_SRCS,
     outs = ["_content.tex"],
-    cmd = "echo '" + ("\n".join(["\\input{docs/md/" + section + "_tex}" for section in DOC_SECTIONS])) + "' > $@",
+    cmd = "echo '" + "\n".join(["\\input{docs/md/" + section + "_tex}" for section in DOC_SECTIONS]) + "' > $@",
     output_to_bindir = True,  # that's where pdf_latex looks into
 )
 

docs/manual_full.tex

@@ -1,12 +1,15 @@
-\documentclass{article}
+%\documentclass[11pt]{scrartcl} % TODO
+\documentclass{report}
 
 \usepackage[T1]{fontenc}
 
 % \usepackage{a4wide} % deprecated. Replace by geometry.
 \usepackage{geometry}
+\usepackage{verbatim}
 \usepackage{graphicx}
 \usepackage{microtype}
 \usepackage{upquote}
+
 \usepackage{color}
 \definecolor{lcol}{rgb}{0.2470,0.3176,0.7098}
 \usepackage[
@@ -28,15 +31,20 @@
    margin=2.54cm
 }
 
+% pandoc packages
+\usepackage{lmodern} % Is it necessary? CM looks the same, doesn't it?
+% \usepackage{fixltx2e} % provides \textsubscript % Not necessary?
+% \usepackage[utf8]{inputenc} % Not necessary?
+
 \title{JFlex User's Manual}
 \author{Gerwin Klein, Steve Rowe, Régis Décamps}
 
 % pandoc now uses \tightlist
 \providecommand{\tightlist}{%
   \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
 
-\newcommand{\autocite}[1]{\cite{#1}}
-\newcommand{\textcite}[1]{\cite{#1}}
+\usepackage{biblatex}
+\addbibresource{docs/manual.bib}
 
 \let\orighyperref\hyperref
 \renewcommand{\hyperref}[2][]{\orighyperref[#1]{#2} (\autoref{#1})}
@@ -54,4 +62,7 @@
 \newpage
 \input{docs/_content}
 
+\pagebreak
+\printbibliography
+
 \end{document}

java/README.md

@@ -1,3 +1,7 @@
 # Java sources
 
 **WIP** [Migration to Bazel](https://github.com/jflex-de/jflex/wiki/Migration-to-Bazel)
+
+* `de/jflex` is the internal code used during development and testing.
+* `jflex` is the public API and implementation that will eventually be released
+   in the JFlex jar.

java/jflex/migration/BUILD.bazel → java/de/jflex/migration/BUILD.bazel

@@ -3,7 +3,7 @@ load("@jflex_rules//jflex:jflex.bzl", "jflex")
 java_binary(
     name = "migrator",
     srcs = [],
-    main_class = "jflex.migration.Migrator",
+    main_class = "de.jflex.migration.Migrator",
     runtime_deps = [":migration"],
 )
 
@@ -20,9 +20,9 @@ java_library(
         ":model",
         ":test_case_parser",
         ":velocity_templates",
-        "//java/jflex/testing/testsuite/golden:model",
-        "//java/jflex/util/javac:package_util",
-        "//java/jflex/velocity",
+        "//java/de/jflex/testing/testsuite/golden:model",
+        "//java/de/jflex/util/javac:package_util",
+        "//java/de/jflex/velocity",
         "//third_party/com/google/common/flogger",
         "//third_party/com/google/guava",
         "//third_party/org/apache/velocity",
@@ -38,8 +38,8 @@ java_library(
     ],
     deps = [
         ":model",
-        "//java/jflex/testing/testsuite/golden:model",
-        "//java/jflex/velocity",
+        "//java/de/jflex/testing/testsuite/golden:model",
+        "//java/de/jflex/velocity",
         "//third_party/com/google/guava",
         "//third_party/org/apache/velocity",
     ],
@@ -51,7 +51,7 @@ java_library(
         "TestCase.java",
     ],
     deps = [
-        "//java/jflex/testing/testsuite/golden:model",
+        "//java/de/jflex/testing/testsuite/golden:model",
     ],
 )
 

java/jflex/migration/BUILD.vm → java/de/jflex/migration/BUILD.vm

@@ -15,7 +15,7 @@ java_library(
         ":gen_${testName}_scanner",
     ],
     deps = [
-        "//java/jflex/testing/testsuite/golden",
+        "//java/de/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
     ],
 )
@@ -33,9 +33,9 @@ java_test(
     ],
     deps = [
         ":${testName}_scanner",
-        "//java/jflex/testing/diff",
-        "//java/jflex/testing/testsuite/golden",
-        "//java/jflex/util/scanner:scanner_factory",
+        "//java/de/jflex/testing/diff",
+        "//java/de/jflex/testing/testsuite/golden",
+        "//java/de/jflex/util/scanner:scanner_factory",
         "//third_party/com/google/guava",
         "//third_party/com/google/truth",
     ],