[eclipse-ptp] 04/13: Remove cdt-upc dependency

[Jakub Adam]

This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository eclipse-ptp.

commit bafec6c2c3ef99bd09c4193636b611b78f59471b
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Jul 4 14:44:17 2013 +0200

    Remove cdt-upc dependency
---
 debian/patches/remove-cdt-upc-dependency.patch | 66 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 2 files changed, 67 insertions(+)

diff --git a/debian/patches/remove-cdt-upc-dependency.patch b/debian/patches/remove-cdt-upc-dependency.patch
new file mode 100644
index 0000000..b1630b8
--- /dev/null
+++ b/debian/patches/remove-cdt-upc-dependency.patch
@@ -0,0 +1,66 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Thu, 4 Jul 2013 14:43:42 +0200
+Subject: remove-cdt-upc-dependency
+
+---
+ .../ptp/internal/rdt/core/RemoteIndexerInfoProviderFactory.java |    6 +++---
+ .../scannerconfig/offline/OfflineBuildOutputParserUtility.java  |    7 ++++---
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/RemoteIndexerInfoProviderFactory.java b/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/RemoteIndexerInfoProviderFactory.java
+index c631359..3842619 100644
+--- a/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/RemoteIndexerInfoProviderFactory.java
++++ b/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/RemoteIndexerInfoProviderFactory.java
+@@ -23,7 +23,7 @@ import java.util.Set;
+ 
+ import org.eclipse.cdt.core.CCorePlugin;
+ import org.eclipse.cdt.core.dom.ILinkage;
+-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
++//import org.eclipse.cdt.core.dom.upc.UPCLanguage;
+ import org.eclipse.cdt.core.language.ProjectLanguageConfiguration;
+ import org.eclipse.cdt.core.model.ICElement;
+ import org.eclipse.cdt.core.model.ILanguage;
+@@ -353,9 +353,9 @@ public class RemoteIndexerInfoProviderFactory {
+ 			if(CCorePlugin.CONTENT_TYPE_ASMSOURCE.equals(ct.getId())){
+ 				languageMap.put(IRemoteIndexerInfoProvider.ASM_LANGUAGEID_key, languageID);
+ 			}
+-			if(UPCLanguage.UPC_CONTENT_TYPE_ID.equals(ct.getId())){
++			/*if(UPCLanguage.UPC_CONTENT_TYPE_ID.equals(ct.getId())){
+ 				languageMap.put(IRemoteIndexerInfoProvider.UPC_LANGUAGEID_key, languageID);
+-			}
++			}*/
+ 			
+ 			if(CCorePlugin.CONTENT_TYPE_CHEADER.equals(ct.getId())){
+ 				languageMap.put(IRemoteIndexerInfoProvider.CHEADER_LANGUAGEID_key, languageID);
+diff --git a/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/make/core/scannerconfig/offline/OfflineBuildOutputParserUtility.java b/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/make/core/scannerconfig/offline/OfflineBuildOutputParserUtility.java
+index e916d2a..4160d2b 100644
+--- a/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/make/core/scannerconfig/offline/OfflineBuildOutputParserUtility.java
++++ b/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/make/core/scannerconfig/offline/OfflineBuildOutputParserUtility.java
+@@ -25,7 +25,7 @@ import java.util.Vector;
+ import org.eclipse.cdt.make.internal.core.scannerconfig.util.CCommandDSC;
+ import org.eclipse.cdt.make.internal.core.scannerconfig.util.KVStringPair;
+ import org.eclipse.cdt.make.internal.core.scannerconfig.util.SCDOptionsEnum;
+-import org.eclipse.cdt.make.xlc.core.scannerconfig.util.XLCCommandDSC;
++//import org.eclipse.cdt.make.xlc.core.scannerconfig.util.XLCCommandDSC;
+ import org.eclipse.core.resources.IContainer;
+ import org.eclipse.core.resources.IFile;
+ import org.eclipse.core.resources.IResource;
+@@ -249,7 +249,7 @@ public class OfflineBuildOutputParserUtility {
+      * @return CCommandDSC compile command description 
+      */
+     public CCommandDSC getNewCCommandDSC(String[] tokens, final int idxOfCompilerCommand, boolean cppFileType) {
+-		ArrayList dirafter = new ArrayList();
++	/*	ArrayList dirafter = new ArrayList();
+ 		ArrayList includes = new ArrayList();
+         XLCCommandDSC command = new XLCCommandDSC(cppFileType);
+         command.addSCOption(new KVStringPair(SCDOptionsEnum.COMMAND.toString(), tokens[idxOfCompilerCommand]));
+@@ -339,7 +339,8 @@ public class OfflineBuildOutputParserUtility {
+     	for (Iterator iter=dirafter.iterator(); iter.hasNext(); ) {
+         	command.addSCOption((KVStringPair)iter.next());                    		
+     	}
+-        return command;
++        return command;*/
++	return null;
+     }
+ 
+    
diff --git a/debian/patches/series b/debian/patches/series
index 26d35b8..476c789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 remove-cdt-xlc-dependency.patch
 disable-rdt-ui.patch
+remove-cdt-upc-dependency.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-ptp.git