Skip to content

Commit

Permalink
Fix javadoc build in platform.doc.isv
Browse files Browse the repository at this point in the history 
Hardcodes the old annotation/inject jars (with versions) in order to
make it build. Ugly but can't find another way to fix it for M2 - as
they are the older versions not much churn should be there.
Also removes some unused build machinery to not confuse more.
  • Loading branch information
@akurtakov
akurtakov committed Oct 17, 2023
1 parent c85169f commit 8ac1938
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 205 deletions.
26 changes: 1 addition & 25 deletions eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
</condition>

<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}" />
<replace file="${basedir}/${optionsFile}" token="@rt@" value="target/dependency/jakarta.annotation-api-1.3.5.jar:target/dependency/jakarta.inject-api-1.0.5.jar" />

<!-- expand _* to actual version -->
<!-- prepare ${replaceFile} with all files and folders from workspace -->
Expand All @@ -170,8 +170,6 @@

<!-- strip away leading path -->
<replaceregexp file="${basedir}/${replaceFile}" flags="g" match="(?m)^.*/([^/]*)$$" replace="\1" />
<!-- remove lines without version pattern "[_-]\d+\.\d+\.\d+"; version pattern is a workaround for bug 402392 -->
<replaceregexp file="${basedir}/${replaceFile}" flags="g" match="(?m)^(.*[-_]\d+\.\d+(\.\d+)?.*)|(.*)$$" replace="\1" />
<!-- create "<aa>_*[.jar]=<aa><version>[.jar]" property for lines with a version -->
<replaceregexp file="${basedir}/${replaceFile}" flags="g" match="(?m)^(.*)[-_]\d+\.\d+(\.\d+)?.*?(.jar)?$$" replace="\1_*\3=\0" />

Expand Down Expand Up @@ -201,25 +199,6 @@
<arg line="@${basedir}/${optionsFile} -J-Xmx1000M ${env.JAVA_DOC_PROXIES}" />
</exec>

<!-- Debugging: Add a snapshot of the workspace contents:
<fileset dir="${basedir}/.." id="fileSet">
<include name="*"/>
<include name="*/*"/>
</fileset>
<dirset dir="${basedir}/.." id="dirSet">
<include name="*"/>
<include name="*/*"/>
</dirset>
<pathconvert property="fileList" refid="fileSet" dirsep="/" pathsep="&#xA;"/>
<pathconvert property="dirList" refid="dirSet" dirsep="/" pathsep="&#xA;"/>
<echo file="doc.bin.log" append="true">
Content of ${basedir}/..:
Files:
${fileList}
Directories:
${dirList}
</echo>
-->

<!--workaround for bug 409511, bug 101048-->
<replace dir="reference/api" token="='/../misc/api-usage-rules.html" value="='./../misc/api-usage-rules.html">
Expand All @@ -228,8 +207,5 @@ ${dirList}

</target>

<target name="createDocZip">
<zip zipfile="${basedir}/doc.zip" basedir="${basedir}" includes="book.css, notices.html, about.html, concepts/**, gettingStarted/**, images/**, reference/**, porting/**, tasks/**,samples/**,guide/**,questions/**" />
</target>
</project>

152 changes: 0 additions & 152 deletions eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/customBuildCallbacks.xml
View file

This file was deleted.

22 changes: 0 additions & 22 deletions eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties
View file

This file was deleted.

49 changes: 43 additions & 6 deletions eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<requirement>
<type>eclipse-plugin</type>
<id>jakarta.annotation-api</id>
<versionRange>0.0.0</versionRange>
<versionRange>[1,2)</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
Expand All @@ -89,7 +89,7 @@
<requirement>
<type>eclipse-plugin</type>
<id>jakarta.inject.jakarta.inject-api</id>
<versionRange>0.0.0</versionRange>
<versionRange>[1,2)</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
Expand Down Expand Up @@ -259,12 +259,12 @@
<requirement>
<type>eclipse-plugin</type>
<id>jakarta.inject.jakarta.inject-api</id>
<versionRange>0.0.0</versionRange>
<versionRange>[2,3)</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
<id>jakarta.annotation-api</id>
<versionRange>0.0.0</versionRange>
<versionRange>[2,3)</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
Expand All @@ -273,6 +273,38 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-deps</id>
<phase>compile</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
</execution>
<execution>
<id>copy</id>
<phase>compile</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>1.3.5</version>
</artifactItem>
<artifactItem>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>1.0.5</version>
</artifactItem>
</artifactItems>
<!-- other configurations here -->
</configuration>
</execution>

</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
Expand All @@ -291,7 +323,6 @@
<args>target/workspace</args>
<args>-application</args>
<args>org.eclipse.ant.core.antRunner</args>
<args>-quiet</args>
<args>-buildfile</args>
<args>buildDoc.xml</args>
<args>-Dbasedir.properties=cbi_basedirs.properties</args>
Expand Down Expand Up @@ -330,7 +361,13 @@
<dependency>
<artifactId>jakarta.annotation-api</artifactId>
<type>eclipse-plugin</type>
</dependency>
<version>1.3.5</version>
</dependency>
<dependency>
<artifactId>jakarta.annotation-api</artifactId>
<type>eclipse-plugin</type>
<version>2.1.1</version>
</dependency>
<dependency>
<artifactId>org.eclipse.equinox.launcher</artifactId>
<type>eclipse-plugin</type>
Expand Down

0 comments on commit 8ac1938

Please sign in to comment.