Группа :: Разработка/Java
Пакет: eclipse-swt
навигация по пакетам
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: eclipse-swt-avoid-javascript-at-build.patch
Скачать
Скачать
From dd7d5dd0a820b3efd1a7955a7b80c881a40ddafc Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Sat, 21 Mar 2020 15:29:00 +0000
Subject: [PATCH] Avoid the need to have javascript interpreter in the build
root
---
.../bundles/binaries-parent/pom.xml | 17 ------
.../bundles/org.eclipse.swt/buildSWT.xml | 53 ++++---------------
2 files changed, 11 insertions(+), 59 deletions(-)
diff --git a/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml b/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml
index 4d209cfdc..eab439ae5 100644
--- a/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml
+++ b/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml
@@ -74,23 +74,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.mozilla</groupId>
- <artifactId>rhino-runtime</artifactId>
- <version>1.7.14</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.10.12</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-apache-bsf</artifactId>
- <version>1.10.12</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml
index 9d4bb1b6f..6c1cdf690 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml
@@ -252,9 +252,6 @@
<antcall target="build_classes">
<param name="cp" value=".classpath_gtk"/>
</antcall>
- <antcall target="build_classes">
- <param name="cp" value=".classpath_win32"/>
- </antcall>
<antcall target="check_preprocessing"/>
</target>
@@ -283,6 +280,11 @@
<ant antfile="${tmpdir}/copy.xml" target="copy_files"/> <javac includeantruntime="false" srcdir="${buildDir}" encoding="utf8"></javac>+ <javadoc destdir="docs/api" author="true" version="true" use="true" windowtitle="Eclipse SWT API" encoding="utf8">
+ <packageset dir="${buildDir}" defaultexcludes="yes">+ <include name="**/**"/>
+ </packageset>
+ </javadoc>
</target>
<!-- common build tasks -->
@@ -399,27 +401,8 @@
<!-- Set swt_version, new_version, (and rev, min_ver, maj_ver, new_rev, new_min_ver, new_maj_ver) from the make_common.mak -->
<target name="get_version" unless="swt_version">
<loadproperties srcFile="${repo.src}/${file_make_common}"/>- <script language="javascript">
- <![CDATA[
- rev = project.getProperty("rev");- min_ver = project.getProperty("min_ver");- maj_ver = project.getProperty("maj_ver");- new_rev = parseInt(rev) + 1;
- new_min_ver = min_ver;
- new_maj_ver = maj_ver;
- one = new_maj_ver;
- two = new_min_ver;
- three = new_rev;
- four = 0;
- project.setProperty("new_rev", new_rev);- project.setProperty("new_min_ver", new_min_ver);- project.setProperty("new_maj_ver", new_maj_ver);- project.setProperty("new_comma_ver", one + "," + two + "," + three + "," + four);- ]]>
- </script>
<property name="swt_version" value="${maj_ver}${min_ver}r${rev}"/>- <property name="new_version" value="${new_maj_ver}${new_min_ver}r${new_rev}"/>- <echo>Version=${swt_version}; New=${new_version}; New comma_ver=${new_comma_ver}</echo>+ <echo>Version=${swt_version}</echo></target>
<target name="get_new_release_version" unless="min_ver">