[eclipse-pydev] Update to upstream 2.2.0 release.
Alexander Kurtakov
akurtakov at fedoraproject.org
Tue Jul 12 06:45:49 UTC 2011
commit a606d0e72d1add892f63efe101920225ffc42b5a
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Tue Jul 12 09:45:18 2011 +0300
Update to upstream 2.2.0 release.
.gitignore | 1 +
eclipse-pydev.spec | 54 ++++++++++---------------
piccolo-swtimage-dispose.patch | 11 -----
remove-red-core.patch | 8 ++--
remove-winregistry.patch | 86 ++++++++++++++++++++++++++++++++++++++++
sources | 2 +-
use-piccolo2d-bundle.patch | 12 ------
7 files changed, 114 insertions(+), 60 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ff10eac..4678073 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ org.python.pydev.feature-1.5.9.2010063001-sources.zip
org.python.pydev-1.6.3.2010100513-sources.zip
org.python.pydev-1.6.4.2011010200-sources.zip
org.python.pydev-2.0.0.2011040403-sources.zip
+PyDev%202.2.0%20sources.zip
diff --git a/eclipse-pydev.spec b/eclipse-pydev.spec
index 1ae041e..3ef44da 100644
--- a/eclipse-pydev.spec
+++ b/eclipse-pydev.spec
@@ -1,6 +1,6 @@
# psyco: Bug 483357 - Empty eclipse-pydev-debuginfo
%global debug_package %{nil}
-%global qualifier 2011040403
+%global qualifier 2011062419
%global _python_bytecompile_errors_terminate_build 0
Epoch: 1
@@ -10,17 +10,16 @@ Epoch: 1
Summary: Eclipse Python development plug-in
Name: eclipse-pydev
-Version: 2.0.0
-Release: 4%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
License: EPL
URL: http://pydev.org
Group: Development/Tools
-Source0: http://downloads.sourceforge.net/project/pydev/pydev/Pydev%202.0/org.python.pydev-%{version}.%{qualifier}-sources.zip
-Patch0: use-piccolo2d-bundle.patch
-Patch1: piccolo-swtimage-dispose.patch
-Patch2: pydev-removeruntimeerror.patch
-Patch3: remove-red-core.patch
+Source0: http://downloads.sourceforge.net/project/pydev/pydev/Pydev%202.2.0/PyDev%202.2.0%20sources.zip
+Patch0: pydev-removeruntimeerror.patch
+Patch1: remove-red-core.patch
+Patch2: remove-winregistry.patch
BuildRequires: java-devel >= 1.5.0
BuildArch: noarch
@@ -41,7 +40,7 @@ Requires: xmlrpc3-server
Requires: junit >= 3.8.1
Requires: jython >= 2.2
Requires: pylint
-Requires: piccolo2d >= 1.3-1
+Requires: jpathwatch
Requires: Django
Requires: ws-commons-util
BuildRequires: eclipse-pde
@@ -57,7 +56,7 @@ BuildRequires: xmlrpc3-common
BuildRequires: xmlrpc3-client
BuildRequires: xmlrpc3-server
BuildRequires: jython >= 2.2
-BuildRequires: piccolo2d >= 1.3-1
+BuildRequires: jpathwatch
# This package can not be noarch because psyco is a x86 package.
#BuildArch: noarch
@@ -78,18 +77,14 @@ Mylyn Task-Focused UI extensions for Pydev.
%prep
%setup -q -c
%patch0
-%patch1
-%patch2
-%patch3
+%patch1 -b .sav
+%patch2 -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
# remove pre-generated build files
find . -name build.xml | xargs rm
-#remove piccolo2d sources, we use the system one
-rm -fr plugins/com.python.pydev/src/edu
-
# remove pre-built jars
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
@@ -99,7 +94,10 @@ ln -sf %{_javadir}/commons-codec.jar \
plugins/org.python.pydev.core/commons-codec.jar
ln -sf %{_javadir}/junit.jar \
- plugins/org.python.pydev.core/junit.jar
+ plugins/org.python.pydev.core/lib/junit.jar
+
+ln -sf %{_jnidir}/jpathwatch.jar \
+ plugins/org.python.pydev.core/lib/jpathwatch-0-94.jar
ln -sf %{_javadir}/jython.jar \
plugins/org.python.pydev.jython/jython.jar
@@ -132,21 +130,14 @@ ln -sf %{_javadir}/xmlrpc3-server.jar \
# plugins/org.python.pydev.refactoring/tests/lib/xstream-1.2.1.jar
-mkdir orbitDeps
-pushd orbitDeps
-ln -s %{_javadir}/piccolo2d/piccolo2d-core.jar piccolo2d-core.jar
-ln -s %{_javadir}/piccolo2d/piccolo2d-extras.jar piccolo2d-extras.jar
-ln -s %{_javadir}/piccolo2d/piccolo2d-swt.jar piccolo2d-swt.jar
-popd
-
%build
%{eclipse_base}/buildscripts/pdebuild \
-d "mylyn mylyn-commons mylyn-ide mylyn-context" \
- -f org.python.pydev.feature -a "-DjavacSource=1.5 -DjavacTarget=1.5" -o `pwd`/orbitDeps
+ -f org.python.pydev.feature -a "-DjavacSource=1.5 -DjavacTarget=1.5"
%{eclipse_base}/buildscripts/pdebuild \
-d "mylyn mylyn-commons mylyn-ide mylyn-context" \
- -f org.python.pydev.mylyn.feature -a "-DjavacSource=1.5 -DjavacTarget=1.5" -o `pwd`/orbitDeps
+ -f org.python.pydev.mylyn.feature -a "-DjavacSource=1.5 -DjavacTarget=1.5"
%install
installDir=${RPM_BUILD_ROOT}/%{install_loc}/pydev
@@ -161,16 +152,14 @@ unzip -q -d ${installDir}-mylyn build/rpmBuild/org.python.pydev.mylyn.feature.zi
# deal with linked deps
pushd $installDir/eclipse/plugins
-ln -s %{_javadir}/piccolo2d/piccolo2d-core.jar piccolo2d-core.jar
-ln -s %{_javadir}/piccolo2d/piccolo2d-extras.jar piccolo2d-extras.jar
-ln -s %{_javadir}/piccolo2d/piccolo2d-swt.jar piccolo2d-swt.jar
rm -rf org.python.pydev.core_%{version}.%{qualifier}/commons-codec.jar
ln -sf %{_javadir}/commons-codec.jar \
org.python.pydev.core_%{version}.%{qualifier}/commons-codec.jar
-mkdir org.python.pydev.core_%{version}.%{qualifier}/lib
ln -sf %{_javadir}/junit.jar \
org.python.pydev.core_%{version}.%{qualifier}/lib/junit.jar
+ln -sf %{_jnidir}/jpathwatch.jar \
+ org.python.pydev.core_%{version}.%{qualifier}/lib/jpathwatch-0-94.jar
rm -rf org.python.pydev.debug_%{version}.%{qualifier}/commons-logging-1.1.jar
ln -sf %{_javadir}/commons-logging.jar \
@@ -206,14 +195,15 @@ if [ ${sixFourFourfiles:-0} -ne 0 ]; then
fi
%files
-%defattr(-,root,root,-)
%{install_loc}/pydev
%files mylyn
-%defattr(-,root,root,-)
%{install_loc}/pydev-mylyn
%changelog
+* Tue Jul 12 2011 Alexander Kurtakov <akurtako at redhat.com> 1:2.2.0-1
+- Update to upstream 2.2.0 release.
+
* Thu Apr 28 2011 Severin Gehwolf <sgehwolf at redhat.com> 1:2.0.0-4
- Fix pdebuild -d to include "mylyn" as well.
diff --git a/remove-red-core.patch b/remove-red-core.patch
index e6a68ed..05161a3 100644
--- a/remove-red-core.patch
+++ b/remove-red-core.patch
@@ -1,13 +1,13 @@
---- features/org.python.pydev.feature/feature.xml.orig 2011-04-04 03:16:02.000000000 +0300
-+++ features/org.python.pydev.feature/feature.xml 2011-04-04 15:02:54.481419290 +0300
+--- features/org.python.pydev.feature/feature.xml.orig 2011-06-24 20:03:24.000000000 +0300
++++ features/org.python.pydev.feature/feature.xml 2011-06-30 14:05:52.648218201 +0300
@@ -223,10 +223,5 @@ This Agreement is governed by the laws o
download-size="160"
install-size="160"
- version="2.0.0.2011040403"/>
+ version="2.2.0.2011062419"/>
- <plugin
- id="org.python.pydev.red_core"
- download-size="160"
- install-size="160"
-- version="2.0.0.2011040403"/>
+- version="2.2.0.2011062419"/>
</feature>
diff --git a/remove-winregistry.patch b/remove-winregistry.patch
new file mode 100644
index 0000000..f5cc1e4
--- /dev/null
+++ b/remove-winregistry.patch
@@ -0,0 +1,86 @@
+--- 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;
+
+-import at.jta.Key;
+-import at.jta.Regor;
+-
+ public class PythonInterpreterEditor extends AbstractInterpreterEditor{
+
+ public PythonInterpreterEditor(String labelText, Composite parent, IInterpreterManager interpreterManager) {
+@@ -55,72 +52,7 @@ public class PythonInterpreterEditor ext
+ 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");
+- if (key != null) {
+- try {
+- List l = regor.listKeys(key);
+- for (Object o : l) {
+- Key openKey = regor.openKey(key, (String) o + "\\InstallPath");
+- 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());
+-
+- }
++
+ }
+
+
diff --git a/sources b/sources
index 4f26fac..20e5864 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a6abc57654e24d2e5a4d4f273377b915 org.python.pydev-2.0.0.2011040403-sources.zip
+09852d3fb5a1fdcd9a8d16b99859a75d PyDev%202.2.0%20sources.zip
More information about the scm-commits
mailing list