rpms/eclipse-phpeclipse/devel eclipse-phpeclipse-fix-phpmanual-view.patch, NONE, 1.1 eclipse-phpeclipse-httpd-integration.patch, 1.6, 1.7 eclipse-phpeclipse.spec, 1.11, 1.12 get-phpeclipse.sh, 1.2, 1.3 sources, 1.4, 1.5 eclipse-phpeclipse-no-htmlparser.patch, 1.2, NONE
Mat Booth
mbooth at fedoraproject.org
Sun Apr 5 19:05:35 UTC 2009
- Previous message: rpms/ht/devel ht-2.0.16-gcc44.patch,NONE,1.1
- Next message: rpms/eclipse-phpeclipse/F-10 eclipse-phpeclipse-fix-phpmanual-view.patch, NONE, 1.1 eclipse-phpeclipse-httpd-integration.patch, 1.6, 1.7 eclipse-phpeclipse.spec, 1.10, 1.11 get-phpeclipse.sh, 1.2, 1.3 sources, 1.4, 1.5 eclipse-phpeclipse-no-htmlparser.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mbooth
Update of /cvs/pkgs/rpms/eclipse-phpeclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2940/devel
Modified Files:
eclipse-phpeclipse-httpd-integration.patch
eclipse-phpeclipse.spec get-phpeclipse.sh sources
Added Files:
eclipse-phpeclipse-fix-phpmanual-view.patch
Removed Files:
eclipse-phpeclipse-no-htmlparser.patch
Log Message:
* Sun Apr 05 2009 Mat Booth <fedora at matbooth.co.uk>
- Drop GCJ AOT support.
- Add htmlparser dependency and drop htmlparser patch.
- Add patch to fix PartInitException and IllegalArgumentException in
PHP Manual view.
eclipse-phpeclipse-fix-phpmanual-view.patch:
--- NEW FILE eclipse-phpeclipse-fix-phpmanual-view.patch ---
Index: /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java
===================================================================
--- /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java (revision 1643)
+++ /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java (working copy)
@@ -181,7 +181,8 @@
Display.getDefault().asyncExec(new Runnable() {
public void run() {
String html = getHtmlSource(funcName);
- browser.setText(html);
+ if (html != null)
+ browser.setText(html);
}
});
}
Index: /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/plugin.xml
===================================================================
--- /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/plugin.xml (revision 1643)
+++ /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/plugin.xml (working copy)
@@ -13,16 +13,16 @@
icon="icons/phpmanual.png"
category="net.sourceforge.phpeclipse.views.category"
class="net.sourceforge.phpeclipse.phpmanual.views.PHPManualView"
- id="net.sourceforge.phpeclipse.phpmanual.views.PHPManualViewz">
+ id="net.sourceforge.phpeclipse.phpmanual.views.PHPManualView">
</view>
</extension>
<extension
point="org.eclipse.ui.perspectiveExtensions">
<perspectiveExtension
- targetID="org.eclipse.ui.resourcePerspective">
+ targetID="net.sourceforge.phpeclipse.PHPPerspective">
<view
ratio="0.5"
- relative="org.eclipse.ui.views.TaskList"
+ relative="net.sourceforge.phpeclipse.webbrowser.views"
relationship="right"
id="net.sourceforge.phpeclipse.phpmanual.views.PHPManualView">
</view>
eclipse-phpeclipse-httpd-integration.patch:
Index: eclipse-phpeclipse-httpd-integration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse-httpd-integration.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-phpeclipse-httpd-integration.patch 15 Nov 2008 02:23:30 -0000 1.6
+++ eclipse-phpeclipse-httpd-integration.patch 5 Apr 2009 19:05:35 -0000 1.7
@@ -307,10 +307,10 @@
+ prefs/default_win32.properties
+src.excludes = prefs/default_macosx.properties,\
+ prefs/default_win32.properties
-Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/plugin.xml
+Index: /home/mbooth/workspace/net.sourceforge.phpeclipse.externaltools/plugin.xml
===================================================================
---- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/plugin.xml (revision 1625)
-+++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/plugin.xml (working copy)
+--- /home/mbooth/workspace/net.sourceforge.phpeclipse.externaltools/plugin.xml (revision 1643)
++++ /home/mbooth/workspace/net.sourceforge.phpeclipse.externaltools/plugin.xml (working copy)
@@ -192,11 +192,6 @@
</page>
<page
@@ -323,7 +323,18 @@
class="net.sourceforge.phpdt.externaltools.preferences.MySQLPreferencePage"
id="net.sourceforge.phpeclipse.externaltools.mysql.preferences"
name="MySQL"/>
-@@ -268,24 +263,6 @@
+@@ -213,10 +208,6 @@
+ targetID="net.sourceforge.phpeclipse.PHPPerspective">
+ <actionSet id="net.sourceforge.phpeclipse.PHPActionSet"/>
+ </perspectiveExtension>
+- <perspectiveExtension
+- targetID="net.sourceforge.phpeclipse.PHPPerspective">
+- <actionSet id="net.sf.eclipsetidy.ActionSet"/>
+- </perspectiveExtension>
+ </extension>
+
+ <extension
+@@ -268,24 +259,6 @@
toolbarPath="Normal"
id="net.sourceforge.phpdt.externaltools.actions.PHPStartMySQLAction">
</action>
Index: eclipse-phpeclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eclipse-phpeclipse.spec 24 Feb 2009 13:50:34 -0000 1.11
+++ eclipse-phpeclipse.spec 5 Apr 2009 19:05:35 -0000 1.12
@@ -1,9 +1,9 @@
%define eclipse_base %{_libdir}/eclipse
-%define gcj_support 1
+%define eclipse_dropin %{_datadir}/eclipse/dropins
Name: eclipse-phpeclipse
Version: 1.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: PHP Eclipse plugin
Group: Development/Tools
License: CPL
@@ -18,27 +18,23 @@
Patch0: %{name}-broken-help-links.patch
Patch1: %{name}-fix-build-props.patch
Patch2: %{name}-httpd-integration.patch
-Patch3: %{name}-no-htmlparser.patch
Patch4: %{name}-rm-win32-help.patch
Patch5: %{name}-external-parser.patch
Patch6: %{name}-external-preview.patch
+Patch7: %{name}-fix-phpmanual-view.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if %{gcj_support}
-BuildRequires: gcc-java
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%else
BuildArch: noarch
-%endif
+
BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: eclipse-pde >= 3.4
+BuildRequires: htmlparser
Requires: java
Requires: jpackage-utils
Requires: eclipse-platform >= 3.4
+Requires: htmlparser
Requires: php >= 5
Requires: php-pecl-xdebug
Requires: httpd
@@ -55,21 +51,19 @@
%patch0 -p4
%patch1 -p4
%patch2 -p4
-%patch3 -p4
%patch4 -p4
%patch5 -p4
%patch6 -p4
+%patch7 -p4
# ditch bundled libs in favor of building against fedora packaged libs
-#rm net.sourceforge.phpeclipse.phpmanual.htmlparser/sax2.jar \
-# net.sourceforge.phpeclipse.phpmanual.htmlparser/htmllexer.jar \
-# net.sourceforge.phpeclipse.phpmanual.htmlparser/filterbuilder.jar \
-# net.sourceforge.phpeclipse.phpmanual.htmlparser/thumbelina.jar \
-# net.sourceforge.phpeclipse.phpmanual.htmlparser/junit.jar \
-# net.sourceforge.phpeclipse.phpmanual.htmlparser/htmlparser.jar
-#build-jar-repository -s -p net.sourceforge.phpeclipse.phpmanual.htmlparser xml-commons-apis
-
-#grep -lR sax2 * | xargs sed --in-place "s/sax2/xml-commons-apis/"
+rm net.sourceforge.phpeclipse.phpmanual.htmlparser/sax2.jar \
+ net.sourceforge.phpeclipse.phpmanual.htmlparser/htmllexer.jar \
+ net.sourceforge.phpeclipse.phpmanual.htmlparser/filterbuilder.jar \
+ net.sourceforge.phpeclipse.phpmanual.htmlparser/thumbelina.jar \
+ net.sourceforge.phpeclipse.phpmanual.htmlparser/junit.jar \
+ net.sourceforge.phpeclipse.phpmanual.htmlparser/htmlparser.jar
+build-jar-repository -s -p net.sourceforge.phpeclipse.phpmanual.htmlparser htmlparser
# fix jar versions
find -name MANIFEST.MF | xargs sed --in-place "s/0.0.0/%{version}/"
@@ -96,47 +90,35 @@
%install
rm -rf %{buildroot}
-installDir=%{buildroot}%{_datadir}/eclipse/dropins/phpeclipse
-debugInstallDir=%{buildroot}%{_datadir}/eclipse/dropins/phpeclipse-debug
-xdebugInstallDir=%{buildroot}%{_datadir}/eclipse/dropins/phpeclipse-xdebug
-install -d -m 755 $installDir
-install -d -m 755 $debugInstallDir
-install -d -m 755 $xdebugInstallDir
-unzip -q -d $installDir build/rpmBuild/net.sourceforge.phpeclipse.feature.zip
-unzip -q -d $debugInstallDir build/rpmBuild/net.sourceforge.phpeclipse.debug.feature.zip
-unzip -q -d $xdebugInstallDir build/rpmBuild/net.sourceforge.phpeclipse.xdebug.feature.zip
+install -d -m 755 %{buildroot}%{eclipse_dropin}
+unzip -q -d %{buildroot}%{eclipse_dropin}/phpeclipse build/rpmBuild/net.sourceforge.phpeclipse.feature.zip
+unzip -q -d %{buildroot}%{eclipse_dropin}/phpeclipse-debug build/rpmBuild/net.sourceforge.phpeclipse.debug.feature.zip
+unzip -q -d %{buildroot}%{eclipse_dropin}/phpeclipse-xdebug build/rpmBuild/net.sourceforge.phpeclipse.xdebug.feature.zip
# need to recreate the symlinks to libraries that were setup in "prep"
# because for some reason the ant copy task doesn't preserve them
-#pushd $installDir/eclipse/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
-#rm *.jar
-#build-jar-repository -s -p . xml-commons-apis
-#popd
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+pushd %{buildroot}%{eclipse_dropin}/phpeclipse/eclipse/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
+rm *.jar
+build-jar-repository -s -p . htmlparser
+popd
%clean
rm -rf %{buildroot}
-%if %{gcj_support}
-%post -p %{_bindir}/rebuild-gcj-db
-%postun -p %{_bindir}/rebuild-gcj-db
-%endif
-
%files
%defattr(-,root,root,-)
%doc net.sourceforge.phpeclipse.feature/cpl-v10.html
-%{_datadir}/eclipse/dropins/phpeclipse
-%{_datadir}/eclipse/dropins/phpeclipse-debug
-%{_datadir}/eclipse/dropins/phpeclipse-xdebug
-
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}
-%endif
+%{eclipse_dropin}/phpeclipse
+%{eclipse_dropin}/phpeclipse-debug
+%{eclipse_dropin}/phpeclipse-xdebug
%changelog
+* Sun Apr 05 2009 Mat Booth <fedora at matbooth.co.uk> 1.2.1-4
+- Drop GCJ AOT support.
+- Add htmlparser dependency and drop htmlparser patch.
+- Add patch to fix PartInitException and IllegalArgumentException in
+ PHP Manual view.
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: get-phpeclipse.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/get-phpeclipse.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- get-phpeclipse.sh 15 Nov 2008 02:23:30 -0000 1.2
+++ get-phpeclipse.sh 5 Apr 2009 19:05:35 -0000 1.3
@@ -18,6 +18,7 @@
net.sourceforge.phpeclipse.launching \
net.sourceforge.phpeclipse.phphelp \
net.sourceforge.phpeclipse.phpmanual \
+ net.sourceforge.phpeclipse.phpmanual.htmlparser \
net.sourceforge.phpeclipse.smarty.ui \
net.sourceforge.phpeclipse.ui \
net.sourceforge.phpeclipse.webbrowser \
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 15 Nov 2008 02:23:30 -0000 1.4
+++ sources 5 Apr 2009 19:05:35 -0000 1.5
@@ -1 +1 @@
-a0ccdfd8056caa958bff85f7e7b1adc9 phpeclipse-1.2.1.tar.gz
+8ac385ed7418b7cf61cacc7f630adf36 phpeclipse-1.2.1.tar.gz
--- eclipse-phpeclipse-no-htmlparser.patch DELETED ---
- Previous message: rpms/ht/devel ht-2.0.16-gcc44.patch,NONE,1.1
- Next message: rpms/eclipse-phpeclipse/F-10 eclipse-phpeclipse-fix-phpmanual-view.patch, NONE, 1.1 eclipse-phpeclipse-httpd-integration.patch, 1.6, 1.7 eclipse-phpeclipse.spec, 1.10, 1.11 get-phpeclipse.sh, 1.2, 1.3 sources, 1.4, 1.5 eclipse-phpeclipse-no-htmlparser.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list