From cd65f5a129415d4eac3bd3b8ee504c8709b94de2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Wed, 7 Feb 2024 12:11:23 +0100
Subject: [PATCH] Make the snippetsupport.jar as part of the maven build

Currently snippetsupport.jar must be build in the ide using s ant
script.

This changes the build to use maven only rebuilding the jar on each
compile so class differences can be discovered automatically. The jar
still needs to be checked in as it is used internally  as a resource.
---
 .../Build Snippet Support JAR.launch          |  17 ----
 org.eclipse.jdt.debug.ui/.gitignore           |   1 +
 org.eclipse.jdt.debug.ui/.project             |  10 ---
 org.eclipse.jdt.debug.ui/pom.xml              |  85 +++++++++++++++---
 .../scripts/buildExtraJAR.xml                 |  56 ------------
 org.eclipse.jdt.debug.ui/snippetsupport.jar   | Bin 3536 -> 3733 bytes
 6 files changed, 75 insertions(+), 94 deletions(-)
 delete mode 100644 org.eclipse.jdt.debug.ui/.externalToolBuilders/Build Snippet Support JAR.launch
 delete mode 100644 org.eclipse.jdt.debug.ui/scripts/buildExtraJAR.xml

diff --git a/org.eclipse.jdt.debug.ui/.externalToolBuilders/Build Snippet Support JAR.launch b/org.eclipse.jdt.debug.ui/.externalToolBuilders/Build Snippet Support JAR.launch
deleted file mode 100644
index 76e70bb1f3..0000000000
--- a/org.eclipse.jdt.debug.ui/.externalToolBuilders/Build Snippet Support JAR.launch	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="dummy_clean,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.jdt.debug.ui&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="true"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_RUN_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_none"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.jdt.debug.ui/Snippet Support&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.jdt.debug.ui/scripts/buildExtraJAR.xml&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.jdt.debug.ui/scripts/buildExtraJAR.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-</launchConfiguration>
diff --git a/org.eclipse.jdt.debug.ui/.gitignore b/org.eclipse.jdt.debug.ui/.gitignore
index 24e4a77acf..2c88a82de5 100644
--- a/org.eclipse.jdt.debug.ui/.gitignore
+++ b/org.eclipse.jdt.debug.ui/.gitignore
@@ -1 +1,2 @@
 /snippet_bin/
+/snippetsupport.jar
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/.project b/org.eclipse.jdt.debug.ui/.project
index ca1f846c65..0e8909e710 100644
--- a/org.eclipse.jdt.debug.ui/.project
+++ b/org.eclipse.jdt.debug.ui/.project
@@ -20,16 +20,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>auto,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/Build Snippet Support JAR.launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
 			<arguments>
diff --git a/org.eclipse.jdt.debug.ui/pom.xml b/org.eclipse.jdt.debug.ui/pom.xml
index c2200c83ae..1ba1c22922 100644
--- a/org.eclipse.jdt.debug.ui/pom.xml
+++ b/org.eclipse.jdt.debug.ui/pom.xml
@@ -9,15 +9,78 @@
   Contributors:
      Igor Fedorenko - initial implementation
 -->
-<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>
-    <artifactId>eclipse.jdt.debug</artifactId>
-    <groupId>eclipse.jdt.debug</groupId>
-    <version>4.31.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.eclipse.jdt</groupId>
-  <artifactId>org.eclipse.jdt.debug.ui</artifactId>
-  <version>3.13.300-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+<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>
+		<artifactId>eclipse.jdt.debug</artifactId>
+		<groupId>eclipse.jdt.debug</groupId>
+		<version>4.31.0-SNAPSHOT</version>
+	</parent>
+	<groupId>org.eclipse.jdt</groupId>
+	<artifactId>org.eclipse.jdt.debug.ui</artifactId>
+	<version>3.13.300-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.12.1</version>
+				<executions>
+					<execution>
+						<id>compile-snippetsupport</id>
+						<goals>
+							<goal>testCompile</goal>
+						</goals>
+						<phase>compile</phase>
+						<configuration>
+							<!-- make sure we use minimum source/target level as
+							this code will be run in old JVMs -->
+							<source>1.7</source>
+							<target>1.7</target>
+							<compilerId>jdt</compilerId>
+							<compileSourceRoots>${project.basedir}/Snippet Support</compileSourceRoots>
+							<outputDirectory>${project.build.directory}/snippetsupport</outputDirectory>
+							<useIncrementalCompilation>false</useIncrementalCompilation>
+						</configuration>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-compiler-jdt</artifactId>
+						<version>${tycho.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.3.0</version>
+				<executions>
+					<execution>
+						<id>jar-snippetsupport</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<phase>prepare-package</phase>
+						<configuration>
+							<classesDirectory>${project.build.directory}/snippetsupport</classesDirectory>
+							<outputDirectory>${project.basedir}</outputDirectory>
+							<finalName>snippetsupport</finalName>
+							<archive>
+								<addMavenDescriptor>false</addMavenDescriptor>
+								<manifest>
+									<addDefaultEntries>false</addDefaultEntries>
+								</manifest>
+							</archive>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/org.eclipse.jdt.debug.ui/scripts/buildExtraJAR.xml b/org.eclipse.jdt.debug.ui/scripts/buildExtraJAR.xml
deleted file mode 100644
index 3579cb3225..0000000000
--- a/org.eclipse.jdt.debug.ui/scripts/buildExtraJAR.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2005, 2015 IBM Corporation and others.
-
-     This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License 2.0
-     which accompanies this distribution, and is available at
-     https://www.eclipse.org/legal/epl-2.0/
-
-     SPDX-License-Identifier: EPL-2.0
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<project name="Build Snippet support JAR" default="build" basedir="..">
-
-	<target name="build" description="Cleans, builds and refreshes the impacted resources" depends="clean, snippetsupport.jar"/>
-
-	<!-- Empty target for "After a Clean" task (we don't want to rebuild the Jar here, e.g. on checkout). -->
-	<target name="dummy_clean"/>
-	
-	<target name="init" depends="properties">
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="build.result.folder" value="${basedir}"/>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-	</target>
-
-	<target name="snippetsupport.jar" depends="init" description="Creates the snippetsupport.jar">
-		<property name="destdir" value="${temp.folder}/snippetsupport.jar.bin"/>
-		<delete dir="${destdir}"/>
-		<mkdir dir="${destdir}"/>
-		<!-- Keep target level as low as possible!
-			snippetsupport.jar is used on the classpath of a separate VM that
-			uses the JRE that's on the build path of the scrapbook file's project. -->
-		<javac target="1.7" source="1.7" destdir="${destdir}"
-			failonerror="true"
-			verbose="false"
-			debug="on"
-			includeAntRuntime="no"
-			classpath="${basedir}/bin">
-			<src path="Snippet Support/"/>
-		</javac>
-		<mkdir dir="${build.result.folder}"/>
-		<zip destfile="${build.result.folder}/snippetsupport.jar" basedir="${destdir}"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="clean" depends="init">
-		<delete file="${build.result.folder}/snippetsupport.jar"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-</project>
diff --git a/org.eclipse.jdt.debug.ui/snippetsupport.jar b/org.eclipse.jdt.debug.ui/snippetsupport.jar
index 22488b1ccd1e9caf14068b654f08a0f04211fac8..f2fb1351dc011f8faa274727a2b46c6ea3383d31 100644
GIT binary patch
delta 851
zcmca0Jyo_oz?+$ci-CcIf#G+8djta#-~_ULT|*poJ^kGDLCQpc$~eHvHq|q|lLksl
z0x?h&q0HCO&(qB{I7H9a?X&Nh(>~t1dKY=Ub+yi&Ilno`;EM5sr;na8F(BE=477A2
zpENtv{)q<4aAuS`oY`RjXYMzHGyhn^n3HW7UBnU2Q;qKR_G4pU@Z(`%aGrdCTW0bB
z9`VV&9K39L$vKI|#hX7e2C*Tjzj;scwiy!xgBuG2gA0;+k<D8<?3wCugbmQ&Kp?>I
z))7P_g%l%`2s6Sl=wSs?3<66U)qx~j8&b#xc!NxUM+#%a<lkIU5+y*@`9<l#m_U(@
zn5@e!RX+_XnVOuFSx}scp$I4q2Lec}w~hyZJdm+4omnX*cy)uK90EW-e+Og&bx)4s
z5u1F6n-d-%Z@8tHR2e59<d&XXz{944?q-+~AX*8|0U4MC(<G#fCD;v6)GmUkJ-{QY
zh6rwyxQ8nT1@{M-a&S^Gf+Piq%MjX8k^+kM`5a*HKvI&3Sb#SxFoiKNa08(SGXsM;
HH;4xS2)wjH

delta 535
zcmbO#dqLVDz?+$civa|(duqbK3@E_@r1Oi?^-)z!T%yblRXp*WI-L2(0LGkb%xDH@
z7cg4F*&7&LBtbTDfNfHZ?)CO#V_@*(VPJ4(5ShH6(QvXIlduRQg8*0z<Oq;F2y6~y
z3SvXjd-I;;Z8IhY1~;G+UEq3or499xa}tY-K}LY2Kmeo+1U55r+B3nOa)4XP7$geu
z9wU<oGxi_=x(x~h7~VQ6P3Gm1fSaMiBc<X4H6t}SC$pe9RX;1G1Q=YX=1tDxkz%Zx
z?7%1^fFZRJD76tNr84;g4?EoCe>_r?TX<wA&t&AD?7)i<_v4jf(qo+L$f!8^KBF)n
y%o<2|PF@3)t%1o3g2EEXKByX5J}D-94yXwrHN2B6`1tua88{iv0|V+cI1~U}_iKp&