Create module jflex.base (#502)

* Move Jflex version in jflex.base.Build * Update release scripts.
jflex-de · Oct 21, 2018 · ca298de · ca298de
1 parent 51400d1
commit ca298de
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 13 deletions.
diff --git a/jflex/src/main/java/jflex/BUILD b/jflex/src/main/java/jflex/BUILD
@@ -6,6 +6,7 @@ java_library(
     srcs = ["Main.java"],  # cli
     deps = [
         "//jflex/src/main/java/jflex/anttask",
+        "//jflex/src/main/java/jflex/base",
         "//jflex/src/main/java/jflex/core",
         "//jflex/src/main/java/jflex/exceptions",
         "//jflex/src/main/java/jflex/gui",

diff --git a/jflex/src/main/java/jflex/Main.java b/jflex/src/main/java/jflex/Main.java
@@ -26,6 +26,7 @@
 import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import jflex.base.Build;
 import jflex.core.LexGenerator;
 import jflex.core.Options;
 import jflex.core.Out;
@@ -138,7 +139,7 @@ private static List<File> parseOptions(String argv[]) throws SilentExit {
 
       if (Objects.equals(argv[i], "--version")
           || Objects.equals(argv[i], "-version")) { // $NON-NLS-1$ //$NON-NLS-2$
-        Out.println(ErrorMessages.THIS_IS_JFLEX, LexGenerator.VERSION);
+        Out.println(ErrorMessages.THIS_IS_JFLEX, Build.VERSION);
         throw new SilentExit(0);
       }
 
@@ -305,7 +306,7 @@ private static void printUsage() {
     Out.println("--help");
     Out.println("-h                 print this message");
     Out.println("");
-    Out.println(ErrorMessages.THIS_IS_JFLEX, LexGenerator.VERSION);
+    Out.println(ErrorMessages.THIS_IS_JFLEX, Build.VERSION);
     Out.println("Have a nice day!");
   }
 

diff --git a/jflex/src/main/java/jflex/base/BUILD b/jflex/src/main/java/jflex/base/BUILD
@@ -0,0 +1,6 @@
+package(default_visibility = ["//visibility:public"])
+
+java_library(
+    name = "base",
+    srcs = glob(["*.java"]),
+)
diff --git a/jflex/src/main/java/jflex/base/Build.java b/jflex/src/main/java/jflex/base/Build.java
@@ -0,0 +1,9 @@
+package jflex.base;
+
+public class Build {
+
+  /** Current JFlex version */
+  public static final String VERSION = "1.7.1-SNAPSHOT"; // $NON-NLS-1$
+
+  private Build() {}
+}
diff --git a/jflex/src/main/java/jflex/core/BUILD b/jflex/src/main/java/jflex/core/BUILD
@@ -8,6 +8,7 @@ java_library(
     ],
     deps = [
         "//cup:cup_runtime",
+        "//jflex/src/main/java/jflex/base",
         "//jflex/src/main/java/jflex/chars",
         "//jflex/src/main/java/jflex/exceptions",
         "//jflex/src/main/java/jflex/io",

diff --git a/jflex/src/main/java/jflex/core/Emitter.java b/jflex/src/main/java/jflex/core/Emitter.java
@@ -19,6 +19,7 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import jflex.base.Build;
 import jflex.exceptions.GeneratorException;
 import jflex.io.FileUtil;
 import jflex.l10n.ErrorMessages;
@@ -412,7 +413,7 @@ private void emitNextInput() {
 
   private void emitHeader() {
     println("// DO NOT EDIT");
-    println("// Generated by JFlex " + LexGenerator.VERSION + " http://jflex.de/");
+    println("// Generated by JFlex " + Build.VERSION + " http://jflex.de/");
     String path = FileUtil.getRelativePath(Options.getRootDirectory(), inputFile);
     if (File.separatorChar == '\\') {
       path = FileUtil.slashify(path);

diff --git a/jflex/src/main/java/jflex/core/LexGenerator.java b/jflex/src/main/java/jflex/core/LexGenerator.java
@@ -30,9 +30,6 @@
  */
 public class LexGenerator {
 
-  /** JFlex version */
-  public static final String VERSION = "1.7.1-SNAPSHOT"; // $NON-NLS-1$
-
   /**
    * Generates a scanner for the specified input file.
    *

diff --git a/jflex/src/main/java/jflex/core/Out.java b/jflex/src/main/java/jflex/core/Out.java
@@ -15,6 +15,7 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.OutputStream;
+import jflex.base.Build;
 import jflex.core.unicode.UnicodeProperties;
 import jflex.exceptions.GeneratorException;
 import jflex.l10n.ErrorMessages;
@@ -406,7 +407,7 @@ public static void printSystemInfo() {
     err("OS version:       " + System.getProperty("os.version"));
     err("Encoding:         " + System.getProperty("file.encoding"));
     err("Unicode versions: " + UnicodeProperties.UNICODE_VERSIONS);
-    err("JFlex version:    " + LexGenerator.VERSION);
+    err("JFlex version:    " + Build.VERSION);
   }
 
   /**

diff --git a/jflex/src/main/java/jflex/gui/BUILD b/jflex/src/main/java/jflex/gui/BUILD
@@ -5,6 +5,7 @@ java_library(
     srcs = glob(["*.java"]),
     deps = [
         "//jflex",
+        "//jflex/src/main/java/jflex/base",
         "//jflex/src/main/java/jflex/exceptions",
         "//jflex/src/main/java/jflex/l10n",
     ],

diff --git a/jflex/src/main/java/jflex/gui/MainFrame.java b/jflex/src/main/java/jflex/gui/MainFrame.java
@@ -17,7 +17,7 @@
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.File;
-import jflex.core.LexGenerator;
+import jflex.base.Build;
 import jflex.core.Out;
 
 /**
@@ -53,7 +53,7 @@ public final class MainFrame extends Frame implements Handles {
 
   /** Constructor for MainFrame. */
   public MainFrame() {
-    super("JFlex " + LexGenerator.VERSION);
+    super("JFlex " + Build.VERSION);
     buildContent();
 
     addWindowListener(

diff --git a/post-release.pl b/post-release.pl
@@ -101,8 +101,8 @@
 print "Updating version in build.xml\n";
 system (qq!perl -pi -e "s/\Q$previous_snapshot\E/$snapshot/" jflex/build.xml !);
 
-print "Updating version in Main.java\n";
-system (qq!perl -pi -e "s/\Q$previous_snapshot\E/$snapshot/" jflex/src/main/java/jflex/Main.java !);
+print "Updating version in Build.java\n";
+system (qq!perl -pi -e "s/\Q$previous_snapshot\E/$snapshot/" jflex/src/main/java/jflex/base/Build.java !);
 
 print "Updating version in the testsuite's Exec.java\n";
 system (qq!perl -pi -e "s/\Q$previous_snapshot\E/$snapshot/"!

diff --git a/prepare-release.pl b/prepare-release.pl
@@ -81,8 +81,8 @@
 system ('perl -pi -e "s/-SNAPSHOT//" jflex/build.xml');
 print "\ndone.\n\n";
 
-print " updating version in Main.java";
-system ('perl -pi -e "s/version = \"(.*)-SNAPSHOT/version = \"\\1/" jflex/src/main/java/jflex/Main.java ');
+print " updating version in Build.java";
+system ('perl -pi -e "s/version = \"(.*)-SNAPSHOT/version = \"\\1/" jflex/src/main/java/jflex/base/Build.java ');
 print "\ndone.\n\n";
 
 print " updating version in the testsuite's Exec.java";