Attachment #228312 for bug #397685

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

View | Details | Raw Unified | Return to bug 397685
Collapse All | Expand All

Lines 87-90 Link Here

(-)a/releng/org.eclipse.ptp.etfw-feature/feature.xml (+7 lines)
87	version="0.0.0"	87	version="0.0.0"
88	unpack="false"/>	88	unpack="false"/>
89		89
		90	<plugin
		91	id="org.eclipse.ptp.etfw.jaxb.contrib"
		92	download-size="0"
		93	install-size="0"
		94	version="0.0.0"
		95	unpack="false"/>
		96
90	</feature>	97	</feature>

Lines 64-67 Link Here

(-)a/releng/org.eclipse.ptp.etfw.tau-feature/feature.xml (+7 lines)
64	version="0.0.0"	64	version="0.0.0"
65	unpack="false"/>	65	unpack="false"/>
66		66
		67	<plugin
		68	id="org.eclipse.ptp.etfw.tau.ui"
		69	download-size="0"
		70	install-size="0"
		71	version="0.0.0"
		72	unpack="false"/>
		73
67	</feature>	74	</feature>

Lines 23-28 Link Here

(-)a/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF (-1 / +2 lines)
23	org.eclipse.ptp.launch,	23	org.eclipse.ptp.launch,
24	org.eclipse.ptp.rm.lml.monitor.core,	24	org.eclipse.ptp.rm.lml.monitor.core,
25	org.eclipse.ptp.etfw.launch,	25	org.eclipse.ptp.etfw.launch,
26	org.eclipse.ptp.etfw.jaxb",	26	org.eclipse.ptp.etfw.jaxb,
		27	org.eclipse.ptp.etfw.tau.ui",
27	org.eclipse.ptp.rm.jaxb.core,	28	org.eclipse.ptp.rm.jaxb.core,
28	org.eclipse.ptp.rm.jaxb.core.data	29	org.eclipse.ptp.rm.jaxb.core.data




	 * @throws CoreException
	 */
	private static String getTauMakefile(ILaunchConfiguration configuration) throws CoreException {
		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

		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) {
		IFileStore d = utils.getFile(directory);
		boolean check = d.fetchInfo().exists();
		if (!check)
			return false;

		try {
			String[] children = d.childNames(EFS.NONE, null);
			for (int i = 0; i < children.length; i++)
			{
				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;
		boolean profsummary = configuration.getAttribute(ITAULaunchConfigurationConstants.PROFSUMMARY, false);
		IBuildLaunchUtils tmpub = new BuildLaunchUtils();
		String pppath = tmpub.checkToolEnvPath("paraprof");

		}

		/*
		 * 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) {
			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;
		}

		tbpath = utilBlob.getToolPath(Messages.TAUPerformanceDataManager_0);

	}

	private static final String PARAPROFCONSOLE = "TAU Profile Output";



	@Override
	public void view() {

Return to bug 397685

Lines 61-67 Link Here

(-)a/tools/etfw/org.eclipse.ptp.etfw.tau/src/org/eclipse/ptp/etfw/tau/TAUPerformanceDataManager.java (-30 / +38 lines)
61	* @throws CoreException	61	* @throws CoreException
62	*/	62	*/
63	private static String getTauMakefile(ILaunchConfiguration configuration) throws CoreException {	63	private static String getTauMakefile(ILaunchConfiguration configuration) throws CoreException {
64	return configuration.getAttribute(ITAULaunchConfigurationConstants.TAU_MAKEFILE, (String) null);	64	String etfwVersion = configuration.getAttribute(IToolLaunchConfigurationConstants.ETFW_VERSION,
		65	IToolLaunchConfigurationConstants.EMPTY);
		66	String attributeKey = ITAULaunchConfigurationConstants.TAU_MAKEFILE;
		67	if (!etfwVersion.equals(IToolLaunchConfigurationConstants.USE_SAX_PARSER)) {
		68	String controlId = configuration.getAttribute("org.eclipse.ptp.launch.RESOURCE_MANAGER_NAME", //$NON-NLS-1$
		69	IToolLaunchConfigurationConstants.EMPTY);
		70	attributeKey = controlId + IToolLaunchConfigurationConstants.DOT + attributeKey;
		71	}
		72	return configuration.getAttribute(attributeKey, (String) null);
65	}	73	}
66		74
67	@Override	75	@Override
Lines 185-223 Link Here
185	return IDs;	193	return IDs;
186	}	194	}
187		195
188
189	/**	196	/**
190	* Returns true if the directory exists and contains a tau profile or tau xml file.	197	* Returns true if the directory exists and contains a tau profile or tau xml file.
		198	*
191	* @param directory	199	* @param directory
192	* @param utils	200	* @param utils
193	* @return	201	* @return
194	*/	202	*/
195	private boolean checkDirectory(String directory,IBuildLaunchUtils utils){	203	private boolean checkDirectory(String directory, IBuildLaunchUtils utils) {
196	IFileStore d = utils.getFile(directory);	204	IFileStore d = utils.getFile(directory);
197	boolean check = d.fetchInfo().exists();	205	boolean check = d.fetchInfo().exists();
198	if(!check)	206	if (!check)
199	return false;	207	return false;
200		208
201	try {	209	try {
202	String[] children = d.childNames(EFS.NONE, null);	210	String[] children = d.childNames(EFS.NONE, null);
203	for (int i=0;i<children.length;i++)	211	for (int i = 0; i < children.length; i++)
204	{	212	{
205	if(children[i].contains(PROFXML)\|\|children[i].contains("profile.0.0.0"))	213	if (children[i].contains(PROFXML) \|\| children[i].contains("profile.0.0.0"))
206	return true;	214	return true;
207	}	215	}
208		216
209	} catch (CoreException e) {	217	} catch (CoreException e) {
210		218
211	e.printStackTrace();	219	e.printStackTrace();
212	return false;	220	return false;
213	}	221	}
214		222
215	return false;	223	return false;
216	}	224	}
217		225
218	@Override	226	@Override
219	public void process(String projname, ILaunchConfiguration configuration, String directory) throws CoreException {	227	public void process(String projname, ILaunchConfiguration configuration, String directory) throws CoreException {
220	//String projectDirectory = directory;	228	// String projectDirectory = directory;
221	boolean profsummary = configuration.getAttribute(ITAULaunchConfigurationConstants.PROFSUMMARY, false);	229	boolean profsummary = configuration.getAttribute(ITAULaunchConfigurationConstants.PROFSUMMARY, false);
222	IBuildLaunchUtils tmpub = new BuildLaunchUtils();	230	IBuildLaunchUtils tmpub = new BuildLaunchUtils();
223	String pppath = tmpub.checkToolEnvPath("paraprof");	231	String pppath = tmpub.checkToolEnvPath("paraprof");
Lines 230-257 Link Here
230	}	238	}
231		239
232	/*	240	/*
233	* 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.	241	* Determining if the job was local or remote at this point is tricky. It's safest to see if profiles are available locally
		242	* and if not use the remote location.
234	*/	243	*/
235	boolean dirgood=checkDirectory(directory,tmpub);	244	boolean dirgood = checkDirectory(directory, tmpub);
236		245
237	if (!dirgood&&LaunchUtils.getRemoteServicesId(configuration) != null) {	246	if (!dirgood && LaunchUtils.getRemoteServicesId(configuration) != null) {
238	utilBlob = new RemoteBuildLaunchUtils(configuration);	247	utilBlob = new RemoteBuildLaunchUtils(configuration);
239	} else {	248	} else {
240	utilBlob = tmpub;	249	utilBlob = tmpub;
241	}	250	}
242		251
243	String tmpDir=null;	252	String tmpDir = null;
244	if(!dirgood){	253	if (!dirgood) {
245	tmpDir = utilBlob.getWorkingDirectory();	254	tmpDir = utilBlob.getWorkingDirectory();
246	if (tmpDir != null) {	255	if (tmpDir != null) {
247	directory = tmpDir;	256	directory = tmpDir;
248	}}	257	}
249		258	}
250	dirgood=checkDirectory(directory,utilBlob);	259
251	if(!dirgood){	260	dirgood = checkDirectory(directory, utilBlob);
252	tmpDir=configuration.getAttribute(IToolLaunchConfigurationConstants.PROJECT_DIR, "");	261	if (!dirgood) {
253	if(tmpDir!=null)	262	tmpDir = configuration.getAttribute(IToolLaunchConfigurationConstants.PROJECT_DIR, "");
254	directory=tmpDir;	263	if (tmpDir != null)
		264	directory = tmpDir;
255	}	265	}
256		266
257	tbpath = utilBlob.getToolPath(Messages.TAUPerformanceDataManager_0);	267	tbpath = utilBlob.getToolPath(Messages.TAUPerformanceDataManager_0);
Lines 517-524 Link Here
517	}	527	}
518		528
519	private static final String PARAPROFCONSOLE = "TAU Profile Output";	529	private static final String PARAPROFCONSOLE = "TAU Profile Output";
520
521
522		530
523	@Override	531	@Override
524	public void view() {	532	public void view() {