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

Bug 322283

Summary:

[eclipse-build] Strip ${destDir} from provisioned path

Product:

[Tools] Linux Tools

Reporter:

Andrew Overholt <overholt>

Component:

eclipse-build

Assignee:

Packaging Tools Inbox <linux.packagingtools-inbox>

Status:

RESOLVED FIXED

QA Contact:

Severity:

normal

Priority:

CC:

akurtakov, bdrung

Version:

unspecified

Target Milestone:

0.6.1

Hardware:

OS:

Linux

Whiteboard:

Attachments:

Description	Flags
patch from Benjamin Drung as attached to bug #319473	none
patch updated to apply to trunk	overholt: iplog+

Description Andrew Overholt

2010-08-10 16:06:53 EDT

+++ This was originally created as a split off from bug #319473 +++

After building and installing the Eclipse SDK with the p2 director, "${destDir}" remains in some repository preferences, eclipse.ini, and content.xml.  We should strip these references.

Comment 1 Andrew Overholt

2010-08-10 16:08:04 EDT

Created attachment 176280 [details]
patch from Benjamin Drung as attached to bug #319473

This is just a copy of this attachment:

https://bugs.eclipse.org/bugs/attachment.cgi?id=173978

Comment 2 Andrew Overholt

2010-08-10 16:12:35 EDT

Created attachment 176281 [details]
patch updated to apply to trunk

Ignore the whitespace changes at the top :)

Comment 3 Andrew Overholt

2010-08-10 16:13:20 EDT

Benjamin, what is this supposed to do?  I don't see references to destDir in the files listed in the <apply> block.

Comment 4 Benjamin Drung

2010-08-10 16:17:43 EDT

It calls sed, which replaces ${destDir} with ${destDirWithUnderscores} ("<arg value="s@${destDir}@@g;s@${destDirWithUnderscores}@@g" />").

Comment 5 Benjamin Drung

2010-08-10 16:21:00 EDT

Ignore my previous explanation. Here's the correct one: The sed command is "s@${destDir}@@g;s@${destDirWithUnderscores}@@g". Part one of it (s@${destDir}@@g) replaces ${destDir} with nothing and part two replaces ${destDirWithUnderscores} with nothing.

Comment 6 Andrew Overholt

2010-08-10 16:39:56 EDT

I understand what the sed commands are doing :)  I just don't see why this is necessary as the files it's touching don't have any references to destDir in them.

Comment 7 Andrew Overholt

2010-08-10 17:10:08 EDT

I see references to the installation directory in these files:

configuration/org.eclipse.update/install.log
eclipse
p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs
p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.artifact.repository.prefs
plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.0.v20100503/eclipse_1307.so

There's probably little to be done about the binaries bug the other files we should fix.  I don't understand how line 884 of build.xml didn't get rid of install.log.

Comment 8 Andrew Overholt

2010-08-17 15:21:27 EDT

This was committed as part of the larger installation directory cleanup in revision #25363.  Thanks for the patch!