remove some preliminary work for linked resources that was merged from C3_BUILDER_WORK to default that should not have been
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java Fri Sep 03 13:35:52 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java Fri Sep 03 14:56:39 2010 -0500
@@ -1914,15 +1914,8 @@
public Object run(IBldInfData infView) {
for (final IMMPReference mmp : infView.getAllMMPReferences()) {
-
- IPath workspaceRelativeMMPPath1 = null;
- if (info.getProjectRelativeBldInfPath().isAbsolute()){
- workspaceRelativeMMPPath1 = mmp.getPath();
- } else {
- workspaceRelativeMMPPath1 = new Path(info.getProject().getName()).append(mmp.getPath());
- }
+ final IPath workspaceRelativeMMPPath = new Path(info.getProject().getName()).append(mmp.getPath());
- final IPath workspaceRelativeMMPPath = workspaceRelativeMMPPath1;
EpocEnginePlugin.runWithMMPData(workspaceRelativeMMPPath,
new DefaultMMPViewConfiguration(info.getProject(), buildConfig.getBuildContext(), new AcceptedNodesViewFilter()),
new MMPDataRunnableAdapter() {
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideProjectInfo.java Fri Sep 03 13:35:52 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideProjectInfo.java Fri Sep 03 14:56:39 2010 -0500
@@ -327,9 +327,6 @@
}
public IPath getAbsoluteBldInfPath(){
- if (projectRelativeBldInfPath.isAbsolute()){
- return projectRelativeBldInfPath;
- }
return CarbideBuilderPlugin.getProjectRoot(projectTracker.getProject()).append(projectRelativeBldInfPath);
}
@@ -338,9 +335,6 @@
}
public IPath getWorkspaceRelativeBldInfPath(){
- if (projectRelativeBldInfPath.isAbsolute()){
- return projectRelativeBldInfPath;
- }
return new Path(projectTracker.getProject().getName()).append(projectRelativeBldInfPath);
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/ProjectUIPlugin.java Fri Sep 03 13:35:52 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/ProjectUIPlugin.java Fri Sep 03 14:56:39 2010 -0500
@@ -276,16 +276,6 @@
store.setValue(PreferenceConstants.PREF_KEEP_PROJECTS_IN_SYNC, keepInSync);
}
- public static boolean supportLinkedResources() {
- IPreferenceStore store = ProjectUIPlugin.getDefault().getPreferenceStore();
- return store.getBoolean(PreferenceConstants.PREF_SUPPORT_LINKED_RESOURCES);
- }
-
- public static void setSupportLinkedResources(boolean supported) {
- IPreferenceStore store = ProjectUIPlugin.getDefault().getPreferenceStore();
- store.setValue(PreferenceConstants.PREF_SUPPORT_LINKED_RESOURCES, supported);
- }
-
public static int getAddFilesToProjectOption() {
IPreferenceStore store = ProjectUIPlugin.getDefault().getPreferenceStore();
return store.getInt(PreferenceConstants.PREF_ADDED_FILES_OPTION);
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfImportWizard.java Fri Sep 03 13:35:52 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfImportWizard.java Fri Sep 03 14:56:39 2010 -0500
@@ -89,7 +89,6 @@
final String projectName = projectPropertiesPage.getProjectName();
final IPath rootDirectory = projectPropertiesPage.getRootDirectory();
- final boolean isLinkedProject = projectPropertiesPage.linkedResourcesEnabled();
// calculate the project relative path to the bld.inf file.
IPath absoluteBldInfPath = new Path(getBldInfFile());
@@ -110,21 +109,13 @@
monitor.beginTask(Messages.BldInfImportWizard_CreatingProjectJobName, IProgressMonitor.UNKNOWN);
IProject newProject = null;
- if (isLinkedProject){
- newProject = ProjectCorePlugin.createProject(projectName, null);
- newProject.getFolder(rootDirectory.lastSegment()).createLink(rootDirectory.toFile().toURI(), IResource.BACKGROUND_REFRESH, new NullProgressMonitor());
- } else {
- newProject = ProjectCorePlugin.createProject(projectName, rootDirectory.toOSString());
- }
+ newProject = ProjectCorePlugin.createProject(projectName, rootDirectory.toOSString());
+
monitor.worked(1);
newProject.setSessionProperty(CarbideBuilderPlugin.SBSV2_PROJECT, Boolean.valueOf(useSBSv2Builder()));
- if (isLinkedProject){
- ProjectCorePlugin.postProjectCreatedActions(newProject, absoluteInfPath, selectedConfigs, components, null, null, monitor);
- } else {
- ProjectCorePlugin.postProjectCreatedActions(newProject, projectRelativePath, selectedConfigs, components, null, null, monitor);
- }
+ ProjectCorePlugin.postProjectCreatedActions(newProject, projectRelativePath, selectedConfigs, components, null, null, monitor);
if (monitor.isCanceled()) {
// the user canceled the import so delete the project
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/Messages.java Fri Sep 03 13:35:52 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/Messages.java Fri Sep 03 14:56:39 2010 -0500
@@ -112,10 +112,6 @@
public static String ProjectPropertiesPage_directoryTooLong;
public static String ProjectPropertiesPage_directoryIsRoot;
-
- public static String ProjectPropertiesPage_linkedProject;
-
- public static String ProjectPropertiesPage_linkedProjectTooltip;
static {
// initialize resource bundle
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/ProjectPropertiesPage.java Fri Sep 03 13:35:52 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/ProjectPropertiesPage.java Fri Sep 03 14:56:39 2010 -0500
@@ -44,7 +44,6 @@
import com.nokia.carbide.cdt.builder.EpocEngineHelper;
import com.nokia.carbide.cpp.internal.project.ui.ProjectUIHelpIds;
-import com.nokia.carbide.cpp.internal.project.ui.ProjectUIPlugin;
import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;
import com.nokia.cpp.internal.api.utils.ui.BrowseDialogUtils;
@@ -53,7 +52,6 @@
private Text projectName;
private Text rootDirectory;
private Button browseButton;
- private Button linkedResourcesCheck;
String projectNameText = ""; //$NON-NLS-1$
IPath rootDirectoryPath = null;
@@ -143,14 +141,6 @@
gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
gd.horizontalSpan = 3;
helpText.setLayoutData(gd);
-
- if (ProjectUIPlugin.supportLinkedResources()){
- linkedResourcesCheck = new Button(parent, SWT.CHECK);
- linkedResourcesCheck.setFont(font);
- linkedResourcesCheck.setText(Messages.ProjectPropertiesPage_linkedProject);
- linkedResourcesCheck.setToolTipText(Messages.ProjectPropertiesPage_linkedProjectTooltip);
- linkedResourcesCheck.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- }
setButtonLayoutData(browseButton);
}
@@ -288,15 +278,7 @@
public IPath getRootDirectory() {
return rootDirectoryPath;
}
-
- public boolean linkedResourcesEnabled(){
- if (linkedResourcesCheck == null){
- return false;
- }
-
- return linkedResourcesCheck.getSelection();
- }
-
+
@Override
public void setVisible(boolean visible) {
// this gets called just before the page goes in or out of view. if it's
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/messages.properties Fri Sep 03 13:35:52 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/messages.properties Fri Sep 03 14:56:39 2010 -0500
@@ -18,8 +18,6 @@
ProjectPropertiesPage_directoryDoesNotContainSourceFiles=The root directory specified does not contain all the source and resource files referenced in the project. This may make navigation and editing more difficult.
ProjectPropertiesPage_directoryTooLong=The root directory specified is too long. It cannot exceed 215 characters so that project settings files do not exceed the 256 character path limit.
ProjectPropertiesPage_directoryIsRoot=A project path near the root SDK directory can lead to slow import times. Please select another project path or import a subset of included bld.inf files (if possible).
-ProjectPropertiesPage_linkedProject=Create project with linked resources
-ProjectPropertiesPage_linkedProjectToolTip=When enabled, the eclipse project files are created in the workspace and all project content is formed with linked resources.
MMPSelectionPage_title=MMP Selection
MMPSelectionPage_description=Select the mmp and extension make files to work with. You will be able to edit this after the project has been created.
MMPSelectionPage_selectAllAButtonLabel=Select All
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/preferences/PreferenceConstants.java Fri Sep 03 13:35:52 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/preferences/PreferenceConstants.java Fri Sep 03 14:56:39 2010 -0500
@@ -28,6 +28,4 @@
public final static String PREF_CHANGED_FILES_OPTION = "changedFilesOption"; //$NON-NLS-1$
public static final String PREF_INDEX_ALL = "indexAll"; //$NON-NLS-1$
-
- public static final String PREF_SUPPORT_LINKED_RESOURCES = "supportsLinkedRsrcs"; //$NON-NLS-1$
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/preferences/PreferenceInitializer.java Fri Sep 03 13:35:52 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/preferences/PreferenceInitializer.java Fri Sep 03 14:56:39 2010 -0500
@@ -16,7 +16,6 @@
*/
package com.nokia.carbide.cpp.internal.project.ui.preferences;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.jface.preference.IPreferenceStore;
@@ -36,21 +35,6 @@
IPreferenceStore store = ProjectUIPlugin.getDefault().getPreferenceStore();
store.setDefault(PreferenceConstants.PREF_KEEP_PROJECTS_IN_SYNC, true);
store.setDefault(PreferenceConstants.PREF_INDEX_ALL, false);
-
- if (cmdLineArgsSupportsLinkedResources()){
- store.setDefault(PreferenceConstants.PREF_SUPPORT_LINKED_RESOURCES, true);
- } else {
- store.setDefault(PreferenceConstants.PREF_SUPPORT_LINKED_RESOURCES, false);
- }
- }
-
- private boolean cmdLineArgsSupportsLinkedResources(){
- String[] args = Platform.getCommandLineArgs();
- for (String arg : args){
- if (arg.equals("supportsLinkedRsrcs=true"))
- return true;
- }
- return false;
}
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/views/SPNViewContentProvider.java Fri Sep 03 13:35:52 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/views/SPNViewContentProvider.java Fri Sep 03 14:56:39 2010 -0500
@@ -43,7 +43,6 @@
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -71,7 +70,6 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.model.BaseWorkbenchContentProvider;
import org.eclipse.ui.model.IWorkbenchAdapter;
-import org.eclipse.ui.model.WorkbenchAdapter;
import com.nokia.carbide.cdt.builder.BldInfViewPathHelper;
import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
@@ -108,13 +106,15 @@
import com.nokia.carbide.cpp.epoc.engine.preprocessor.DefaultModelDocumentProvider;
import com.nokia.carbide.cpp.epoc.engine.preprocessor.DefaultTranslationUnitProvider;
import com.nokia.carbide.cpp.epoc.engine.preprocessor.IIncludeFileLocator;
+import com.nokia.carbide.cpp.internal.api.sdk.ISBSv1BuildInfo;
+import com.nokia.carbide.cpp.internal.api.sdk.ISBSv2BuildInfo;
import com.nokia.carbide.cpp.internal.project.ui.ProjectUIPlugin;
import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;
+import com.nokia.carbide.cpp.sdk.core.ISymbianBuilderID;
import com.nokia.carbide.cpp.sdk.core.ISymbianSDK;
import com.nokia.carbide.cpp.ui.CarbideUIPlugin;
import com.nokia.carbide.cpp.ui.ICarbideSharedImages;
import com.nokia.carbide.internal.api.cpp.epoc.engine.preprocessor.DependencyScanner;
-import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
/**
* Content provider for the SymbianProjectNavigatorView
@@ -2329,20 +2329,7 @@
if (info != null) {
IPath infPath = info.getProjectRelativeBldInfPath();
if (infPath != null) {
- IFile file = null;
- if (infPath.isAbsolute()){
- // Make sure to get the project relative location if the inf path is absolute.
- // This means the project has linked resources
- // TODO: Just using for prototyping with using linked resources....
- // XXX: This is still not working, as the path is relative to the workspace and
- // hence it's wrong. Seems we need to change the container for the SPN to take
- // a bld.inf as an absolute path???
- IFile infFile = ResourcesPlugin.getWorkspace().getRoot().getFile(infPath);
- children.add(infFile);
- return children.toArray();
- } else {
- file = getIFileFromBldInfViewPath(project, infPath);
- }
+ IFile file = getIFileFromBldInfViewPath(project, infPath);
if (file != null) {
children.add(containerFactory.getBldInfContainer(file, true));
@@ -2529,11 +2516,6 @@
}
protected IFile getIFileFromBldInfViewPath(IProject project, IPath pathFromBldInfView) {
-
- if (pathFromBldInfView.isAbsolute()){
- IWorkspace workspace= ResourcesPlugin.getWorkspace();
- return workspace.getRoot().getFile(pathFromBldInfView);
- }
EpocEnginePathHelper helper = new EpocEnginePathHelper(project);
IPath resolvedProjectRelativePath = helper.convertToProject(pathFromBldInfView);
if (resolvedProjectRelativePath != null)