Skip to content

Commit 86da47a

Browse files
slavek-kuceraslavek-kucera
authored
fix: Avoid redundant rebuilds (#2416)
1 parent e61c943 commit 86da47a

33 files changed

+9
-89
lines changed

‎server/dialect-daco/pom.xml

+2-8
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,7 @@
176176
<goal>antlr4</goal>
177177
</goals>
178178
<configuration>
179-
<arguments>
180-
<argument>-package</argument>
181-
<argument>org.eclipse.lsp.cobol.dialects.daco</argument>
182-
<argument>-o</argument>
183-
<argument>${basedir}/target/generated-sources/antlr4/org/eclipse/lsp/cobol/dialects/daco</argument>
184-
</arguments>
185-
<sourceDirectory>src/main/antlr4/org/eclipse/lsp/cobol/core/parser</sourceDirectory>
179+
<libDirectory>src/main/antlr4/org/eclipse/lsp/cobol/dialects/daco</libDirectory>
186180
<listener>true</listener>
187181
<visitor>true</visitor>
188182
</configuration>
@@ -296,4 +290,4 @@
296290

297291
</build>
298292

299-
</project>
293+
</project>

‎server/dialect-daco/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/DaCoLexer.g4 renamed to ‎server/dialect-daco/src/main/antlr4/org/eclipse/lsp/cobol/dialects/daco/DaCoLexer.g4

File renamed without changes.

‎server/dialect-daco/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/DaCoParser.g4 renamed to ‎server/dialect-daco/src/main/antlr4/org/eclipse/lsp/cobol/dialects/daco/DaCoParser.g4

File renamed without changes.

‎server/dialect-daco/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/TechnicalLexer.g4 renamed to ‎server/dialect-daco/src/main/antlr4/org/eclipse/lsp/cobol/dialects/daco/TechnicalLexer.g4

File renamed without changes.

‎server/dialect-daco/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/VariableLexer.g4 renamed to ‎server/dialect-daco/src/main/antlr4/org/eclipse/lsp/cobol/dialects/daco/VariableLexer.g4

File renamed without changes.

‎server/dialect-daco/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/VariableParser.g4 renamed to ‎server/dialect-daco/src/main/antlr4/org/eclipse/lsp/cobol/dialects/daco/VariableParser.g4

File renamed without changes.

‎server/dialect-idms/pom.xml

+2-8
Original file line numberDiff line numberDiff line change
@@ -201,13 +201,7 @@
201201
<goal>antlr4</goal>
202202
</goals>
203203
<configuration>
204-
<arguments>
205-
<argument>-package</argument>
206-
<argument>org.eclipse.lsp.cobol.dialects.idms</argument>
207-
<argument>-o</argument>
208-
<argument>${basedir}/target/generated-sources/antlr4/org/eclipse/lsp/cobol/dialects/idms</argument>
209-
</arguments>
210-
<sourceDirectory>src/main/antlr4/org/eclipse/lsp/cobol/core/parser</sourceDirectory>
204+
<libDirectory>src/main/antlr4/org/eclipse/lsp/cobol/dialects/idms</libDirectory>
211205
<listener>true</listener>
212206
<visitor>true</visitor>
213207
</configuration>
@@ -297,4 +291,4 @@
297291
</pluginManagement>
298292

299293
</build>
300-
</project>
294+
</project>

‎server/dialect-idms/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/IdmsCopyLexer.g4 renamed to ‎server/dialect-idms/src/main/antlr4/org/eclipse/lsp/cobol/dialects/idms/IdmsCopyLexer.g4

File renamed without changes.

‎server/dialect-idms/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/IdmsCopyParser.g4 renamed to ‎server/dialect-idms/src/main/antlr4/org/eclipse/lsp/cobol/dialects/idms/IdmsCopyParser.g4

File renamed without changes.

‎server/dialect-idms/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/IdmsLexer.g4 renamed to ‎server/dialect-idms/src/main/antlr4/org/eclipse/lsp/cobol/dialects/idms/IdmsLexer.g4

File renamed without changes.

‎server/dialect-idms/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/IdmsParser.g4 renamed to ‎server/dialect-idms/src/main/antlr4/org/eclipse/lsp/cobol/dialects/idms/IdmsParser.g4

File renamed without changes.

‎server/dialect-idms/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/IdmsTechnicalLexer.g4 renamed to ‎server/dialect-idms/src/main/antlr4/org/eclipse/lsp/cobol/dialects/idms/IdmsTechnicalLexer.g4

File renamed without changes.

‎server/engine/pom.xml

+2-55
Original file line numberDiff line numberDiff line change
@@ -347,13 +347,6 @@
347347
</goals>
348348
<configuration>
349349
<generateTestSources>true</generateTestSources>
350-
<arguments>
351-
<argument>-package</argument>
352-
<argument>org.eclipse.usecase</argument>
353-
<argument>-o</argument>
354-
<argument>${basedir}/target/generated-sources/antlr4/org/eclipse/usecase</argument>
355-
</arguments>
356-
<sourceDirectory>src/test/antlr4/org/eclipse/usecase</sourceDirectory>
357350
<listener>true</listener>
358351
<visitor>false</visitor>
359352
</configuration>
@@ -365,53 +358,7 @@
365358
<goal>antlr4</goal>
366359
</goals>
367360
<configuration>
368-
<arguments>
369-
<argument>-package</argument>
370-
<argument>org.eclipse.lsp.cobol.core</argument>
371-
<argument>-o</argument>
372-
<argument>${project.build.directory}/generated-sources/antlr4/org/eclipse/lsp/cobol/core</argument>
373-
</arguments>
374-
<sourceDirectory>src/main/antlr4/org/eclipse/lsp/cobol/core/parser</sourceDirectory>
375-
<listener>true</listener>
376-
<visitor>true</visitor>
377-
</configuration>
378-
</execution>
379-
<execution>
380-
<id>run cics antlr</id>
381-
<phase>generate-sources</phase>
382-
<goals>
383-
<goal>antlr4</goal>
384-
</goals>
385-
<configuration>
386-
<arguments>
387-
<argument>-package</argument>
388-
<argument>org.eclipse.lsp.cobol.implicitDialects.cics</argument>
389-
<argument>-o</argument>
390-
<argument>
391-
${project.build.directory}/generated-sources/antlr4/org/eclipse/lsp/cobol/implicitDialects/cics
392-
</argument>
393-
</arguments>
394-
<sourceDirectory>src/main/antlr4/org/eclipse/lsp/cics/parser</sourceDirectory>
395-
<listener>true</listener>
396-
<visitor>true</visitor>
397-
</configuration>
398-
</execution>
399-
<execution>
400-
<id>run sql antlr</id>
401-
<phase>generate-sources</phase>
402-
<goals>
403-
<goal>antlr4</goal>
404-
</goals>
405-
<configuration>
406-
<arguments>
407-
<argument>-package</argument>
408-
<argument>org.eclipse.lsp.cobol.implicitDialects.sql</argument>
409-
<argument>-o</argument>
410-
<argument>
411-
${project.build.directory}/generated-sources/antlr4/org/eclipse/lsp/cobol/implicitDialects/sql
412-
</argument>
413-
</arguments>
414-
<sourceDirectory>src/main/antlr4/org/eclipse/lsp/db2/parser</sourceDirectory>
361+
<libDirectory>src/main/antlr4/org/eclipse/lsp/cobol/core</libDirectory>
415362
<listener>true</listener>
416363
<visitor>true</visitor>
417364
</configuration>
@@ -553,4 +500,4 @@
553500
</build>
554501
</profile>
555502
</profiles>
556-
</project>
503+
</project>

‎server/engine/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolPreprocessor.g4 renamed to ‎server/engine/src/main/antlr4/org/eclipse/lsp/cobol/core/CobolPreprocessor.g4

File renamed without changes.

‎server/engine/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolPreprocessorLexer.g4 renamed to ‎server/engine/src/main/antlr4/org/eclipse/lsp/cobol/core/CobolPreprocessorLexer.g4

File renamed without changes.

‎server/engine/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CompilerDirectivesLexer.g4 renamed to ‎server/engine/src/main/antlr4/org/eclipse/lsp/cobol/core/CompilerDirectivesLexer.g4

File renamed without changes.

‎server/engine/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CompilerDirectivesParser.g4 renamed to ‎server/engine/src/main/antlr4/org/eclipse/lsp/cobol/core/CompilerDirectivesParser.g4

File renamed without changes.

‎server/engine/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/TechnicalLexer.g4 renamed to ‎server/engine/src/main/antlr4/org/eclipse/lsp/cobol/core/TechnicalLexer.g4

File renamed without changes.

‎server/engine/src/main/antlr4/org/eclipse/lsp/cics/parser/CICSLexer.g4 renamed to ‎server/engine/src/main/antlr4/org/eclipse/lsp/cobol/implicitDialects/cics/CICSLexer.g4

File renamed without changes.

‎server/engine/src/main/antlr4/org/eclipse/lsp/cics/parser/CICSParser.g4 renamed to ‎server/engine/src/main/antlr4/org/eclipse/lsp/cobol/implicitDialects/cics/CICSParser.g4

+1-1
Original file line numberDiff line numberDiff line change
@@ -1204,4 +1204,4 @@ invalidInput
12041204
;
12051205

12061206
//notExec: (~ END_EXEC)+;
1207-
notExec: (literal | dataName | (LPARENCHAR .*? RPARENCHAR))+;
1207+
notExec: (literal | dataName | (LPARENCHAR .*? RPARENCHAR))+;

‎server/engine/src/main/antlr4/org/eclipse/lsp/db2/parser/Db2SqlLexer.g4 renamed to ‎server/engine/src/main/antlr4/org/eclipse/lsp/cobol/implicitDialects/sql/Db2SqlLexer.g4

File renamed without changes.

‎server/engine/src/main/antlr4/org/eclipse/lsp/db2/parser/Db2SqlParser.g4 renamed to ‎server/engine/src/main/antlr4/org/eclipse/lsp/cobol/implicitDialects/sql/Db2SqlParser.g4

File renamed without changes.

‎server/engine/src/test/java/org/eclipse/lsp/cobol/usecases/sql/TestSqlAllAlterStatements.java renamed to ‎server/engine/src/test/java/org/eclipse/lsp/cobol/usecases/sql/TestSqlColonsInFetchStatements.java

File renamed without changes.

‎server/parser/pom.xml

-8
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,6 @@
172172
<goal>antlr4</goal>
173173
</goals>
174174
<configuration>
175-
<arguments>
176-
<argument>-package</argument>
177-
<argument>org.eclipse.lsp.cobol.core</argument>
178-
</arguments>
179-
<sourceDirectory>src/main/antlr4/org/eclipse/lsp/cobol/core/parser</sourceDirectory>
180-
<outputDirectory>
181-
${project.build.directory}/generated-sources/antlr4/org/eclipse/lsp/cobol/core
182-
</outputDirectory>
183175
<visitor>true</visitor>
184176
</configuration>
185177
</execution>

‎server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolDataDivisionLexer.g4 renamed to ‎server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/CobolDataDivisionLexer.g4

File renamed without changes.

‎server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolDataDivisionParser.g4 renamed to ‎server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/CobolDataDivisionParser.g4

File renamed without changes.

‎server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolIdentificationDivisionLexer.g4 renamed to ‎server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/CobolIdentificationDivisionLexer.g4

File renamed without changes.

‎server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolIdentificationDivisionParser.g4 renamed to ‎server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/CobolIdentificationDivisionParser.g4

File renamed without changes.

‎server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolLexer.g4 renamed to ‎server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/CobolLexer.g4

File renamed without changes.

‎server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolParser.g4 renamed to ‎server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/CobolParser.g4

+1-1
Original file line numberDiff line numberDiff line change
@@ -2270,4 +2270,4 @@ dialectNodeFiller
22702270

22712271
dot_fs
22722272
: DOT_FS | {notifyError("missing.period", _input.LT(1).getText());}
2273-
;
2273+
;

‎server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolProcedureDivisionLexer.g4 renamed to ‎server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/CobolProcedureDivisionLexer.g4

File renamed without changes.

‎server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolProcedureDivisionParser.g4 renamed to ‎server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/CobolProcedureDivisionParser.g4

File renamed without changes.

‎server/test/pom.xml

+1-8
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,6 @@
194194
<goal>antlr4</goal>
195195
</goals>
196196
<configuration>
197-
<arguments>
198-
<argument>-package</argument>
199-
<argument>org.eclipse.usecase</argument>
200-
<argument>-o</argument>
201-
<argument>${basedir}/target/generated-sources/antlr4/org/eclipse/usecase</argument>
202-
</arguments>
203-
<sourceDirectory>src/main/antlr4/org/eclipse/usecase</sourceDirectory>
204197
<listener>true</listener>
205198
<visitor>false</visitor>
206199
</configuration>
@@ -292,4 +285,4 @@
292285

293286
</build>
294287

295-
</project>
288+
</project>

0 commit comments

Comments
 (0)