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 c1601b8e3d6eb270b32fb06984d22925476755d5 Author: Jakub Adam <[email protected]> Date: Fri Jan 18 21:07:48 2013 +0100 Add build patches --- debian/patches/add-orbit-dependencies.patch | 227 +++++++++++++++++++++ debian/patches/jython-compatibility-fixes.patch | 53 +++++ debian/patches/pydev-jython-src-path.patch | 21 ++ debian/patches/remove-red-core-bundle.patch | 24 +++ debian/patches/remove-windows-specific-code.patch | 109 ++++++++++ debian/patches/series | 5 + 6 files changed, 439 insertions(+) diff --git a/debian/patches/add-orbit-dependencies.patch b/debian/patches/add-orbit-dependencies.patch new file mode 100644 index 0000000..a255cba --- /dev/null +++ b/debian/patches/add-orbit-dependencies.patch @@ -0,0 +1,227 @@ +From: Jakub Adam <[email protected]> +Date: Sat, 5 Jan 2013 16:02:45 +0100 +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(-) + +diff --git a/features/org.python.pydev.feature/feature.xml b/features/org.python.pydev.feature/feature.xml +index ef8d17b..c7fc838 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" + install-size="160" + version="0.9.7.1"/> +- ++ <plugin ++ id="org.apache.xmlrpc" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ unpack="false"/> ++ <plugin ++ id="org.apache.xmlrpc.client" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ unpack="false"/> ++ <plugin ++ id="org.apache.xmlrpc.server" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ unpack="false"/> ++ <plugin ++ id="org.apache.ws.commons.util" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ unpack="false"/> ++ <plugin ++ id="name.pachler.nio.file" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ unpack="false"/> ++ <plugin ++ id="org.python" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ unpack="false"/> ++ <plugin ++ id="com.google.common" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ unpack="false"/> ++ <plugin ++ id="com.kenai.constantine" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ unpack="false"/> ++ <plugin ++ id="com.kenai.jaffl" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ unpack="false"/> ++ <plugin ++ id="com.kenai.jffi" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ unpack="false"/> ++ <plugin ++ id="org.jruby.ext.posix" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ unpack="false"/> ++ <plugin ++ id="org.antlr.runtime" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ unpack="false"/> ++ <plugin ++ id="org.apache.ws.commons.util" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ unpack="false"/> ++ <plugin ++ id="org.apache.xerces" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ unpack="false"/> ++ <plugin ++ id="org.apache.xml.resolver" ++ download-size="0" ++ install-size="0" ++ 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 +--- 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 + Bundle-Name: Core Plug-in + Bundle-SymbolicName: org.python.pydev.core; singleton:=true + Bundle-Version: 0.9.7.1 +-Bundle-ClassPath: core.jar, +- commons-codec.jar, +- lib/jpathwatch-0-94.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, + org.eclipse.ui.console, + org.eclipse.core.variables, +- com.aptana.shared_core;visibility:=reexport ++ com.aptana.shared_core;visibility:=reexport, ++ org.apache.commons.codec, ++ 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, + 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 +--- 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", + org.eclipse.core.expressions, + org.python.pydev.jython, +- com.aptana.interactive_console ++ com.aptana.interactive_console, ++ 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 +--- 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, + 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.python, ++ com.google.common + Eclipse-LazyStart: true + Export-Package: org.python.compiler, + org.python.core, diff --git a/debian/patches/jython-compatibility-fixes.patch b/debian/patches/jython-compatibility-fixes.patch new file mode 100644 index 0000000..8016d4e --- /dev/null +++ b/debian/patches/jython-compatibility-fixes.patch @@ -0,0 +1,53 @@ +From: Jakub Adam <[email protected]> +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 ++++-------- + 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 +index d39861d..04d9a8a 100644 +--- 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 +@@ -38,7 +38,7 @@ public interface IPythonInterpreter { + * @param class_ the java class that should be used as the return value + * @return the object with the variable requested as a java object + */ +- Object get(String varName, Class class_); ++ <T> T get(String varName, Class<T> class_); + + /** + * 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 +--- 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; + import org.osgi.framework.BundleContext; + import org.python.core.PyClass; + import org.python.core.PyException; +-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 { + //actually, this is more likely to happen when raising an exception in jython + if (e instanceof PyException) { + PyException pE = (PyException) e; +- if (pE.type instanceof PyJavaClass) { +- PyJavaClass t = (PyJavaClass) pE.type; +- if (t.__name__ != null && t.__name__.equals("org.python.pydev.jython.ExitScriptException")) { +- return null; +- } +- } else if (pE.type instanceof PyClass) { ++ if (pE.type instanceof PyClass) { + PyClass t = (PyClass) pE.type; +- if (t.__name__ != null && t.__name__.equals("SystemExit")) { ++ if (t.__name__ != null && ++ (t.__name__.equals("org.python.pydev.jython.ExitScriptException") || ++ t.__name__.equals("SystemExit"))) { + return null; + } + } diff --git a/debian/patches/pydev-jython-src-path.patch b/debian/patches/pydev-jython-src-path.patch new file mode 100644 index 0000000..620ed3e --- /dev/null +++ b/debian/patches/pydev-jython-src-path.patch @@ -0,0 +1,21 @@ +From: Jakub Adam <[email protected]> +Date: Wed, 16 Jan 2013 19:56:02 +0100 +Subject: pydev-jython-src-path + +--- + plugins/org.python.pydev.jython/build.properties | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/plugins/org.python.pydev.jython/build.properties b/plugins/org.python.pydev.jython/build.properties +index 168f7a2..4b0ea49 100644 +--- a/plugins/org.python.pydev.jython/build.properties ++++ b/plugins/org.python.pydev.jython/build.properties +@@ -9,7 +9,6 @@ bin.includes = META-INF/,\ + icons/,\ + LICENSE_PYHON.txt + jars.compile.order = pydev-jython.jar +-source.pydev-jython.jar = src/,\ +- src_jython/ ++source.pydev-jython.jar = src/ + output.pydev-jython.jar = bin/ + jars.extra.classpath = jython.jar diff --git a/debian/patches/remove-red-core-bundle.patch b/debian/patches/remove-red-core-bundle.patch new file mode 100644 index 0000000..2f9a23e --- /dev/null +++ b/debian/patches/remove-red-core-bundle.patch @@ -0,0 +1,24 @@ +From: Jakub Adam <[email protected]> +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 new file mode 100644 index 0000000..719e97f --- /dev/null +++ b/debian/patches/remove-windows-specific-code.patch @@ -0,0 +1,109 @@ +From: Jakub Adam <[email protected]> +Date: Thu, 17 Jan 2013 20:50:14 +0100 +Subject: remove-windows-specific-code + +--- + .../ui/pythonpathconf/PythonInterpreterEditor.java | 83 ++------------------ + 1 file changed, 5 insertions(+), 78 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; + +-import at.jta.Key; +-import at.jta.Regor; +- + public class PythonInterpreterEditor extends AbstractInterpreterEditor { + + 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; +- } +- } else { +- //On windows we can try to see the installed versions... +- List<File> foundVersions = new ArrayList<File>(); +- try { +- Regor regor = new Regor(); +- +- //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 { +- List l = regor.listKeys(key); +- for (Object o : l) { +- Key openKey = regor.openKey(key, (String) o + "\\InstallPath", Regor.KEY_READ); +- if (openKey != null) { +- try { +- 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... +- File file = new File(parseValue, "python.exe"); +- if (file.isFile()) { +- foundVersions.add(file); +- } +- } +- } finally { +- regor.closeKey(openKey); +- } +- } +- } +- } finally { +- regor.closeKey(key); +- } +- } +- } +- +- } 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()); +- +- } ++ 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. diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..646e181 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,5 @@ +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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
