rpms/eclipse-phpeclipse/F-9 eclipse-phpeclipse-external-parser.patch, NONE, 1.1 eclipse-phpeclipse-external-preview.patch, NONE, 1.1 eclipse-phpeclipse-httpd-integration.patch, 1.3, 1.4 eclipse-phpeclipse.spec, 1.5, 1.6
Mat Booth (mbooth)
fedora-extras-commits at redhat.com
Sun Jun 29 18:34:04 UTC 2008
- Previous message (by thread): rpms/eclipse-phpeclipse/devel eclipse-phpeclipse-external-parser.patch, NONE, 1.1 eclipse-phpeclipse-external-preview.patch, NONE, 1.1 eclipse-phpeclipse-httpd-integration.patch, 1.3, 1.4 eclipse-phpeclipse.spec, 1.5, 1.6
- Next message (by thread): rpms/bootconf/devel bootconf.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mbooth
Update of /cvs/pkgs/rpms/eclipse-phpeclipse/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15565
Modified Files:
eclipse-phpeclipse-httpd-integration.patch
eclipse-phpeclipse.spec
Added Files:
eclipse-phpeclipse-external-parser.patch
eclipse-phpeclipse-external-preview.patch
Log Message:
* Sun Jun 29 2008 Mat Booth <fedora at matbooth.co.uk> 1.2.0-0.2.svn1573
- Add patch for Show External Preview functionality.
- Add patch for Use External PHP Parser functionality.
eclipse-phpeclipse-external-parser.patch:
--- NEW FILE eclipse-phpeclipse-external-parser.patch ---
Index: net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java
===================================================================
--- net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java (revision 1573)
+++ net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java (working copy)
@@ -50,11 +50,9 @@
* the file that will be parsed
*/
public void phpExternalParse() {
- // IFile file = (IFile) resource;
- // final IPath path = file.getFullPath();
final IPreferenceStore store = ExternalToolsPlugin.getDefault()
.getPreferenceStore();
- final String filename = fFileToParse.getFullPath().toString();
+ final String filename = fFileToParse.getLocation().toString();
final String[] arguments = { filename };
final MessageFormat form = new MessageFormat(store
eclipse-phpeclipse-external-preview.patch:
--- NEW FILE eclipse-phpeclipse-external-preview.patch ---
Index: net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java
===================================================================
--- net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java (revision 1573)
+++ net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java (working copy)
@@ -145,30 +145,26 @@
if (store == null) {
store = WebUI.getDefault().getPreferenceStore();
}
- // IPath path = file.getFullPath();
- String localhostURL = file.getFullPath().toString();
- String lowerCaseFileName = localhostURL.toLowerCase();
- //removed by ed_mann for RSE fixes testing
- // String documentRoot =
- // store.getString(PHPeclipsePlugin.DOCUMENTROOT_PREF);
- //IPath documentRootPath = ProjectPrefUtil.getDocumentRoot(file
- // .getProject());
- IPath documentRootPath = file.getProject().getFullPath();
- String documentRoot = documentRootPath.toString().toLowerCase();
- if (lowerCaseFileName.startsWith(documentRoot)) {
- localhostURL = localhostURL.substring(documentRoot.length());
- } else {
- return null;
+ IPath path = file.getLocation();
+ if(path == null)
+ path = file.getFullPath();
+
+ String filePath = path.toString();
+ String projectURI = ProjectPrefUtil.getMiscProjectsPreferenceValue(file
+ .getProject(), IPreferenceConstants.PHP_LOCALHOST_PREF);
+ String projectDocRoot = ProjectPrefUtil.getMiscProjectsPreferenceValue(file
+ .getProject(), IPreferenceConstants.PHP_DOCUMENTROOT_PREF);
+
+ if (filePath.startsWith(projectDocRoot)) {
+ filePath = filePath.substring(projectDocRoot.length());
}
- // return store.getString(PHPeclipsePlugin.LOCALHOST_PREF) +
- // localhostURL;
- String projectPath = ProjectPrefUtil.getMiscProjectsPreferenceValue(file
- .getProject(), IPreferenceConstants.PHP_LOCALHOST_PREF);
- if(projectPath.endsWith("/") && localhostURL.startsWith("/")) {
- localhostURL = localhostURL.substring(1);
+ if(projectURI.endsWith("/") && filePath.startsWith("/")) {
+ filePath = filePath.substring(1);
}
- return projectPath + localhostURL;
+
+ return projectURI + filePath;
}
- return "http://localhost";
+ return ProjectPrefUtil.getMiscProjectsPreferenceValue(file
+ .getProject(), IPreferenceConstants.PHP_LOCALHOST_PREF);
}
}
\ No newline at end of file
eclipse-phpeclipse-httpd-integration.patch:
Index: eclipse-phpeclipse-httpd-integration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/F-9/eclipse-phpeclipse-httpd-integration.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-phpeclipse-httpd-integration.patch 29 Jun 2008 00:01:59 -0000 1.3
+++ eclipse-phpeclipse-httpd-integration.patch 29 Jun 2008 18:32:44 -0000 1.4
@@ -328,51 +328,3 @@
+ }
}
\ No newline at end of file
---- net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java 2008-01-14 03:40:19.000000000 +0000
-+++ net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java 2008-06-28 13:46:23.000000000 +0100
-@@ -145,30 +145,22 @@
- if (store == null) {
- store = WebUI.getDefault().getPreferenceStore();
- }
-- // IPath path = file.getFullPath();
-- String localhostURL = file.getFullPath().toString();
-- String lowerCaseFileName = localhostURL.toLowerCase();
-- //removed by ed_mann for RSE fixes testing
-- // String documentRoot =
-- // store.getString(PHPeclipsePlugin.DOCUMENTROOT_PREF);
-- //IPath documentRootPath = ProjectPrefUtil.getDocumentRoot(file
-- // .getProject());
-- IPath documentRootPath = file.getProject().getFullPath();
-- String documentRoot = documentRootPath.toString().toLowerCase();
-- if (lowerCaseFileName.startsWith(documentRoot)) {
-- localhostURL = localhostURL.substring(documentRoot.length());
-- } else {
-- return null;
-- }
-- // return store.getString(PHPeclipsePlugin.LOCALHOST_PREF) +
-- // localhostURL;
-- String projectPath = ProjectPrefUtil.getMiscProjectsPreferenceValue(file
-+ String filePath = file.getFullPath().toString();
-+ String projectURI = ProjectPrefUtil.getMiscProjectsPreferenceValue(file
- .getProject(), IPreferenceConstants.PHP_LOCALHOST_PREF);
-- if(projectPath.endsWith("/") && localhostURL.startsWith("/")) {
-- localhostURL = localhostURL.substring(1);
-+ String projectDocRoot = ProjectPrefUtil.getMiscProjectsPreferenceValue(file
-+ .getProject(), IPreferenceConstants.PHP_DOCUMENTROOT_PREF);
-+
-+ if (filePath.startsWith(projectDocRoot)) {
-+ filePath = filePath.substring(projectDocRoot.length());
-+ }
-+ if(projectURI.endsWith("/") && filePath.startsWith("/")) {
-+ filePath = filePath.substring(1);
- }
-- return projectPath + localhostURL;
-+
-+ return projectURI + filePath;
- }
-- return "http://localhost";
-+ return ProjectPrefUtil.getMiscProjectsPreferenceValue(file
-+ .getProject(), IPreferenceConstants.PHP_LOCALHOST_PREF);
- }
- }
-\ No newline at end of file
Index: eclipse-phpeclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/F-9/eclipse-phpeclipse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-phpeclipse.spec 29 Jun 2008 00:01:59 -0000 1.5
+++ eclipse-phpeclipse.spec 29 Jun 2008 18:32:44 -0000 1.6
@@ -3,7 +3,7 @@
Name: eclipse-phpeclipse
Version: 1.2.0
-Release: 0.1.svn1573%{?dist}
+Release: 0.2.svn1573%{?dist}
Summary: PHP Eclipse plugin
Group: Development/Tools
License: CPL
@@ -20,6 +20,8 @@
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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +56,8 @@
%patch2 -p0
%patch3 -p0
%patch4 -p0
+%patch5 -p0
+%patch6 -p0
# ditch bundled libs in favor of building against fedora packaged libs
rm net.sourceforge.phpeclipse.phpmanual.htmlparser/sax2.jar \
@@ -149,6 +153,10 @@
%endif
%changelog
+* Sun Jun 29 2008 Mat Booth <fedora at matbooth.co.uk> 1.2.0-0.2.svn1573
+- Add patch for Show External Preview functionality.
+- Add patch for Use External PHP Parser functionality.
+
* Sat Jun 28 2008 Mat Booth <fedora at matbooth.co.uk> 1.2.0-0.1.svn1573
- New maintainer.
- Update to version 1.2.0 pre-release, svn1573.
- Previous message (by thread): rpms/eclipse-phpeclipse/devel eclipse-phpeclipse-external-parser.patch, NONE, 1.1 eclipse-phpeclipse-external-preview.patch, NONE, 1.1 eclipse-phpeclipse-httpd-integration.patch, 1.3, 1.4 eclipse-phpeclipse.spec, 1.5, 1.6
- Next message (by thread): rpms/bootconf/devel bootconf.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list