Squashed 'sleec-core/' changes from fae3689..a42491f

a42491f Fixed standalone jar build. git-subtree-dir: sleec-core git-subtree-split: a42491ff4947e5d094f3687048b72310364f458b
UoY-RoboStar · Dec 1, 2023 · c9b0bec · c9b0bec
1 parent c7f6633
commit c9b0bec
Show file tree

Hide file tree

Showing 5 changed files with 159 additions and 22 deletions.
diff --git a/circus.robocalc.sleec.target/circus.robocalc.sleec.target.target b/circus.robocalc.sleec.target/circus.robocalc.sleec.target.target
@@ -8,7 +8,7 @@
 			<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/releases/2021-03"/>
+			<repository location="https://download.eclipse.org/releases/2021-12"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
@@ -18,21 +18,5 @@
 			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
-			<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
-			<unit id="org.junit" version="4.12.0.v201504281640"/>
-			<unit id="org.junit.jupiter.api" version="5.7.1.v20210222-1948"/>
-			<unit id="org.junit.jupiter.engine" version="5.7.1.v20210222-1948"/>
-			<unit id="org.junit.platform.commons" version="1.7.1.v20210222-1948"/>
-			<unit id="org.junit.platform.engine" version="1.7.1.v20210222-1948"/>
-			<unit id="org.junit.platform.launcher" version="1.7.1.v20210222-1948"/>
-			<unit id="org.junit.platform.runner" version="1.7.1.v20210222-1948"/>
-			<unit id="org.opentest4j" version="1.2.0.v20190826-0900"/>
-			<unit id="org.objectweb.asm" version="9.1.0.v20210209-1849"/>
-			<unit id="org.objectweb.asm.tree" version="9.1.0.v20210209-1849"/>
-			<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-03"/>
-		</location>
 	</locations>
 </target>
diff --git a/circus.robocalc.sleec.tests/META-INF/MANIFEST.MF b/circus.robocalc.sleec.tests/META-INF/MANIFEST.MF
@@ -10,6 +10,6 @@ Require-Bundle: circus.robocalc.sleec,
  org.junit.jupiter.api;bundle-version="[5.1.0,6.0.0)",
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
- org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"
+ org.eclipse.xtext.xbase.lib;bundle-version="2.25.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: circus.robocalc.sleec.tests;x-internal=true
diff --git a/circus.robocalc.sleec.ui/META-INF/MANIFEST.MF b/circus.robocalc.sleec.ui/META-INF/MANIFEST.MF
@@ -16,8 +16,8 @@ Require-Bundle: circus.robocalc.sleec,
  org.eclipse.ui,
  org.eclipse.compare,
  org.eclipse.xtext.builder,
- org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
- org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional
+ org.eclipse.xtext.xbase.lib;bundle-version="2.25.0",
+ org.eclipse.xtend.lib;bundle-version="2.25.0";resolution:=optional
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: circus.robocalc.sleec.ui.contentassist,

diff --git a/circus.robocalc.sleec/META-INF/MANIFEST.MF b/circus.robocalc.sleec/META-INF/MANIFEST.MF
@@ -10,11 +10,11 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.xbase,
  org.eclipse.equinox.common;bundle-version="3.5.0",
  org.eclipse.emf.ecore,
- org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.25.0",
  org.eclipse.xtext.util,
  org.eclipse.emf.common,
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.eclipse.xtend.lib;bundle-version="2.14.0"
+ org.eclipse.xtend.lib;bundle-version="2.25.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: circus.robocalc.sleec.sLEEC.impl,
  circus.robocalc.sleec.serializer,
@@ -29,3 +29,4 @@ Export-Package: circus.robocalc.sleec.sLEEC.impl,
  circus.robocalc.sleec,
  circus.robocalc.sleec.formatting2
 Import-Package: org.apache.log4j
+Bundle-ClassPath: .
diff --git a/circus.robocalc.sleec/pom.xml b/circus.robocalc.sleec/pom.xml
@@ -126,6 +126,158 @@
 	           	</additionalClasspathElements>
 	           </configuration>
 	       </plugin>
+			<plugin>
+		        <groupId>org.eclipse.tycho</groupId>
+		        <artifactId>target-platform-configuration</artifactId>
+		        <configuration>
+		          <pomDependencies>consider</pomDependencies>
+		        </configuration>
+		    </plugin>  
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.0.1</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/libs</outputDirectory>
+							<overWriteReleases>false</overWriteReleases>
+							<overWriteSnapshots>false</overWriteSnapshots>
+							<overWriteIfNewer>true</overWriteIfNewer>
+							<excludeTransitive>true</excludeTransitive>
+							<excludeArtifactIds>
+								com.ibm.icu,
+								org.apache.ant,
+								org.apache.commons.lang,
+								org.apache.commons.logging,
+								org.eclipse.core.commands,
+								org.eclipse.core.contenttype,
+								org.eclipse.core.expressions,
+								org.eclipse.core.filesystem,
+								org.eclipse.core.jobs,
+								org.eclipse.core.resources,
+								org.eclipse.core.variables,
+								org.eclipse.debug.core,
+								org.eclipse.emf.emfstore.common,
+								org.eclipse.emf.codegen.ecore,
+								org.eclipse.emf.codegen,
+								org.eclipse.emf.mwe.core,
+								org.eclipse.emf.mwe.utils,
+								org.eclipse.emf.mwe2.lib,
+								org.eclipse.emf.mwe2.runtime,
+								org.eclipse.equinox.app,
+								org.eclipse.equinox.preferences,
+								org.eclipse.jdt.core,
+								org.eclipse.jdt.debug,
+								org.eclipse.jdt.launching,
+								org.eclipse.text,
+								org.eclipse.xtend.typesystem.emf,
+								org.eclipse.xtend,
+								org.junit.jupiter.engine,
+								org.junit.platform.runner,
+							</excludeArtifactIds>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>com.googlecode.addjars-maven-plugin</groupId>
+				<artifactId>addjars-maven-plugin</artifactId>
+				<version>1.0.5</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>add-jars</goal>
+						</goals>
+						<configuration>
+							<resources>
+								<resource>
+									<directory>${project.build.directory}/libs</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>	
+		   <plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>3.0.0</version>
+				<configuration>
+					<transformers>
+						<transformer
+							implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+							<mainClass>circus.robocalc.sleec.generator.Main</mainClass>
+						</transformer>
+						<transformer
+							implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+							<resource>plugin.properties</resource>
+						</transformer>
+					</transformers>
+					<artifactSet>
+						<excludes><!-- avoid duplicate inclusion due to addjars plugin -->
+							<exclude>*:circus.robocalc.sleec.ide-org.eclipse.lsp4j*</exclude>
+							<exclude>*:circus.robocalc.sleec.ide-org.eclipse.xtext.xbase.lib*</exclude>
+							<exclude>*:circus.robocalc.sleec.ide-org.eclipse.xtend.lib*</exclude>
+							<exclude>*:circus.robocalc.sleec.ide-com.google.guava*</exclude>
+							<exclude>*:circus.robocalc.sleec.ide-asm*</exclude>
+							<exclude>*:circus.robocalc.sleec.ide-log4j*</exclude>
+							<exclude>*:circus.robocalc.sleec.ide-org.objectweb.asm*</exclude>
+							<exclude>*:circus.robocalc.sleec.ide-org.apache.log4j*</exclude>
+							<exclude>*:circus.robocalc.sleec-junit-jupiter-engine*</exclude>
+							<exclude>*:circus.robocalc.sleec-junit*</exclude>
+							<exclude>*junit*</exclude>
+							<exclude>*org.opentest4j*</exclude>
+						</excludes>
+					</artifactSet>
+					<filters>
+						<filter>
+							<artifact>*:*</artifact>
+							<excludes>
+								<exclude>META-INF/INDEX.LIST</exclude>
+								<exclude>META-INF/*.SF</exclude>
+								<exclude>META-INF/*.DSA</exclude>
+								<exclude>META-INF/*.RSA</exclude>
+								<exclude>.options</exclude>
+								<exclude>.api_description</exclude>
+								<exclude>*.profile</exclude>
+								<exclude>*.html</exclude>
+								<exclude>about.*</exclude>
+								<exclude>about_files/*</exclude>
+								<exclude>plugin.xml</exclude>
+								<exclude>modeling32.png</exclude>
+								<exclude>systembundle.properties</exclude>
+								<exclude>profile.list</exclude>
+								<exclude>**/*._trace</exclude>
+								<exclude>**/*.g</exclude>
+								<exclude>**/*.mwe2</exclude>
+								<exclude>**/*.xtext</exclude>
+								<exclude>**/*.so</exclude>
+								<exclude>**/*.jnilib</exclude>
+								<exclude>**/*.dll</exclude>
+							</excludes>
+						</filter>
+					</filters>
+					<finalName>sleec</finalName>
+					<shadedArtifactAttached>true</shadedArtifactAttached>
+					<shadedClassifierName>ls</shadedClassifierName>
+					<minimizeJar>false</minimizeJar>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>