On 03/25/2015 07:50 AM, Roland Grunberg wrote:
>> Okay, now I'm seeing jgit compiler error with ptp:
>>
>> ERROR] Failed to execute goal
>> org.eclipse.tycho:tycho-compiler-plugin:0.21.0:compile (default-compile) on
>> project org.eclipse.ptp.rdt.sync.git.core: Compilation failure: Compilation
>> failure:
>> [ERROR]
>> /export/home/orion/fedora/eclipse-ptp/org.eclipse.ptp-9bb29a9a48849f848111613a27a5dff793123e83/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/internal/rdt/sync/git/core/GitSyncFileFilter.java:[119]
>> [ERROR] return (rule.getNegation() ? "!" : "") + rule.getPattern() +
>> (rule.dirOnly() ? "/" : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>> //$NON-NLS-4$
>> [ERROR] ^^^^^^^^^^
>> [ERROR] The method getPattern() is undefined for the type FastIgnoreRule
>> [ERROR]
>> /export/home/orion/fedora/eclipse-ptp/org.eclipse.ptp-9bb29a9a48849f848111613a27a5dff793123e83/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/internal/rdt/sync/git/core/GitSyncFileFilter.java:[124]
>> [ERROR] return rule.getPattern() + (rule.dirOnly() ? "/" : ""); //$NON-NLS-1$
>> //$NON-NLS-2$
>> [ERROR] ^^^^^^^^^^
>> [ERROR] The method getPattern() is undefined for the type FastIgnoreRule
>> [ERROR] 2 problems (2 errors)
>>
>> Which appears to be caused by Fedora updating to jgit 3.7.0, but Eclipse Luna
>> still using 3.4.2. Anyone have some patches lying around to fix this?
>
> I don't know if anyone has encountered it yet, but FastIgnoreRule seems to
> have been patched in rawhide [1]. Could you try removing that and seeing if it
> works ? Alex might be able to shed some light on why it was needed to begin
> with.
>
> As far as I can tell FastIgnoreRule completely restricts access to the
> underlying pattern, but IgnoreRule should still work.
Ah, thanks, that was added by Alexander Kurtakov
commit 85e4c75ab8d99dac40c13cd0f187a424917ae367
Author: Alexander Kurtakov <akurtako@xxxxxxxxxx>
Date: Thu Jan 15 15:46:44 2015 +0200
Adapt to egit changes.
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index c86207e..dea27b8 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -21,7 +21,7 @@
Summary: Eclipse Parallel Tools Platform
Name: eclipse-ptp
Version: 8.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/ptp
@@ -333,6 +333,8 @@ Provides support for remote services using RSE.
%patch2 -p1 -b .repository
sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
+sed -i -e
's/org.eclipse.jgit.ignore.IgnoreRule/org.eclipse.jgit.ignore.FastIgnoreRule/g' rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/internal/rdt/sync/git/core/GitSyncFileFilter.java
+
# Remove dep on ant-trax
%pom_remove_dep ant:ant-trax rdt/org.eclipse.ptp.rdt.core.remotejars
%pom_remove_dep ant:ant-trax rms/org.eclipse.ptp.rm.lml.da.server
@@ -489,6 +491,9 @@ cp -p debug/org.eclipse.ptp.debug.sdm/bin/sdm
%{buildroot}%{_libdir}/ptp/
%changelog
+* Thu Jan 15 2015 Alexander Kurtakov <akurtako@xxxxxxxxxx> 8.1.0-3
+- Adapt to egit changes.
+
* Tue Dec 9 2014 Alexander Kurtakov <akurtako@xxxxxxxxxx> 8.1.0-2
- Fix build.
Without it I get:
[ERROR] Failed to execute goal
org.eclipse.tycho:tycho-compiler-plugin:0.21.0:compile (default-compile) on
project org.eclipse.ptp.rdt.sync.git.core: Compilation failure: Compilation
failure:
[ERROR]
/export/home/orion/fedora/eclipse-ptp/org.eclipse.ptp-9bb29a9a48849f848111613a27a5dff793123e83/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/internal/rdt/sync/git/core/GitSyncFileFilter.java:[250]
[ERROR] for (org.eclipse.jgit.ignore.IgnoreRule rule : node.getRules()) {
[ERROR] ^^^^^^^^^^^^^^^
[ERROR] Type mismatch: cannot convert from element type FastIgnoreRule to
IgnoreRule
[ERROR] 1 problem (1 error)
I suspect I need a more targeted patch rather than a sed fix. I found the
upsream commit on their master branch supporting jgit 3.7 and back ported that.
Thanks again,
Orion
--
Orion Poplawski
Technical Manager 303-415-9701 x222
NWRA, Boulder/CoRA Office FAX: 303-415-9702
3380 Mitchell Lane orion@xxxxxxxx
Boulder, CO 80301 http://www.nwra.com
--
java-devel mailing list
java-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/java-devel
