orion pushed to eclipse-ptp (f21). "Various fixes: (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Mar 25 14:51:36 UTC 2015
>From 1845f899a83e439a62a0fbd1a54b51b6d51a1ecf Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at cora.nwra.com>
Date: Wed, 25 Mar 2015 08:49:40 -0600
Subject: Various fixes:
- Update upstream source to fix compilation against CDT
- Use upstream patch for jgit 3.7.0 compatibility
- Remove unavailable components from repository build
diff --git a/eclipse-ptp-jgit.patch b/eclipse-ptp-jgit.patch
new file mode 100644
index 0000000..955e6f5
--- /dev/null
+++ b/eclipse-ptp-jgit.patch
@@ -0,0 +1,191 @@
+diff -up org.eclipse.ptp-9bb29a9a48849f848111613a27a5dff793123e83/pom.xml.jgit org.eclipse.ptp-9bb29a9a48849f848111613a27a5dff793123e83/pom.xml
+diff -up org.eclipse.ptp-9bb29a9a48849f848111613a27a5dff793123e83/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/internal/rdt/sync/git/core/GitSyncFileFilter.java.jgit org.eclipse.ptp-9bb29a9a48849f848111613a27a5dff793123e83/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/internal/rdt/sync/git/core/GitSyncFileFilter.java
+--- org.eclipse.ptp-9bb29a9a48849f848111613a27a5dff793123e83/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/internal/rdt/sync/git/core/GitSyncFileFilter.java.jgit 2015-03-17 09:26:26.000000000 -0600
++++ org.eclipse.ptp-9bb29a9a48849f848111613a27a5dff793123e83/rdt/org.eclipse.ptp.rdt.sync.git.core/src/org/eclipse/ptp/internal/rdt/sync/git/core/GitSyncFileFilter.java 2015-03-25 08:31:55.385720126 -0600
+@@ -58,13 +58,13 @@ public class GitSyncFileFilter extends A
+ }
+
+ public class GitIgnoreRule extends AbstractIgnoreRule {
+- private final org.eclipse.jgit.ignore.IgnoreRule rule;
++ private final org.eclipse.jgit.ignore.FastIgnoreRule rule;
+
+ public GitIgnoreRule(String pattern, boolean exclude) {
+ if (!exclude) {
+ pattern = "!" + pattern; //$NON-NLS-1$
+ }
+- rule = new org.eclipse.jgit.ignore.IgnoreRule(pattern);
++ rule = new org.eclipse.jgit.ignore.FastIgnoreRule(pattern);
+ }
+
+ private String charEscapify(String inputString) {
+@@ -92,10 +92,10 @@ public class GitSyncFileFilter extends A
+ if (!exclude) {
+ pattern = "!" + pattern; //$NON-NLS-1$
+ }
+- rule = new org.eclipse.jgit.ignore.IgnoreRule(pattern);
++ rule = new org.eclipse.jgit.ignore.FastIgnoreRule(pattern);
+ }
+
+- private GitIgnoreRule(org.eclipse.jgit.ignore.IgnoreRule rule) {
++ private GitIgnoreRule(org.eclipse.jgit.ignore.FastIgnoreRule rule) {
+ this.rule = rule;
+ }
+
+@@ -116,19 +116,24 @@ public class GitSyncFileFilter extends A
+
+ @Override
+ public String toString() {
+- return (rule.getNegation() ? "!" : "") + rule.getPattern() + (rule.dirOnly() ? "/" : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
++ return rule.toString();
+ }
+
+ @Override
+ public String getPattern() {
+- return rule.getPattern() + (rule.dirOnly() ? "/" : ""); //$NON-NLS-1$ //$NON-NLS-2$
++ String pattern = rule.toString();
++ if (pattern.startsWith("!")) { //$NON-NLS-1$
++ pattern = pattern.substring(1);
++ }
++ return pattern;
+ }
+ }
+
+ /**
+ * Construct a new Git file filter for the given JGit repository
++ *
+ * @param repo
+- * the JGit repository
++ * the JGit repository
+ */
+ GitSyncFileFilter(JGitRepo repo) {
+ this.jgitRepo = repo;
+@@ -138,9 +143,9 @@ public class GitSyncFileFilter extends A
+ * Construct a new Git file filter for the given JGit repository, adding the rules from the given filter.
+ *
+ * @param repo
+- * the JGit repository
++ * the JGit repository
+ * @param filter
+- * an abstract file filter
++ * an abstract file filter
+ */
+ public GitSyncFileFilter(JGitRepo repo, AbstractSyncFileFilter filter) {
+ this.jgitRepo = repo;
+@@ -149,6 +154,7 @@ public class GitSyncFileFilter extends A
+
+ /*
+ * (non-Javadoc)
++ *
+ * @see org.eclipse.ptp.rdt.sync.core.AbstractSyncFileFilter#addPattern(java.lang.String, boolean, int)
+ */
+ @Override
+@@ -172,6 +178,7 @@ public class GitSyncFileFilter extends A
+
+ /*
+ * (non-Javadoc)
++ *
+ * @see org.eclipse.ptp.rdt.sync.core.AbstractSyncFileFilter#addPattern(org.eclipse.core.resources.IResource, boolean, int)
+ */
+ @Override
+@@ -203,6 +210,7 @@ public class GitSyncFileFilter extends A
+
+ /*
+ * (non-Javadoc)
++ *
+ * @see org.eclipse.ptp.rdt.sync.core.AbstractSyncFileFilter#saveFilter()
+ */
+ @Override
+@@ -236,8 +244,9 @@ public class GitSyncFileFilter extends A
+
+ /**
+ * Load filtering rules from the file system
++ *
+ * @throws IOException
+- * on problems reading from the file system
++ * on problems reading from the file system
+ */
+ public void loadFilter() throws IOException {
+ Repository repo = jgitRepo.getRepository();
+@@ -247,7 +256,7 @@ public class GitSyncFileFilter extends A
+ try {
+ IgnoreNode node = new IgnoreNode();
+ node.parse(in);
+- for (org.eclipse.jgit.ignore.IgnoreRule rule : node.getRules()) {
++ for (org.eclipse.jgit.ignore.FastIgnoreRule rule : node.getRules()) {
+ rules.add(new GitIgnoreRule(rule));
+ }
+ } finally {
+@@ -278,11 +287,12 @@ public class GitSyncFileFilter extends A
+ /**
+ * Returns ignored files in the index
+ *
+- * @param ref reference to compute list of files for. If null use index.
++ * @param ref
++ * reference to compute list of files for. If null use index.
+ *
+ * @return set of ignored files
+ * @throws IOException
+- * on file system problems
++ * on file system problems
+ */
+ public Set<String> getIgnoredFiles(RevTree ref) throws IOException {
+ Repository repo = jgitRepo.getRepository();
+@@ -325,6 +335,7 @@ public class GitSyncFileFilter extends A
+
+ /**
+ * Return the JGit repository for this filter
++ *
+ * @return JGit repository
+ */
+ public JGitRepo getRepo() {
+@@ -347,13 +358,13 @@ public class GitSyncFileFilter extends A
+ *
+ * @return different files
+ * @throws IOException
+- * on file system problems
++ * on file system problems
+ */
+ public DiffFiles getDiffFiles() throws IOException {
+ final int INDEX = 0;
+ final int WORKDIR = 1;
+
+- assert(!jgitRepo.inUnresolvedMergeState());
++ assert (!jgitRepo.inUnresolvedMergeState());
+
+ Repository repo = jgitRepo.getRepository();
+ TreeWalk treeWalk = new TreeWalk(repo);
+@@ -366,7 +377,7 @@ public class GitSyncFileFilter extends A
+ treeWalk.setFilter(new IndexDiffFilter(INDEX, WORKDIR, false));
+ DiffFiles diffFiles = new DiffFiles();
+ int ignoreDepth = Integer.MAX_VALUE; // if the current subtree is ignored - than this is the depth at which ignoring
+- // starts
++ // starts
+ while (treeWalk.next()) {
+ DirCacheIterator dirCacheIterator = treeWalk.getTree(INDEX, DirCacheIterator.class);
+ String path = treeWalk.getPathString();
+@@ -399,13 +410,13 @@ public class GitSyncFileFilter extends A
+ /**
+ * For testing
+ *
+- * @param args
+- * work folder, Git folder
++ * @param args
++ * work folder, Git folder
+ *
+ * @throws GitAPIException
+- * on JGit-specific problems
++ * on JGit-specific problems
+ * @throws IOException
+- * on file system problems
++ * on file system problems
+ */
+ public static void main(String[] args) throws IOException, GitAPIException {
+ JGitRepo jgitRepo = new JGitRepo(new Path(args[0]), null);
+@@ -419,6 +430,7 @@ public class GitSyncFileFilter extends A
+
+ /*
+ * (non-Javadoc)
++ *
+ * @see org.eclipse.ptp.rdt.sync.core.AbstractSyncFileFilter#clone()
+ */
+ @Override
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index 658d843..2c52fec 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -3,7 +3,7 @@
%global pdereq 1:4.2.0
%global rsereq 3.5
%global ptp_build_id 201502031415
-%global ptp_git_tag e6781abcbe35d3016f9ec8a943dc8a880780021a
+%global ptp_git_tag 9bb29a9a48849f848111613a27a5dff793123e83
%ifarch %{ix86}
%define eclipse_arch x86
@@ -21,7 +21,7 @@
Summary: Eclipse Parallel Tools Platform
Name: eclipse-ptp
Version: 8.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/ptp
@@ -40,6 +40,8 @@ Patch0: eclipse-ptp-noremote.patch
Patch1: eclipse-ptp-tycho-build.patch
# Add <repository> for tycho-eclipserun-plugin
Patch2: eclipse-ptp-repository.patch
+# Support new jgit - upstream commit 07338503d501cf94f8b7d50398af3c811e748ff9
+Patch3: eclipse-ptp-jgit.patch
# Remove some unneeded dependencies
BuildRequires: java-devel >= 1.5.0
@@ -331,10 +333,9 @@ Provides support for remote services using RSE.
%patch0 -p2 -b .noremote
%patch1 -p2 -b .tycho-build
%patch2 -p1 -b .repository
+%patch3 -p1 -b .jgit
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
@@ -349,6 +350,9 @@ rm -r releng/org.eclipse.ptp.linux/os/linux
# This depends on rdt.server.dstor
%pom_disable_module releng/org.eclipse.ptp.rdt.remotetools-feature
+# Remove unavailable items from the repo build
+%pom_xpath_remove "feature[@id='org.eclipse.remote.source']" releng/org.eclipse.ptp.repo/category.xml
+
%build
export JAVA_HOME=%{java_home}
@@ -491,6 +495,11 @@ cp -p debug/org.eclipse.ptp.debug.sdm/bin/sdm %{buildroot}%{_libdir}/ptp/
%changelog
+* Wed Mar 25 2015 Orion Poplawski <orion at cora.nwra.com> 8.1.1-2
+- Update upstream source to fix compilation against CDT
+- Use upstream patch for jgit 3.7.0 compatibility
+- Remove unavailable components from repository build
+
* Mon Mar 9 2015 Orion Poplawski <orion at cora.nwra.com> 8.1.1-1
- Update to 8.1.1
diff --git a/sources b/sources
index e42c075..c0cca18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56be30189cb5d03cb2bb9261ead13b5d org.eclipse.ptp-e6781abcbe35d3016f9ec8a943dc8a880780021a.tar.bz2
+11b6f6cd1320dd07e69fa70e2b65c80f org.eclipse.ptp-9bb29a9a48849f848111613a27a5dff793123e83.tar.bz2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/eclipse-ptp.git/commit/?h=f21&id=1845f899a83e439a62a0fbd1a54b51b6d51a1ecf
--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390
More information about the scm-commits
mailing list