project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/model/bldinf/BldInfView.java
changeset 610 bfb3ab3f70f2
parent 0 fb279309251b
child 1709 6bd6640867aa
--- a/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/model/bldinf/BldInfView.java	Wed Dec 02 14:40:51 2009 -0600
+++ b/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/model/bldinf/BldInfView.java	Wed Dec 02 15:02:05 2009 -0600
@@ -41,7 +41,7 @@
 	/**
 	 * 
 	 */
-	public static final String EPOC32_INCLUDE = "\\epoc32\\include"; //$NON-NLS-1$
+	public static final String EPOC32_INCLUDE = "/epoc32/include"; //$NON-NLS-1$
 	public static final String ZIP_MODIFIER = ":zip"; //$NON-NLS-1$
 	public static final String PRJ_EXPORTS_KEYWORD = "PRJ_EXPORTS"; //$NON-NLS-1$
 	public static final String PRJ_TESTEXPORTS_KEYWORD = "PRJ_TESTEXPORTS"; //$NON-NLS-1$
@@ -105,7 +105,11 @@
 	 * @return
 	 */
 	private IPath fromBldInfToProjectPath(IPath bldinfPath) {
-		IPath path = currentDirectory != null && !bldinfPath.isAbsolute() ? currentDirectory.append(bldinfPath) : bldinfPath;
+		IPath path;
+		if (currentDirectory != null && !isAbsolutePath(bldinfPath))
+			path = currentDirectory.append(bldinfPath);
+		else
+			path = bldinfPath;
 		if (FileUtils.isPathInParent(path)) {
 			path = getProjectPath().append(path);
 		}
@@ -136,7 +140,7 @@
 	 * @return BldInf-relative directory 
 	 */
 	IPath fromProjectToBldInfPath(IPath projectPath) {
-		if (projectPath.isAbsolute())
+		if (isAbsolutePath(projectPath))
 			return projectPath;
 		return fromProjectToRelativePath(currentDirectory, projectPath);
 	}
@@ -277,7 +281,7 @@
 				path = fromBldInfToProjectPath(pathName.substring(1));
 			} else {
 				path = FileUtils.createPossiblyRelativePath(pathName);
-				if (!path.isAbsolute())
+				if (!isAbsolutePath(path))
 					path = new Path(EPOC32_INCLUDE).append(path);
 			}
 		}
@@ -311,7 +315,7 @@
 				} else {
 					return epocIncludeRelPath;
 				}
-			} else if (!projectPath.isAbsolute()) {
+			} else if (!isAbsolutePath(projectPath)) {
 				// project-relative
 				return new Path("|" + fromProjectToBldInfPath(projectPath).toString());
 			}