Attachment 228312 Details for Bug 397685 – patches ptp projects for tau contribution

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patches ptp projects for tau contribution

org.eclipse.ptp.etfw.tau.patch (text/plain), 5.81 KB, created by Chris Navarro

on 2013-03-12 16:33:37 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Navarro

Created: 2013-03-12 16:33:37 EDT

Size: 5.81 KB

patch

obsolete

>diff --git a/releng/org.eclipse.ptp.etfw-feature/feature.xml b/releng/org.eclipse.ptp.etfw-feature/feature.xml
>index 896d008..c228226 100644
>--- a/releng/org.eclipse.ptp.etfw-feature/feature.xml
>+++ b/releng/org.eclipse.ptp.etfw-feature/feature.xml
>@@ -87,4 +87,11 @@
>          version="0.0.0"
>          unpack="false"/>
> 
>+   <plugin
>+         id="org.eclipse.ptp.etfw.jaxb.contrib"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         unpack="false"/>
>+
> </feature>
>diff --git a/releng/org.eclipse.ptp.etfw.tau-feature/feature.xml b/releng/org.eclipse.ptp.etfw.tau-feature/feature.xml
>index 57abef3..6641026 100644
>--- a/releng/org.eclipse.ptp.etfw.tau-feature/feature.xml
>+++ b/releng/org.eclipse.ptp.etfw.tau-feature/feature.xml
>@@ -64,4 +64,11 @@
>          version="0.0.0"
>          unpack="false"/>
> 
>+   <plugin
>+         id="org.eclipse.ptp.etfw.tau.ui"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         unpack="false"/>
>+
> </feature>
>diff --git a/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF
>index 91b727b..3703a64 100644
>--- a/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF
>+++ b/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF
>@@ -23,6 +23,7 @@
>    org.eclipse.ptp.launch,
>    org.eclipse.ptp.rm.lml.monitor.core,
>    org.eclipse.ptp.etfw.launch,
>-   org.eclipse.ptp.etfw.jaxb",
>+   org.eclipse.ptp.etfw.jaxb,
>+   org.eclipse.ptp.etfw.tau.ui",
>  org.eclipse.ptp.rm.jaxb.core,
>  org.eclipse.ptp.rm.jaxb.core.data
>diff --git a/tools/etfw/org.eclipse.ptp.etfw.tau/src/org/eclipse/ptp/etfw/tau/TAUPerformanceDataManager.java b/tools/etfw/org.eclipse.ptp.etfw.tau/src/org/eclipse/ptp/etfw/tau/TAUPerformanceDataManager.java
>index 7d27c88..08408bf 100644
>--- a/tools/etfw/org.eclipse.ptp.etfw.tau/src/org/eclipse/ptp/etfw/tau/TAUPerformanceDataManager.java
>+++ b/tools/etfw/org.eclipse.ptp.etfw.tau/src/org/eclipse/ptp/etfw/tau/TAUPerformanceDataManager.java
>@@ -61,7 +61,15 @@
> 	 * @throws CoreException
> 	 */
> 	private static String getTauMakefile(ILaunchConfiguration configuration) throws CoreException {
>-		return configuration.getAttribute(ITAULaunchConfigurationConstants.TAU_MAKEFILE, (String) null);
>+		String etfwVersion = configuration.getAttribute(IToolLaunchConfigurationConstants.ETFW_VERSION,
>+				IToolLaunchConfigurationConstants.EMPTY);
>+		String attributeKey = ITAULaunchConfigurationConstants.TAU_MAKEFILE;
>+		if (!etfwVersion.equals(IToolLaunchConfigurationConstants.USE_SAX_PARSER)) {
>+			String controlId = configuration.getAttribute("org.eclipse.ptp.launch.RESOURCE_MANAGER_NAME", //$NON-NLS-1$
>+					IToolLaunchConfigurationConstants.EMPTY);
>+			attributeKey = controlId + IToolLaunchConfigurationConstants.DOT + attributeKey;
>+		}
>+		return configuration.getAttribute(attributeKey, (String) null);
> 	}
> 
> 	@Override
>@@ -185,39 +193,39 @@
> 		return IDs;
> 	}
> 
>-
> 	/**
> 	 * Returns true if the directory exists and contains a tau profile or tau xml file.
>+	 * 
> 	 * @param directory
> 	 * @param utils
> 	 * @return
> 	 */
>-	private boolean checkDirectory(String directory,IBuildLaunchUtils utils){
>+	private boolean checkDirectory(String directory, IBuildLaunchUtils utils) {
> 		IFileStore d = utils.getFile(directory);
> 		boolean check = d.fetchInfo().exists();
>-		if(!check)
>+		if (!check)
> 			return false;
>-		
>+
> 		try {
> 			String[] children = d.childNames(EFS.NONE, null);
>-			for (int i=0;i<children.length;i++)
>+			for (int i = 0; i < children.length; i++)
> 			{
>-				if(children[i].contains(PROFXML)||children[i].contains("profile.0.0.0"))
>+				if (children[i].contains(PROFXML) || children[i].contains("profile.0.0.0"))
> 					return true;
> 			}
>-			
>+
> 		} catch (CoreException e) {
>-			
>+
> 			e.printStackTrace();
> 			return false;
> 		}
>-		
>+
> 		return false;
> 	}
>-	
>+
> 	@Override
> 	public void process(String projname, ILaunchConfiguration configuration, String directory) throws CoreException {
>-		//String projectDirectory = directory;
>+		// String projectDirectory = directory;
> 		boolean profsummary = configuration.getAttribute(ITAULaunchConfigurationConstants.PROFSUMMARY, false);
> 		IBuildLaunchUtils tmpub = new BuildLaunchUtils();
> 		String pppath = tmpub.checkToolEnvPath("paraprof");
>@@ -230,28 +238,30 @@
> 		}
> 
> 		/*
>-		 * Determining if the job was local or remote at this point is tricky.  It's safest to see if profiles are available locally and if not use the remote location.
>+		 * Determining if the job was local or remote at this point is tricky. It's safest to see if profiles are available locally
>+		 * and if not use the remote location.
> 		 */
>-		boolean dirgood=checkDirectory(directory,tmpub);
>-		
>-		if (!dirgood&&LaunchUtils.getRemoteServicesId(configuration) != null) {
>+		boolean dirgood = checkDirectory(directory, tmpub);
>+
>+		if (!dirgood && LaunchUtils.getRemoteServicesId(configuration) != null) {
> 			utilBlob = new RemoteBuildLaunchUtils(configuration);
> 		} else {
> 			utilBlob = tmpub;
> 		}
> 
>-		String tmpDir=null;
>-		if(!dirgood){
>-		tmpDir = utilBlob.getWorkingDirectory();
>-		if (tmpDir != null) {
>-			directory = tmpDir;
>-		}}
>-		
>-		dirgood=checkDirectory(directory,utilBlob);
>-		if(!dirgood){
>-			tmpDir=configuration.getAttribute(IToolLaunchConfigurationConstants.PROJECT_DIR, "");
>-			if(tmpDir!=null)
>-				directory=tmpDir;
>+		String tmpDir = null;
>+		if (!dirgood) {
>+			tmpDir = utilBlob.getWorkingDirectory();
>+			if (tmpDir != null) {
>+				directory = tmpDir;
>+			}
>+		}
>+
>+		dirgood = checkDirectory(directory, utilBlob);
>+		if (!dirgood) {
>+			tmpDir = configuration.getAttribute(IToolLaunchConfigurationConstants.PROJECT_DIR, "");
>+			if (tmpDir != null)
>+				directory = tmpDir;
> 		}
> 
> 		tbpath = utilBlob.getToolPath(Messages.TAUPerformanceDataManager_0);
>@@ -517,8 +527,6 @@
> 	}
> 
> 	private static final String PARAPROFCONSOLE = "TAU Profile Output";
>-
>-
> 
> 	@Override
> 	public void view() {

Actions: View | Diff

Attachments on bug 397685: 225346 | 227098 | 227099 | 228311 | 228312