[eclipse-pydev] 09/19: Refreshed patches
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Fri Nov 22 08:31:53 UTC 2013
This is an automated email from the git hooks/post-receive script.
xhaakon-guest pushed a commit to branch master
in repository eclipse-pydev.
commit 3ac76147f8be4d73d8e059ed45728386c08e6bc4
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Thu Nov 21 14:11:13 2013 +0100
Refreshed patches
---
debian/patches/add-orbit-dependencies.patch | 170 +++++++++------------
debian/patches/jython-compatibility-fixes.patch | 10 +-
debian/patches/remove-red-core-bundle.patch | 24 ---
debian/patches/remove-windows-specific-code.patch | 91 ++++-------
debian/patches/series | 1 -
5 files changed, 110 insertions(+), 186 deletions(-)
diff --git a/debian/patches/add-orbit-dependencies.patch b/debian/patches/add-orbit-dependencies.patch
index a255cba..c19691f 100644
--- a/debian/patches/add-orbit-dependencies.patch
+++ b/debian/patches/add-orbit-dependencies.patch
@@ -1,24 +1,29 @@
From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Sat, 5 Jan 2013 16:02:45 +0100
+Date: Fri, 27 Sep 2013 21:21:04 +0200
Subject: add-orbit-dependencies
---
- features/org.python.pydev.feature/feature.xml | 91 +++++++++++++++++++-
- .../META-INF/MANIFEST.MF | 28 ++----
- plugins/org.python.pydev.core/META-INF/MANIFEST.MF | 15 ++--
- .../org.python.pydev.debug/META-INF/MANIFEST.MF | 4 +-
- .../org.python.pydev.jython/META-INF/MANIFEST.MF | 4 +-
- 5 files changed, 106 insertions(+), 36 deletions(-)
+ features/org.python.pydev.feature/feature.xml | 96 ++++++++++++++++++++++
+ plugins/org.python.pydev.core/META-INF/MANIFEST.MF | 6 +-
+ .../org.python.pydev.debug/META-INF/MANIFEST.MF | 4 +-
+ .../org.python.pydev.jython/META-INF/MANIFEST.MF | 4 +-
+ .../META-INF/MANIFEST.MF | 13 +--
+ 5 files changed, 109 insertions(+), 14 deletions(-)
diff --git a/features/org.python.pydev.feature/feature.xml b/features/org.python.pydev.feature/feature.xml
-index ef8d17b..c7fc838 100644
+index 6bbc275..f38be36 100644
--- a/features/org.python.pydev.feature/feature.xml
+++ b/features/org.python.pydev.feature/feature.xml
-@@ -238,5 +238,94 @@ This Agreement is governed by the laws of the State of New York and the intellec
- download-size="160"
+@@ -240,4 +240,100 @@ This Agreement is governed by the laws of the State of New York and the intellec
install-size="160"
- version="0.9.7.1"/>
--
+ version="2.8.2"/>
+
++ <plugin
++ id="javax.inject"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
+ <plugin
+ id="org.apache.xmlrpc"
+ download-size="0"
@@ -56,7 +61,7 @@ index ef8d17b..c7fc838 100644
+ version="0.0.0"
+ unpack="false"/>
+ <plugin
-+ id="com.google.common"
++ id="com.google.guava"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
@@ -110,118 +115,95 @@ index ef8d17b..c7fc838 100644
+ version="0.0.0"
+ unpack="false"/>
</feature>
-diff --git a/plugins/com.aptana.interactive_console/META-INF/MANIFEST.MF b/plugins/com.aptana.interactive_console/META-INF/MANIFEST.MF
-index b0b2a3e..77de72c 100644
---- a/plugins/com.aptana.interactive_console/META-INF/MANIFEST.MF
-+++ b/plugins/com.aptana.interactive_console/META-INF/MANIFEST.MF
-@@ -3,12 +3,7 @@ Bundle-ManifestVersion: 2
- Bundle-Name: Interactive Console Plug-in
- Bundle-SymbolicName: com.aptana.interactive_console; singleton:=true
- Bundle-Version: 0.9.7.1
--Bundle-ClassPath: interactive_console.jar,
-- commons-logging-1.1.jar,
-- ws-commons-util-1.0.2.jar,
-- xmlrpc-client-3.1.jar,
-- xmlrpc-common-3.1.jar,
-- xmlrpc-server-3.1.jar
-+Bundle-ClassPath: interactive_console.jar
- Bundle-Activator: com.aptana.interactive_console.InteractiveConsolePlugin
- Bundle-Localization: plugin
- Require-Bundle: org.eclipse.ui,
-@@ -19,7 +14,9 @@ Require-Bundle: org.eclipse.ui,
- org.eclipse.debug.ui,
- org.eclipse.ui.workbench.texteditor,
- com.aptana.shared_core,
-- org.eclipse.ui.ide
-+ org.eclipse.ui.ide,
-+ org.apache.xmlrpc,
-+ org.apache.xmlrpc.client
- Eclipse-LazyStart: true
- Export-Package: com.aptana.interactive_console,
- com.aptana.interactive_console.console,
-@@ -27,20 +24,5 @@ Export-Package: com.aptana.interactive_console,
- com.aptana.interactive_console.console.ui,
- com.aptana.interactive_console.console.ui.internal,
- com.aptana.interactive_console.console.ui.internal.actions,
-- com.aptana.interactive_console.console.ui.internal.fromeclipse,
-- org.apache.commons.logging,
-- org.apache.commons.logging.impl,
-- org.apache.ws.commons.serialize,
-- org.apache.ws.commons.util,
-- org.apache.xmlrpc,
-- org.apache.xmlrpc.client,
-- org.apache.xmlrpc.client.util,
-- org.apache.xmlrpc.common,
-- org.apache.xmlrpc.jaxb,
-- org.apache.xmlrpc.metadata,
-- org.apache.xmlrpc.parser,
-- org.apache.xmlrpc.serializer,
-- org.apache.xmlrpc.server,
-- org.apache.xmlrpc.util,
-- org.apache.xmlrpc.webserver
-+ com.aptana.interactive_console.console.ui.internal.fromeclipse
- Bundle-Vendor: Appcelerator
diff --git a/plugins/org.python.pydev.core/META-INF/MANIFEST.MF b/plugins/org.python.pydev.core/META-INF/MANIFEST.MF
-index a24b0c0..1feb8d8 100644
+index 1d57ccf..47edfb8 100644
--- a/plugins/org.python.pydev.core/META-INF/MANIFEST.MF
+++ b/plugins/org.python.pydev.core/META-INF/MANIFEST.MF
-@@ -3,9 +3,7 @@ Bundle-ManifestVersion: 2
+@@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Core Plug-in
Bundle-SymbolicName: org.python.pydev.core; singleton:=true
- Bundle-Version: 0.9.7.1
+ Bundle-Version: 2.8.2
-Bundle-ClassPath: core.jar,
-- commons-codec.jar,
-- lib/jpathwatch-0-94.jar
+- lib/jpathwatch-0-95.jar
+Bundle-ClassPath: core.jar
Bundle-Activator: org.python.pydev.core.CorePlugin
Bundle-Vendor: Aptana
Bundle-Localization: plugin
-@@ -18,14 +16,11 @@ Require-Bundle: org.junit;bundle-version="[3.8.0,3.9.9]";resolution:=optional,
- org.eclipse.core.filebuffers,
+@@ -18,7 +17,8 @@ Require-Bundle: org.junit;bundle-version="4.0.0";resolution:=optional,
org.eclipse.ui.console,
org.eclipse.core.variables,
-- com.aptana.shared_core;visibility:=reexport
-+ com.aptana.shared_core;visibility:=reexport,
-+ org.apache.commons.codec,
+ org.python.pydev.shared_core;visibility:=reexport,
+- org.python.pydev.shared_ui
++ org.python.pydev.shared_ui,
+ name.pachler.nio.file
Eclipse-LazyStart: true
--Export-Package: org.apache.commons.codec,
-- org.apache.commons.codec.binary,
-- org.apache.commons.codec.digest,
-- org.apache.commons.codec.language,
-- org.apache.commons.codec.net,
-- org.python.pydev.core,
-+Export-Package: org.python.pydev.core,
- org.python.pydev.core.bundle,
+ Export-Package: org.python.pydev.core,
org.python.pydev.core.cache,
- org.python.pydev.core.callbacks,
diff --git a/plugins/org.python.pydev.debug/META-INF/MANIFEST.MF b/plugins/org.python.pydev.debug/META-INF/MANIFEST.MF
-index a80e1d7..bd4980f 100644
+index c50e1c5..c63c43d 100644
--- a/plugins/org.python.pydev.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.python.pydev.debug/META-INF/MANIFEST.MF
-@@ -26,7 +26,9 @@ Require-Bundle: org.junit;bundle-version="[3.8.0,3.9.9]";resolution:=optional,
- org.python.pydev;bundle-version="0.9.7.1",
+@@ -27,7 +27,9 @@ Require-Bundle: org.junit;bundle-version="4.0.0";resolution:=optional,
org.eclipse.core.expressions,
org.python.pydev.jython,
-- com.aptana.interactive_console
-+ com.aptana.interactive_console,
+ org.python.pydev.shared_interactive_console,
+- org.python.pydev.shared_ui
++ org.python.pydev.shared_ui,
+ org.apache.xmlrpc,
+ org.apache.xmlrpc.server
Eclipse-LazyStart: true
Export-Package: org.python.pydev.debug.codecoverage,
org.python.pydev.debug.core,
diff --git a/plugins/org.python.pydev.jython/META-INF/MANIFEST.MF b/plugins/org.python.pydev.jython/META-INF/MANIFEST.MF
-index 6b20614..366651b 100644
+index 69d1a30..48e240c 100644
--- a/plugins/org.python.pydev.jython/META-INF/MANIFEST.MF
+++ b/plugins/org.python.pydev.jython/META-INF/MANIFEST.MF
-@@ -13,7 +13,9 @@ Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui,
+@@ -14,7 +14,9 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui.console,
org.eclipse.jface.text,
-- org.junit;bundle-version="[3.8.0,3.9.9]";resolution:=optional
-+ org.junit;bundle-version="[3.8.0,3.9.9]";resolution:=optional,
+ org.junit;bundle-version="4.0";resolution:=optional,
+- org.python.pydev.shared_ui
++ org.python.pydev.shared_ui,
+ org.python,
-+ com.google.common
++ com.google.guava
Eclipse-LazyStart: true
Export-Package: org.python.compiler,
org.python.core,
+diff --git a/plugins/org.python.pydev.shared_interactive_console/META-INF/MANIFEST.MF b/plugins/org.python.pydev.shared_interactive_console/META-INF/MANIFEST.MF
+index ec42049..56d1453 100644
+--- a/plugins/org.python.pydev.shared_interactive_console/META-INF/MANIFEST.MF
++++ b/plugins/org.python.pydev.shared_interactive_console/META-INF/MANIFEST.MF
+@@ -3,12 +3,7 @@ Bundle-ManifestVersion: 2
+ Bundle-Name: Interactive Console Plug-in
+ Bundle-SymbolicName: org.python.pydev.shared_interactive_console;singleton:=true
+ Bundle-Version: 2.8.2
+-Bundle-ClassPath: interactive_console.jar,
+- commons-logging-1.1.1.jar,
+- ws-commons-util-1.0.2.jar,
+- xmlrpc-client-3.1.3.jar,
+- xmlrpc-common-3.1.3.jar,
+- xmlrpc-server-3.1.3.jar
++Bundle-ClassPath: interactive_console.jar
+ Bundle-Activator: org.python.pydev.shared_interactive_console.InteractiveConsolePlugin
+ Bundle-Localization: plugin
+ Require-Bundle: org.eclipse.ui,
+@@ -22,7 +17,7 @@ Require-Bundle: org.eclipse.ui,
+ org.eclipse.ui.ide,
+ org.python.pydev.shared_ui
+ Eclipse-LazyStart: true
+-Export-Package: org.apache.commons.logging,
++Import-Package: org.apache.commons.logging,
+ org.apache.commons.logging.impl,
+ org.apache.ws.commons.serialize,
+ org.apache.ws.commons.util,
+@@ -36,8 +31,8 @@ Export-Package: org.apache.commons.logging,
+ org.apache.xmlrpc.serializer,
+ org.apache.xmlrpc.server,
+ org.apache.xmlrpc.util,
+- org.apache.xmlrpc.webserver,
+- org.python.pydev.shared_interactive_console,
++ org.apache.xmlrpc.webserver
++Export-Package: org.python.pydev.shared_interactive_console,
+ org.python.pydev.shared_interactive_console.console,
+ org.python.pydev.shared_interactive_console.console.codegen,
+ org.python.pydev.shared_interactive_console.console.ui,
diff --git a/debian/patches/jython-compatibility-fixes.patch b/debian/patches/jython-compatibility-fixes.patch
index 8016d4e..23c26d8 100644
--- a/debian/patches/jython-compatibility-fixes.patch
+++ b/debian/patches/jython-compatibility-fixes.patch
@@ -3,8 +3,8 @@ Date: Wed, 16 Jan 2013 21:42:27 +0100
Subject: jython-compatibility-fixes
---
- .../src/org/python/pydev/jython/IPythonInterpreter.java | 2 +-
- .../src/org/python/pydev/jython/JythonPlugin.java | 12 ++++--------
+ .../src/org/python/pydev/jython/IPythonInterpreter.java | 2 +-
+ .../src/org/python/pydev/jython/JythonPlugin.java | 12 ++++--------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/plugins/org.python.pydev.jython/src/org/python/pydev/jython/IPythonInterpreter.java b/plugins/org.python.pydev.jython/src/org/python/pydev/jython/IPythonInterpreter.java
@@ -21,7 +21,7 @@ index d39861d..04d9a8a 100644
/**
* This method returns the variable that we want to get from the interpreter as a PyObject
diff --git a/plugins/org.python.pydev.jython/src/org/python/pydev/jython/JythonPlugin.java b/plugins/org.python.pydev.jython/src/org/python/pydev/jython/JythonPlugin.java
-index 8fdd788..8218964 100644
+index a68bc97..d9c4681 100644
--- a/plugins/org.python.pydev.jython/src/org/python/pydev/jython/JythonPlugin.java
+++ b/plugins/org.python.pydev.jython/src/org/python/pydev/jython/JythonPlugin.java
@@ -28,7 +28,6 @@ import org.osgi.framework.Bundle;
@@ -31,8 +31,8 @@ index 8fdd788..8218964 100644
-import org.python.core.PyJavaClass;
import org.python.core.PyObject;
import org.python.core.PySystemState;
- import org.python.pydev.core.bundle.BundleInfo;
-@@ -506,14 +505,11 @@ public class JythonPlugin extends AbstractUIPlugin {
+ import org.python.pydev.core.docutils.StringUtils;
+@@ -517,14 +516,11 @@ public class JythonPlugin extends AbstractUIPlugin {
//actually, this is more likely to happen when raising an exception in jython
if (e instanceof PyException) {
PyException pE = (PyException) e;
diff --git a/debian/patches/remove-red-core-bundle.patch b/debian/patches/remove-red-core-bundle.patch
deleted file mode 100644
index 2f9a23e..0000000
--- a/debian/patches/remove-red-core-bundle.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Thu, 17 Jan 2013 21:09:15 +0100
-Subject: remove-red-core-bundle
-
----
- features/org.python.pydev.feature/feature.xml | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/features/org.python.pydev.feature/feature.xml b/features/org.python.pydev.feature/feature.xml
-index c7fc838..cbaaa85 100644
---- a/features/org.python.pydev.feature/feature.xml
-+++ b/features/org.python.pydev.feature/feature.xml
-@@ -224,11 +224,6 @@ This Agreement is governed by the laws of the State of New York and the intellec
- install-size="160"
- version="0.9.7.1"/>
- <plugin
-- id="org.python.pydev.red_core"
-- download-size="160"
-- install-size="160"
-- version="0.9.7.1"/>
-- <plugin
- id="com.aptana.interactive_console"
- download-size="160"
- install-size="160"
diff --git a/debian/patches/remove-windows-specific-code.patch b/debian/patches/remove-windows-specific-code.patch
index 719e97f..b17e7c2 100644
--- a/debian/patches/remove-windows-specific-code.patch
+++ b/debian/patches/remove-windows-specific-code.patch
@@ -1,47 +1,42 @@
From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Thu, 17 Jan 2013 20:50:14 +0100
+Date: Sat, 28 Sep 2013 09:31:17 +0200
Subject: remove-windows-specific-code
---
- .../ui/pythonpathconf/PythonInterpreterEditor.java | 83 ++------------------
- 1 file changed, 5 insertions(+), 78 deletions(-)
+ .../PythonInterpreterProviderFactory.java | 50 ----------------------
+ 1 file changed, 50 deletions(-)
-diff --git a/plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterEditor.java b/plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterEditor.java
-index 606ba9c..584e566 100644
---- a/plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterEditor.java
-+++ b/plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterEditor.java
-@@ -27,9 +27,6 @@ import org.python.pydev.ui.UIConstants;
- import com.aptana.shared_core.structure.Tuple;
- import com.aptana.shared_core.utils.PlatformUtils;
+diff --git a/plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterProviderFactory.java b/plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterProviderFactory.java
+index e12f3de..94e7c39 100644
+--- a/plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterProviderFactory.java
++++ b/plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterProviderFactory.java
+@@ -7,9 +7,6 @@ import java.util.List;
+ import org.python.pydev.core.log.Log;
+ import org.python.pydev.shared_core.utils.PlatformUtils;
-import at.jta.Key;
-import at.jta.Regor;
-
- public class PythonInterpreterEditor extends AbstractInterpreterEditor {
+ public class PythonInterpreterProviderFactory extends AbstractInterpreterProviderFactory {
- public PythonInterpreterEditor(String labelText, Composite parent, IInterpreterManager interpreterManager) {
-@@ -47,81 +44,11 @@ public class PythonInterpreterEditor extends AbstractInterpreterEditor {
- @Override
- protected Tuple<String, String> getAutoNewInput() throws CancelException {
- List<String> pathsToSearch = new ArrayList<String>();
-- if (!PlatformUtils.isWindowsPlatform()) {
-- pathsToSearch.add("/usr/bin");
-- pathsToSearch.add("/usr/local/bin");
-- Tuple<String, String> ret = super.getAutoNewInputFromPaths(pathsToSearch, "python", "python");
-- if (ret != null) {
-- return ret;
-- }
+ public IInterpreterProvider[] getInterpreterProviders(InterpreterType type) {
+@@ -25,53 +22,6 @@ public class PythonInterpreterProviderFactory extends AbstractInterpreterProvide
+ if (ret != null) {
+ return AlreadyInstalledInterpreterProvider.create("python", ret);
+ }
- } else {
-- //On windows we can try to see the installed versions...
-- List<File> foundVersions = new ArrayList<File>();
+- // On windows we can try to see the installed versions...
+- List<String> foundVersions = new ArrayList<String>();
- try {
- Regor regor = new Regor();
-
-- //The structure for Python is something as Software\\Python\\PythonCore\\2.6\\InstallPath
+- // The structure for Python is something as
+- // Software\\Python\\PythonCore\\2.6\\InstallPath
- for (Key root : new Key[] { Regor.HKEY_LOCAL_MACHINE, Regor.HKEY_CURRENT_USER }) {
- Key key = regor.openKey(root, "Software\\Python\\PythonCore", Regor.KEY_READ);
- if (key != null) {
- try {
+- @SuppressWarnings("rawtypes")
- List l = regor.listKeys(key);
- for (Object o : l) {
- Key openKey = regor.openKey(key, (String) o + "\\InstallPath", Regor.KEY_READ);
@@ -50,10 +45,12 @@ index 606ba9c..584e566 100644
- byte buf[] = regor.readValue(openKey, "");
- if (buf != null) {
- String parseValue = Regor.parseValue(buf);
-- //Ok, this should be the directory where it's installed, try to find a 'python.exe' there...
+- // Ok, this should be the directory
+- // where it's installed, try to find
+- // a 'python.exe' there...
- File file = new File(parseValue, "python.exe");
- if (file.isFile()) {
-- foundVersions.add(file);
+- foundVersions.add(file.toString());
- }
- }
- } finally {
@@ -70,40 +67,10 @@ index 606ba9c..584e566 100644
- } catch (Throwable e) {
- Log.log(e);
- }
-- if (foundVersions.size() == 1) {
-- return new Tuple<String, String>(getUniqueInterpreterName("python"), foundVersions.get(0).toString());
-- }
-- if (foundVersions.size() > 1) {
-- //The user should select which one to use...
-- ListDialog listDialog = new ListDialog(PyAction.getShell());
--
-- listDialog.setContentProvider(new ArrayContentProvider());
-- listDialog.setLabelProvider(new LabelProvider() {
-- @Override
-- public Image getImage(Object element) {
-- return PydevPlugin.getImageCache().get(UIConstants.PY_INTERPRETER_ICON);
-- }
-- });
-- listDialog.setInput(foundVersions.toArray());
-- listDialog
-- .setMessage("Multiple interpreters were found installed.\nPlease select which one you want to configure.");
--
-- int open = listDialog.open();
-- if (open != ListDialog.OK) {
-- throw cancelException;
-- }
-- Object[] result = listDialog.getResult();
-- if (result == null || result.length == 0) {
-- throw cancelException;
-- }
-- return new Tuple<String, String>(getUniqueInterpreterName("python"), result[0].toString());
--
+- if (foundVersions.size() > 0) {
+- return AlreadyInstalledInterpreterProvider.create("python",
+- foundVersions.toArray(new String[foundVersions.size()]));
- }
-+ pathsToSearch.add("/usr/bin");
-+ pathsToSearch.add("/usr/local/bin");
-+ Tuple<String, String> ret = super.getAutoNewInputFromPaths(pathsToSearch, "python", "python");
-+ if (ret != null) {
-+ return ret;
}
- return new Tuple<String, String>(getUniqueInterpreterName("python"), "python"); //This should be enough to find it from the PATH or any other way it's defined.
+ // This should be enough to find it from the PATH or any other way it's
diff --git a/debian/patches/series b/debian/patches/series
index 646e181..18dd459 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ add-orbit-dependencies.patch
pydev-jython-src-path.patch
jython-compatibility-fixes.patch
remove-windows-specific-code.patch
-remove-red-core-bundle.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-pydev.git
More information about the pkg-java-commits
mailing list