Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regenerate all languages after EMF bump #3303

Merged
merged 14 commits into from
Dec 18, 2024
+540 −343
Merged

Regenerate all languages after EMF bump #3303

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7c4aa90
Simplify regeneration of languages
szarnekow Dec 17, 2024
42376d4
Regenerate PureXbase in 2024
szarnekow Dec 17, 2024
7b18cb6
Generate Xbase from relengutils
szarnekow Dec 17, 2024
2564209
Generate Xbase in 2024
szarnekow Dec 17, 2024
1bc5531
REbase me
szarnekow Dec 17, 2024
9e8ffce
Generate Xtext and Xbase from single workflow
szarnekow Dec 17, 2024
4060d06
Generate codetemplates
szarnekow Dec 17, 2024
826e79e
Generate Xtend along with Xbase
szarnekow Dec 18, 2024
4e51383
Add aopalliance to xtext.xtext.generator.deps
szarnekow Dec 18, 2024
2d5f570
Regenerate Xtend with Java 17
szarnekow Dec 18, 2024
5e80447
Generate all example languages in one step
szarnekow Dec 18, 2024
f7041df
Regenerated examples
szarnekow Dec 18, 2024
b9a741d
Adjustments to the build of xtext.relengutil
szarnekow Dec 18, 2024
7c53ee3
Fixed C&P issue
szarnekow Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions org.eclipse.xtext.relengutil/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.xtext</groupId>
Expand All @@ -11,7 +13,7 @@

<name>Xtext Release Engineering Utilities</name>
<description>Utilities to perform maintenance work in Xtext.</description>

<dependencies>
<dependency>
<groupId>org.eclipse.xtext</groupId>
Expand All @@ -24,4 +26,24 @@
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version>
szarnekow marked this conversation as resolved.
Show resolved Hide resolved
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<dependency-resolution>
<optionalDependencies>ignore</optionalDependencies>
</dependency-resolution>
</configuration>
</plugin>
</plugins>
</build>
</project>
9 changes: 7 additions & 2 deletions org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/XbaseGeneratorComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.eclipse.emf.mwe.core.lib.AbstractWorkflowComponent2;
import org.eclipse.emf.mwe.core.monitor.ProgressMonitor;
import org.eclipse.emf.mwe2.runtime.Mandatory;
import org.eclipse.xtext.xbase.GenerateXbase;

/**
* MWE2 wrapper around the GenerateXbase class.
Expand All @@ -31,7 +30,13 @@ public void setRootPath(String rootPath) {

@Override
protected void invokeInternal(WorkflowContext ctx, ProgressMonitor monitor, Issues issues) {
GenerateXbase.main(new String[] {rootPath});
try {
var generateXbase = Class.forName("org.eclipse.xtext.xbase.GenerateXbase");
var main = generateXbase.getMethod("main", String[].class);
main.invoke(null, new Object[] { new String[] {rootPath} });
} catch(ReflectiveOperationException e) {
throw new RuntimeException(e);
}
}

}
Loading