Projects
Mega:23.09
eclipse
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 3
View file
_service:tar_scm:eclipse.spec
Changed
@@ -11,7 +11,7 @@ Name: eclipse Epoch: 1 Version: 4.11 -Release: 8 +Release: 10 Summary: An open, extensible IDE License: EPL-2.0 URL: http://www.eclipse.org/ @@ -20,7 +20,6 @@ Patch0: eclipse-no-source-for-dependencies.patch Patch1: eclipse-p2-pick-up-renamed-jars.patch Patch2: eclipse-ignore-version-when-calculating-home.patch -Patch3: explicit-hamcrest.patch Patch4: eclipse-secondary-arches.patch Patch5: eclipse-debug-symbols.patch Patch12: eclipse-fix-dropins.patch @@ -47,6 +46,7 @@ Patch36: fix-objectweb-asm-version-to-increase.patch # https://git.eclipse.org/c/platform/eclipse.platform.ua.git/commit/?id=28aac2514656c669ffa16acb996c77def3d4a8d4 Patch37: CVE-2020-27225.patch +Patch38: add_loongarch-support.patch ExcludeArch: s390 %{arm} %{ix86} BuildRequires: maven-local tycho tycho-extras cbi-plugins maven-antrun-plugin BuildRequires: maven-assembly-plugin maven-dependency-plugin maven-enforcer-plugin @@ -144,7 +144,6 @@ BuildArch: noarch Provides: %{name} = %{epoch}:%{version}-%{release} Requires: %{name}-platform = %{epoch}:%{version}-%{release} junit >= 4.12 junit5 >= 5.4.0 -Requires: osgi(org.hamcrest.core) Obsoletes: eclipse-recommenders <= 2.5.4 %description jdt Eclipse Java Development Tools. This package is required to use Eclipse for @@ -170,18 +169,13 @@ %package contributor-tools Summary: Tools for Eclipse Contributors +Obsoletes: %{name}-tests <= %{epoch}:%{version}-%{release} Requires: %{name}-platform = %{epoch}:%{version}-%{release} easymock hamcrest Requires: mockito >= 2.23.9 %description contributor-tools This package contains tools specifically for Eclipse contributors. It includes SWT tools, E4 tools, Rel-Eng tools and Eclipse Test frameworks. -%package tests -Summary: Eclipse Tests -Requires: %{name}-contributor-tools = %{epoch}:%{version}-%{release} -%description tests -Eclipse Tests. - %prep %setup -T -c tar --strip-components=1 -xf %{SOURCE0} @@ -196,7 +190,6 @@ %patch0 %patch1 %patch2 -%patch3 %patch4 -p1 %patch5 %patch12 @@ -222,7 +215,21 @@ pushd eclipse.platform.ua %patch37 -p1 popd -rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/accessibility/Bug543949_ComponentExtentsTest.py +%ifarch loongarch64 +%patch38 -p1 +%endif +# Disable tests +for pom in eclipse.jdt.core{,.binaries} eclipse.jdt.debug eclipse.jdt.ui eclipse.pde.build eclipse.pde.ui \ + eclipse.platform eclipse.platform.debug eclipse.platform.releng eclipse.platform.resources eclipse.platform.runtime \ + eclipse.platform.swt eclipse.platform.team eclipse.platform.text eclipse.platform.ui eclipse.platform.ua \ + rt.equinox.bundles rt.equinox.framework rt.equinox.p2 ; do + sed -i -e '/<module>.*tests.*<\/module>/d' $pom/pom.xml +done + +%pom_disable_module bundles/org.eclipse.equinox.frameworkadmin.test rt.equinox.p2 +%pom_disable_module eclipse-junit-tests eclipse.platform.releng.tychoeclipsebuilder +%pom_disable_module ./tests/org.eclipse.e4.tools.test eclipse.platform.ui.tools + %pom_remove_dep :tycho-buildtimestamp-jgit eclipse-platform-parent %pom_remove_dep :tycho-sourceref-jgit eclipse-platform-parent %pom_xpath_remove 'pom:configuration/pom:timestampProvider' eclipse-platform-parent @@ -240,8 +247,6 @@ %pom_disable_module features/org.eclipse.equinox.sdk rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.console.jaas.fragment rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.console.ssh rt.equinox.bundles -%pom_disable_module bundles/org.eclipse.equinox.console.ssh.tests rt.equinox.bundles -%pom_disable_module bundles/org.eclipse.equinox.console.tests rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.ip rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.transforms.xslt rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.transforms.hook rt.equinox.bundles @@ -253,9 +258,7 @@ %pom_disable_module features/org.eclipse.equinox.p2.sdk rt.equinox.p2 %pom_disable_module features/org.eclipse.equinox.server.p2 rt.equinox.bundles %pom_disable_module features/org.eclipse.equinox.serverside.sdk rt.equinox.bundles -%pom_disable_module bundles/org.eclipse.equinox.p2.tests.reconciler.product rt.equinox.p2 %pom_disable_module bundles/org.eclipse.equinox.p2.artifact.optimizers rt.equinox.p2 -%pom_disable_module bundles/org.eclipse.equinox.p2.tests.optimizers rt.equinox.p2 %pom_disable_module bundles/org.eclipse.equinox.p2.artifact.processors rt.equinox.p2 %pom_disable_module org.eclipse.jdt.annotation_v1 eclipse.jdt.core %pom_xpath_remove "plugin@version='1.1.400.qualifier'" eclipse.jdt/org.eclipse.jdt-feature/feature.xml @@ -270,12 +273,11 @@ %pom_disable_module bundles/org.eclipse.equinox.http.servletbridge rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.servletbridge rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.servletbridge.template rt.equinox.bundles -%pom_disable_module ui/org.eclipse.pde.ui.tests.smartimport eclipse.pde.ui %pom_remove_plugin :maven-enforcer-plugin eclipse-platform-parent rm -rf eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.{aarch64,s390x} rm -rf rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.{aarch64,s390x} for dir in rt.equinox.binaries rt.equinox.framework/bundles eclipse.platform.swt.binaries/bundles ; do - utils/ensure_arch.sh "$dir" x86_64 aarch64 s390x + utils/ensure_arch.sh "$dir" x86_64 aarch64 s390x loongarch64 done TYCHO_ENV="<environment><os>linux</os><ws>gtk</ws><arch>%{_arch}</arch></environment>" %pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" eclipse-platform-parent @@ -332,15 +334,11 @@ fi done done -%pom_disable_module tests/org.eclipse.swt.tests.fragments.feature eclipse.platform.swt %pom_xpath_remove "pom:dependency-resolution" eclipse.platform.swt/tests/org.eclipse.swt.tests{,.gtk} %if %{bootstrap} %pom_disable_module eclipse.platform.ui.tools %pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng %pom_disable_module bundles/org.eclipse.releng.tools eclipse.platform.releng -%pom_disable_module bundles/org.eclipse.releng.tests eclipse.platform.releng -%pom_xpath_remove "plugin@id='org.eclipse.releng.tests'" \ - eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml %endif sed -i -e '/<features>/a<feature id="org.eclipse.core.runtime.feature"/>' \ eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product @@ -378,12 +376,7 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.coordinator/lib/ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.log.stream/osgi/ %mvn_package "::pom::" __noinstall -%mvn_package ":*tests*" tests -%mvn_package ":org.eclipse.equinox.frameworkadmin.test" tests -%mvn_package ":org.eclipse.equinox.p2.installer" tests -%mvn_package ":org.eclipse.jface.examples.databinding" tests -%mvn_package ":org.eclipse.pde.tools.versioning" tests -%mvn_package ":org.eclipse.update.core" tests +%mvn_package ":org.eclipse.pde.tools.versioning" contributor-tools %mvn_package "org.eclipse.test:org.eclipse.test" contributor-tools %mvn_package ":*examples*" __noinstall %mvn_package "::jar:sources{,-feature}:" sdk @@ -527,9 +520,9 @@ VER=$(echo $JAR | sed -e "s/.*${J}_\(.*\)\.jar/\1/") %mvn_artifact "org.eclipse.osgi:$J:jar:$VER" $JAR if "$J" = "osgi" ; then - %mvn_alias "org.eclipse.osgi:$J" "org.eclipse.osgi:org.eclipse.$J" "org.eclipse.tycho:org.eclipse.$J" "org.eclipse:$J" + %mvn_alias "org.eclipse.osgi:$J" "org.eclipse.osgi:org.eclipse.$J" "org.eclipse.tycho:org.eclipse.$J" "org.eclipse.platform:org.eclipse.$J" "org.eclipse:$J" else - %mvn_alias "org.eclipse.osgi:$J" "org.eclipse.osgi:org.eclipse.$J" "org.eclipse.tycho:org.eclipse.$J" + %mvn_alias "org.eclipse.osgi:$J" "org.eclipse.osgi:org.eclipse.$J" "org.eclipse.tycho:org.eclipse.$J" "org.eclipse.platform:org.eclipse.$J" fi done JAR=%{buildroot}%{_eclipsedir}/plugins/org.eclipse.equinox.http.servlet_*.jar @@ -545,13 +538,7 @@ pushd %{buildroot}/%{_eclipsedir}/ ln -s $(abs2rel %{_jnidir}/swt.jar %{_eclipsedir}) popd -unzip eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target/eclipse-junit-tests-bundle.zip \ - -d $RPM_BUILD_ROOT/%{_datadir}/ -x eclipse-testing/runtests.bat eclipse-testing/runtestsmac.sh -cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing -rm $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/eclipse-junit-tests-*.zip -sed -i '/org.eclipse.equinox.p2.reconciler.test/ d' $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/equinoxp2tests.properties -cp -r testbundle-to-eclipse-test $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/testbundle -mv $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/testbundle/eclipse-runTestBundles $RPM_BUILD_ROOT/%{_bindir}/eclipse-runTestBundles + find $RPM_BUILD_ROOT/%{_eclipsedir} -name *.so -exec chmod a+x {} \; install -d -m 755 %{buildroot}%{_eclipsedir}/.pkgs echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} @@ -754,10 +741,6 @@ %files contributor-tools -f .mfiles-contributor-tools -%files tests -f .mfiles-tests -%{_bindir}/eclipse-runTestBundles -%{_datadir}/eclipse-testing - %files equinox-osgi -f .mfiles-equinox-osgi %{_eclipsedir}/plugins/org.eclipse.osgi_* %{_eclipsedir}/plugins/org.eclipse.osgi.compatibility.state_* @@ -765,6 +748,13 @@ %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Wed Sep 27 2023 wangkai <13474090681@163.com> - 1:4.11-10 +- Disable tests for hamcrest-2.2 +- Drop tests sub-package + +* Wed Aug 09 2023 loongson <service@loongson.cn> - 1:4.11-9 +- Add Loongarch64 support + * Tue Feb 21 2023 liyanan <liyanan32@h-partners.com> - 1:4.11-8 - Add security compile options pie, relro and -fstack-protector-strong - Add glassfish-jsp and glassfish-servlet-api and glassfish-el-api version limit
View file
_service:tar_scm:add_loongarch-support.patch
Added
@@ -0,0 +1,305 @@ +diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml +index 5a2d0d8..3d3af6a 100644 +--- a/eclipse.platform.swt.binaries/pom.xml ++++ b/eclipse.platform.swt.binaries/pom.xml +@@ -56,6 +56,7 @@ + <module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</module> + <module>bundles/org.eclipse.swt.gtk.linux.arm</module> + <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module> ++ <module>bundles/org.eclipse.swt.gtk.linux.loongarch64</module> + <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module> + <module>bundles/org.eclipse.swt.gtk.linux.s390x</module> + <module>bundles/org.eclipse.swt.gtk.linux.x86</module> +diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh +index c783f77..746ea70 100755 +--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh ++++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh +@@ -112,6 +112,10 @@ case $MODEL in + SWT_ARCH=x86 + AWT_ARCH=i386 + ;; ++ "loongarch64") ++ SWT_ARCH=loongarch64 ++ AWT_ARCH=loongarch64 ++ ;; + *) + SWT_ARCH=$MODEL + AWT_ARCH=$MODEL +@@ -180,6 +184,17 @@ case $SWT_OS.$SWT_ARCH in + export PKG_CONFIG_PATH="/usr/lib64/pkgconfig/" + fi + ;; ++ "linux.loongarch64") ++ if "${CC}" = "" ; then ++ export CC=gcc ++ fi ++ if "${JAVA_HOME}" = "" ; then ++ export JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/bin/java::"` ++ fi ++ if "${PKG_CONFIG_PATH}" = "" ; then ++ export PKG_CONFIG_PATH="/usr/lib64/pkgconfig/" ++ fi ++ ;; + "linux.s390x") + if "${CC}" = "" ; then + export CC=gcc +@@ -195,7 +210,7 @@ esac + + + # For 64-bit CPUs, we have a switch +-if ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ; then ++if ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'loongarch64' ; then + SWT_PTR_CFLAGS=-DJNI64 + if -d /lib64 ; then + XLIB64=-L/usr/X11R6/lib64 +@@ -215,6 +230,11 @@ if ${MODEL} = 'x86' -a ${SWT_OS} = 'linux' ; then + export SWT_LFLAGS SWT_PTR_CFLAGS + fi + ++if ${MODEL} = 'loongarch64' -a ${SWT_OS} = 'linux' ; then ++ SWT_LFLAGS=-o32 ++ export SWT_LFLAGS SWT_PTR_CFLAGS ++fi ++ + if x`pkg-config --exists cairo && echo YES` = "xYES" ; then + func_echo_plus "Cairo found, compiling SWT support for the cairo graphics library." + MAKE_CAIRO=make_cairo +@@ -365,4 +385,4 @@ elif "${GTK_VERSION}" = "4.0" ; then + elif "${GTK_VERSION}" = "3.0" -o "${GTK_VERSION}" = "" ; then + export GTK_VERSION="3.0" + func_build_gtk3 "$@" +-fi +\ No newline at end of file ++fi +diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf +index b5b0b82..b9494a3 100644 +--- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf ++++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf +@@ -44,3 +44,8 @@ requires.9.namespace = org.eclipse.equinox.p2.iu + requires.9.name = org.eclipse.swt.gtk.linux.x86 + requires.9.range = $version$,$version$ + requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86)(!(org.eclipse.swt.buildtime=true))) ++ ++requires.10.namespace = org.eclipse.equinox.p2.iu ++requires.10.name = org.eclipse.swt.gtk.linux.loongarch64 ++requires.10.range = $version$,$version$ ++requires.10.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=loongarch64)(!(org.eclipse.swt.buildtime=true))) +diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml +index bf4faf7..04a0e3d 100644 +--- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml ++++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml +@@ -69,6 +69,10 @@ + <param name="library_count" value="8"/> + <param name="fragment" value="org.eclipse.swt.gtk.linux.x86_64"/> + </antcall> ++ <antcall target="check_fragment_libraries"> ++ <param name="library_count" value="8"/> ++ <param name="fragment" value="org.eclipse.swt.gtk.linux.loongarch64"/> ++ </antcall> + <antcall target="check_fragment_libraries"> + <param name="library_count" value="4"/> + <param name="fragment" value="org.eclipse.swt.win32.win32.x86_64"/> +@@ -80,12 +84,12 @@ + <property name="checkdir" value="~/build/check_libraries"/> + <property name="library_count" value="23"/> + <property name="fragment" value=""/> +- <fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**"> ++ <fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.loongarch64/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**"> + <filename regex="0-90-90-90-9."/> + <filename regex="${swt_version}."/> + <exclude name="**/.git/**"/> + </fileset> +- <fileset id="not_match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**"> ++ <fileset id="not_match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**"> + <filename regex="0-90-90-90-9."/> + <filename regex="${swt_version}." negate="true"/> + <exclude name="**/.git/**"/> +@@ -122,6 +126,13 @@ + trust="true" + outputproperty="m_linux_x86_64_output" + command="hostname"/> ++ <sshexec host="${m_linux_loongarch64}" ++ username="swtbuild" ++ keyfile="${keyfile}" ++ failonerror="false" ++ trust="true" ++ outputproperty="m_linux_loongarch64_output" ++ command="hostname"/> + <sshexec host="${m_linux_ppc64le}" + port="2256" + username="swtbuild" +diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml +index 57809d6..c7b2d41 100644 +--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml ++++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml +@@ -44,6 +44,7 @@ + <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/> + <plugin id="org.eclipse.equinox.launcher.gtk.linux.arm" /> + <plugin id="org.eclipse.equinox.launcher.gtk.linux.aarch64" /> ++ <plugin id="org.eclipse.equinox.launcher.gtk.linux.loongarch64" /> + <plugin id="org.eclipse.equinox.launcher.gtk.linux.s390x" /> + <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86" /> + <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" /> +diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh +index 43136d3..a905ab5 100755 +--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh ++++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh +@@ -101,6 +101,11 @@ case $defaultOS in + defaultJavaHome=`readlink -f /usr/bin/java | sed "s:jre/bin/java::"` + OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" + ;; ++ "loongarch64") ++ defaultOSArch="loongarch64" ++ defaultJava=DEFAULT_JAVA_EXEC ++ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" ++ ;; + "s390") + defaultOSArch="s390" + defaultJava=DEFAULT_JAVA_EXEC +diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml +index cce14c4..c2db96e 100644 +--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml ++++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml +@@ -129,6 +129,7 @@ + <include name="cocoa/macosx/x86_64/**/*"/> + <include name="gtk/linux/arm/**/*"/> + <include name="gtk/linux/aarch64/**/*"/> ++ <include name="gtk/linux/loongarch64/**/*"/> + <include name="gtk/linux/ppc64le/**/*"/> + <include name="gtk/linux/s390x/**/*"/> + <include name="gtk/linux/x86/**/*"/> +diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties +index 741e9b3..6146da7 100644 +--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties ++++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties +@@ -29,3 +29,6 @@ root.macosx.cocoa.x86_64.permissions.755=Contents/MacOS/${launcherName} + root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root + root.linux.gtk.x86_64.permissions.755=libcairo-swt.so + ++root.linux.gtk.loongarch64=bin/gtk/linux/loongarch64,gtk_root ++root.linux.gtk.loongarch64.permissions.755=launcher ++ +diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml +index 44c1737..02de3f1 100644 +--- a/rt.equinox.framework/pom.xml ++++ b/rt.equinox.framework/pom.xml +@@ -61,6 +61,18 @@ + <module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</module> + </modules> + </profile> ++ <profile> ++ <id>build-native-launchers-gtk.linux.loongarch64</id> ++ <activation> ++ <property> ++ <name>native</name> ++ <value>gtk.linux.loongarch64</value> ++ </property> ++ </activation> ++ <modules> ++ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.loongarch64</module> ++ </modules> ++ </profile> + <profile> + <id>build-native-launchers-gtk.linux.aarch64</id> + <activation> +@@ -110,6 +122,7 @@ + <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64</module> + <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module> + <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64</module> ++ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.loongarch64</module> + <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86_64</module> + + <module>bundles/org.eclipse.osgi.tests</module> +diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml +index 134aaea..3dd4d45 100644 +--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml ++++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml +@@ -324,6 +324,16 @@ + version="0.0.0" + fragment="true"/> + ++ <plugin ++ id="org.eclipse.equinox.launcher.gtk.linux.loongarch64" ++ os="linux" ++ ws="gtk" ++ arch="loongarch64" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ fragment="true"/> ++ + <plugin + id="org.eclipse.equinox.launcher.gtk.linux.s390x" + os="linux" +@@ -468,6 +478,17 @@ + fragment="true" + unpack="false"/> + ++ <plugin ++ id="org.eclipse.swt.gtk.linux.loongarch64" ++ os="linux" ++ ws="gtk" ++ arch="loongarch64" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ fragment="true" ++ unpack="false"/> ++ + <plugin + id="org.eclipse.swt.gtk.linux.x86" + os="linux" +diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml +index c7fab60..af3d531 100755 +--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml ++++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml +@@ -51,6 +51,16 @@ + version="0.0.0" + fragment="true"/> + ++ <plugin ++ id="org.eclipse.equinox.launcher.gtk.linux.loongarch64" ++ os="linux" ++ ws="gtk" ++ arch="loongarch64" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ fragment="true"/> ++ + <plugin + id="org.eclipse.equinox.launcher.win32.win32.x86_64" + os="win32" +diff --git a/eclipse.platform.swt/pom.xml b/eclipse.platform.swt/pom.xml +index b101bc0..22e1590 100644 +--- a/eclipse.platform.swt/pom.xml ++++ b/eclipse.platform.swt/pom.xml +@@ -80,7 +80,7 @@ + <os-jvm-flags>-XstartOnFirstThread</os-jvm-flags> + </properties> + </profile> +- <profile> ++ <!--profile> + <id>unix</id> + <activation> + <os> +@@ -91,7 +91,7 @@ + <modules> + <module>tests/org.eclipse.swt.tests.gtk</module> + </modules> +- </profile> ++ </profile--> + <profile> + <id>windows</id> + <activation> +diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties +index 7f6dc63..5c81817 100644 +--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties ++++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties +@@ -44,3 +44,6 @@ root.linux.gtk.s390x.permissions.755=launcher + + root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root + root.linux.gtk.x86.permissions.755=launcher ++ ++root.linux.gtk.loongarch64=bin/gtk/linux/loongarch64,gtk_root ++root.linux.gtk.loongarch64.permissions.755=launcher
View file
_service:tar_scm:eclipse-feature-plugins-to-category-ius.patch
Changed
@@ -20,13 +20,12 @@ index 06887d901..364cae9d8 100644 --- a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml +++ b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml -@@ -19,6 +19,23 @@ +@@ -19,6 +19,22 @@ %license </license> + <requires> + <import plugin="org.junit" /> -+ <import plugin="org.hamcrest.core" /> + <import plugin="org.junit.jupiter.api" /> + <import plugin="org.junit.jupiter.engine" /> + <import plugin="org.junit.jupiter.migrationsupport" /> @@ -418,15 +417,13 @@ index a3a7d14a0..f0dab84a3 100644 --- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml -@@ -19,6 +19,15 @@ +@@ -19,6 +19,13 @@ %license </license> + <requires> + <import plugin="org.apache.commons.fileupload" /> + <import plugin="org.apache.commons.io" /> -+ <import plugin="org.hamcrest.core" /> -+ <import plugin="org.hamcrest.library" /> + <import plugin="org.mockito" /> + <import plugin="org.objenesis" /> + </requires> @@ -501,15 +498,13 @@ index 1dcc94c1c..2a4871027 100644 --- a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml -@@ -19,6 +19,14 @@ +@@ -19,6 +19,12 @@ %license </license> + <requires> + <import plugin="org.junit" /> + <import plugin="org.easymock" /> -+ <import plugin="org.hamcrest.core" /> -+ <import plugin="org.hamcrest.library" /> + <import plugin="org.mockito" /> + </requires> +
View file
_service:tar_scm:explicit-hamcrest.patch
Deleted
@@ -1,19 +0,0 @@ ---- eclipse.jdt.debug/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF.orig 2018-08-20 12:54:25.245305107 +0100 -+++ eclipse.jdt.debug/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF 2018-08-20 12:54:37.952261537 +0100 -@@ -33,6 +33,7 @@ - org.eclipse.ui.workbench.texteditor;resolution:=optional, - org.eclipse.ui.editors;resolution:=optional, - org.junit, -+ org.hamcrest.core, - org.eclipse.core.resources, - org.eclipse.core.variables, - org.eclipse.ui, ---- eclipse.platform.ui/tests/org.eclipse.tests.urischeme/META-INF/MANIFEST.MF.orig 2018-08-20 13:22:04.987695821 +0100 -+++ eclipse.platform.ui/tests/org.eclipse.tests.urischeme/META-INF/MANIFEST.MF 2018-08-20 13:22:28.507613518 +0100 -@@ -7,4 +7,5 @@ - Fragment-Host: org.eclipse.urischeme;bundle-version="1.0.0" - Automatic-Module-Name: org.eclipse.urischeme.tests - Bundle-RequiredExecutionEnvironment: JavaSE-1.8 --Require-Bundle: org.junit;bundle-version="4.12.0,5.0.0)" -+Require-Bundle: org.junit;bundle-version="4.12.0,5.0.0)", -+ org.hamcrest.core;bundle-version="1.3.0"
View file
_service
Changed
@@ -2,7 +2,7 @@ <service name="tar_scm"> <param name="url">git@gitee.com:src-openeuler/eclipse.git</param> <param name="scm">git</param> - <param name="revision">openEuler-23.09</param> + <param name="revision">master</param> <param name="exclude">*</param> <param name="extract">*</param> </service>
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2