Move jflex sources to src/main/jflex

Author: ahornace

opengrok-indexer/build.xml

@@ -18,7 +18,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
 
 CDDL HEADER END
 
-Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
 Portions Copyright (c) 2020, Chris Fraire <[email protected]>.
 
 -->
@@ -55,13 +55,6 @@ Portions Copyright (c) 2020, Chris Fraire <[email protected]>.
 
     <property name="git" value="git"/>
 
-    <target name="-collect-lex-lexh">
-        <mkdir dir="${tgt.dir}"/>
-        <copy todir="${tgt.dir}" flatten="true">
-            <fileset dir="${src.dir}" includes="**/*.lex,**/*.lexh"/>
-        </copy>
-    </target>
-
     <target name="-post-compile-test">
         <antcall target="-create-svn-repository"/>
 

opengrok-indexer/pom.xml

@@ -253,9 +253,6 @@ Portions Copyright (c) 2020-2020, Lubos Kosco <[email protected]>.
                             <goal>generate</goal>
                         </goals>
                         <configuration>
-                            <lexDefinitions>
-                                <lexDefinition>${basedir}/target/jflex-sources</lexDefinition>
-                            </lexDefinitions>
                             <encodingName>${project.build.sourceEncoding}</encodingName>
                         </configuration>
                     </execution>
@@ -366,20 +363,6 @@ Portions Copyright (c) 2020-2020, Lubos Kosco <[email protected]>.
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>1.8</version>
                 <executions>
-                    <execution>
-                        <id>collect-lex-lexh</id>
-                        <phase>initialize</phase>
-                        <configuration>
-                            <target>
-                                <property name="src.dir" value="src/main/resources"/>
-                                <property name="tgt.dir" value="${basedir}/target/jflex-sources"/>
-                                <ant target="-collect-lex-lexh"/>
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
                     <execution>
                         <id>build-config-files</id>
                         <phase>process-test-classes</phase>

opengrok-indexer/src/main/resources/analysis/Common.lexh renamed to opengrok-indexer/src/main/jflex/analysis/Common.lexh

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2017-2019, Chris Fraire <[email protected]>.
  */
 
@@ -39,7 +39,7 @@ import org.opengrok.indexer.web.HtmlConsts;
 %ignorecase
 %int
 %char
-%include CommonLexer.lexh
+%include ../CommonLexer.lexh
 %{
     private String lastSymbol;
 
@@ -111,7 +111,7 @@ import org.opengrok.indexer.web.HtmlConsts;
     int SCOMMENT() { return SCOMMENT; }
 %}
 
-%include Common.lexh
-%include CommonURI.lexh
-%include CommonPath.lexh
+%include ../Common.lexh
+%include ../CommonURI.lexh
+%include ../CommonPath.lexh
 %include AdaProductions.lexh