[eclipse-pydev] Update to 2.7.0 release.
Jeff Johnston
jjohnstn at fedoraproject.org
Fri Oct 5 23:14:17 UTC 2012
commit 6b32574c86c25e318f6c8dc402ad2f559047d8b1
Author: Jeff Johnston <jjohnstn at redhat.com>
Date: Fri Oct 5 19:13:40 2012 -0400
Update to 2.7.0 release.
.gitignore | 1 +
eclipse-pydev.spec | 49 ++++++++++++++-------------
remove-org.eclipse.mylyn-requirement.patch | 33 -------------------
remove-red-core.patch | 34 ++++++-------------
remove-winregistry.patch | 44 +++++++++++++------------
sources | 2 +-
6 files changed, 61 insertions(+), 102 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 22f1455..5d904c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ PyDev-2.2.0-sources.zip
PyDev-2.2.2-sources.zip
/org.python.pydev-2.2.3.2011100616-sources.zip
/PyDev-2.2.4-sources.zip
+/PyDev-2.7.0-sources.zip
diff --git a/eclipse-pydev.spec b/eclipse-pydev.spec
index 83b707d..191a0b8 100644
--- a/eclipse-pydev.spec
+++ b/eclipse-pydev.spec
@@ -1,5 +1,5 @@
# psyco: Bug 483357 - Empty eclipse-pydev-debuginfo
-%global qualifier 2012062818
+%global qualifier 2012100419
%global _python_bytecompile_errors_terminate_build 0
Epoch: 1
@@ -8,17 +8,16 @@ Epoch: 1
Summary: Eclipse Python development plug-in
Name: eclipse-pydev
-Version: 2.6.0
-Release: 2%{?dist}
+Version: 2.7.0
+Release: 1%{?dist}
License: EPL
URL: http://pydev.org
Group: Development/Tools
-#Source0: http://downloads.sourceforge.net/project/pydev/pydev/PyDev%202.6.0/PyDev%202.6.0-sources.zip
+#Source0: http://downloads.sourceforge.net/project/pydev/pydev/PyDev%202.7.0/PyDev%202.7.0-sources.zip
Source0: PyDev-%{version}-sources.zip
Patch1: remove-red-core.patch
Patch2: remove-winregistry.patch
-Patch3: remove-org.eclipse.mylyn-requirement.patch
BuildRequires: java-devel >= 1.5.0
BuildArch: noarch
@@ -26,9 +25,9 @@ Requires: eclipse-platform
Requires: python
Requires: apache-commons-codec >= 1.3
Requires: apache-commons-logging
-Requires: xmlrpc3-common
-Requires: xmlrpc3-client
-Requires: xmlrpc3-server
+Requires: xmlrpc-common
+Requires: xmlrpc-client
+Requires: xmlrpc-server
Requires: junit >= 3.8.1
Requires: jython >= 2.2
Requires: pylint
@@ -45,9 +44,9 @@ BuildRequires: junit >= 3.8.1
BuildRequires: apache-commons-codec >= 1.3
BuildRequires: apache-commons-logging
BuildRequires: ws-commons-util
-BuildRequires: xmlrpc3-common
-BuildRequires: xmlrpc3-client
-BuildRequires: xmlrpc3-server
+BuildRequires: xmlrpc-common
+BuildRequires: xmlrpc-client
+BuildRequires: xmlrpc-server
BuildRequires: jython >= 2.2
BuildRequires: jpathwatch
@@ -68,9 +67,8 @@ Mylyn Task-Focused UI extensions for Pydev.
%setup -q -c
%patch1 -b .sav
%patch2 -b .sav
-%patch3 -b .sav
#fix mylyn plugin version
-sed --in-place 's:version="0.3.0":version="%{version}.%{qualifier}":' features/org.python.pydev.mylyn.feature/feature.xml
+sed --in-place 's:version="0.4.0":version="%{version}.%{qualifier}":' features/org.python.pydev.mylyn.feature/feature.xml
# remove pre-generated build files
find . -name build.xml | xargs rm
@@ -100,19 +98,19 @@ ln -sf %{_datadir}/jython/Lib \
plugins/org.python.pydev.jython/Lib
ln -sf %{_javadir}/commons-logging.jar \
- plugins/org.python.pydev.debug/commons-logging-1.1.jar
+ plugins/com.aptana.interactive_console/commons-logging-1.1.jar
ln -sf %{_javadir}/ws-commons-util.jar \
- plugins/org.python.pydev.debug/ws-commons-util-1.0.2.jar
+ plugins/com.aptana.interactive_console/ws-commons-util-1.0.2.jar
-ln -sf %{_javadir}/xmlrpc3-client.jar \
- plugins/org.python.pydev.debug/xmlrpc-client-3.1.jar
+ln -sf %{_javadir}/xmlrpc-client.jar \
+ plugins/com.aptana.interactive_console/xmlrpc-client-3.1.jar
-ln -sf %{_javadir}/xmlrpc3-common.jar \
- plugins/org.python.pydev.debug/xmlrpc-common-3.1.jar
+ln -sf %{_javadir}/xmlrpc-common.jar \
+ plugins/com.aptana.interactive_console/xmlrpc-common-3.1.jar
-ln -sf %{_javadir}/xmlrpc3-server.jar \
- plugins/org.python.pydev.debug/xmlrpc-server-3.1.jar
+ln -sf %{_javadir}/xmlrpc-server.jar \
+ plugins/com.aptana.interactive_console/xmlrpc-server-3.1.jar
# enable when tests are used
#ln -sf %%{_datadir}/java/jflex.jar \
@@ -167,15 +165,15 @@ ln -sf %{_javadir}/ws-commons-util.jar \
org.python.pydev.debug_%{version}.%{qualifier}/ws-commons-util-1.0.2.jar
rm -f org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-client-3.1.jar
-ln -sf %{_javadir}/xmlrpc3-client.jar \
+ln -sf %{_javadir}/xmlrpc-client.jar \
org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-client-3.1.jar
rm -f org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-common-3.1.jar
-ln -sf %{_javadir}/xmlrpc3-common.jar \
+ln -sf %{_javadir}/xmlrpc-common.jar \
org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-common-3.1.jar
rm -f org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-server-3.1.jar
-ln -sf %{_javadir}/xmlrpc3-server.jar \
+ln -sf %{_javadir}/xmlrpc-server.jar \
org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-server-3.1.jar
rm -rf org.python.pydev.jython_%{version}.%{qualifier}/pydev-jython.jar
@@ -200,6 +198,9 @@ fi
%{install_loc}/pydev-mylyn
%changelog
+* Fri Oct 5 2012 Jeff Johnston <jjohnstn at redhat.com> 1:2.7.0-1
+- Update to 2.7.0 release.
+
* Wed Aug 8 2012 Alexander Kurtakov <akurtako at redhat.com> 1:2.6.0-2
- Fix Requires to match new package names.
diff --git a/remove-red-core.patch b/remove-red-core.patch
index 5d48648..242fd3e 100644
--- a/remove-red-core.patch
+++ b/remove-red-core.patch
@@ -1,27 +1,15 @@
-From 3a23294205ddcad309af1a240cfd4aac51d25f71 Mon Sep 17 00:00:00 2001
-From: Sami Wagiaalla <swagiaal at redhat.com>
-Date: Tue, 10 Jul 2012 11:11:20 -0400
-Subject: [PATCH 1/3] remove-red-core.patch
-
----
- features/org.python.pydev.feature/feature.xml | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git features/org.python.pydev.feature/feature.xml features/org.python.pydev.feature/feature.xml
-index 206b885..12e5305 100644
---- features/org.python.pydev.feature/feature.xml
-+++ features/org.python.pydev.feature/feature.xml
-@@ -223,10 +223,5 @@ This Agreement is governed by the laws of the State of New York and the intellec
- download-size="160"
+diff -up ./features/org.python.pydev.feature/feature.xml.fix ./features/org.python.pydev.feature/feature.xml
+--- ./features/org.python.pydev.feature/feature.xml.fix 2012-10-05 13:32:40.000000000 -0400
++++ ./features/org.python.pydev.feature/feature.xml 2012-10-05 13:32:56.000000000 -0400
+@@ -224,11 +224,6 @@ This Agreement is governed by the laws o
install-size="160"
- version="2.6.0.2012062818"/>
-- <plugin
+ version="2.7.0.2012100419"/>
+ <plugin
- id="org.python.pydev.red_core"
- download-size="160"
- install-size="160"
-- version="2.6.0.2012062818"/>
-
- </feature>
---
-1.7.10.4
-
+- version="2.7.0.2012100419"/>
+- <plugin
+ id="com.aptana.interactive_console"
+ download-size="160"
+ install-size="160"
diff --git a/remove-winregistry.patch b/remove-winregistry.patch
index f5cc1e4..8f6ab3a 100644
--- a/remove-winregistry.patch
+++ b/remove-winregistry.patch
@@ -1,19 +1,21 @@
---- plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterEditor.java.sav 2011-06-24 19:51:34.000000000 +0300
-+++ plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterEditor.java 2011-07-12 08:55:05.970513746 +0300
-@@ -26,9 +26,6 @@ import org.python.pydev.editor.actions.P
- import org.python.pydev.plugin.PydevPlugin;
- import org.python.pydev.ui.UIConstants;
+diff -up ./plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterEditor.java.fix ./plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterEditor.java
+--- ./plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterEditor.java.fix 2012-10-05 13:34:38.000000000 -0400
++++ ./plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterEditor.java 2012-10-05 13:37:01.000000000 -0400
+@@ -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 class PythonInterpreterEditor extends AbstractInterpreterEditor {
public PythonInterpreterEditor(String labelText, Composite parent, IInterpreterManager interpreterManager) {
-@@ -55,72 +52,7 @@ public class PythonInterpreterEditor ext
+@@ -54,74 +51,6 @@ public class PythonInterpreterEditor ext
+ if (ret != null) {
return ret;
}
- }else{
+- } else {
- //On windows we can try to see the installed versions...
- List<File> foundVersions = new ArrayList<File>();
- try {
@@ -21,12 +23,12 @@
-
- //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");
+- 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");
+- Key openKey = regor.openKey(key, (String) o + "\\InstallPath", Regor.KEY_READ);
- if (openKey != null) {
- try {
- byte buf[] = regor.readValue(openKey, "");
@@ -34,7 +36,7 @@
- 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()){
+- if (file.isFile()) {
- foundVersions.add(file);
- }
- }
@@ -52,35 +54,35 @@
- } catch (Throwable e) {
- Log.log(e);
- }
-- if(foundVersions.size() == 1){
+- if (foundVersions.size() == 1) {
- return new Tuple<String, String>(getUniqueInterpreterName("python"), foundVersions.get(0).toString());
- }
-- if(foundVersions.size() > 1){
+- 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(){
+- 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.");
+- listDialog
+- .setMessage("Multiple interpreters were found installed.\nPlease select which one you want to configure.");
-
- int open = listDialog.open();
-- if(open != ListDialog.OK){
+- if (open != ListDialog.OK) {
- throw cancelException;
- }
- Object[] result = listDialog.getResult();
-- if(result == null || result.length == 0){
+- if (result == null || result.length == 0) {
- throw cancelException;
- }
- return new Tuple<String, String>(getUniqueInterpreterName("python"), result[0].toString());
--
+-
- }
-+
}
-
+ 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/sources b/sources
index a7015b1..7c9ba0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f1082c3d6937174c2c5fa2a6e3fa1b4b PyDev-2.6.0-sources.zip
+4d1182ee69bce393d0fb6d6cb63bf116 PyDev-2.7.0-sources.zip
More information about the scm-commits
mailing list