git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1134
6f19259b-4bc3-4df7-8a09-
765794883524
package org.tianocore.build;\r
\r
import java.io.File;\r
package org.tianocore.build;\r
\r
import java.io.File;\r
-import java.io.FileInputStream;\r
-import java.io.InputStream;\r
import java.util.Vector;\r
\r
import javax.xml.namespace.QName;\r
import java.util.Vector;\r
\r
import javax.xml.namespace.QName;\r
-import javax.xml.parsers.DocumentBuilder;\r
-import javax.xml.parsers.DocumentBuilderFactory;\r
\r
import org.apache.tools.ant.BuildException;\r
import org.apache.tools.ant.Project;\r
\r
import org.apache.tools.ant.BuildException;\r
import org.apache.tools.ant.Project;\r
import org.tianocore.build.id.FpdModuleIdentification;\r
import org.w3c.dom.Document;\r
import org.w3c.dom.Element;\r
import org.tianocore.build.id.FpdModuleIdentification;\r
import org.w3c.dom.Document;\r
import org.w3c.dom.Element;\r
-import org.w3c.dom.NamedNodeMap;\r
import org.w3c.dom.Node;\r
import org.w3c.dom.Node;\r
-import org.w3c.dom.NodeList;\r
\r
/** \r
<p><code>FfsProcess</code> is a class to find the corresponding FFS layout. </p>\r
\r
/** \r
<p><code>FfsProcess</code> is a class to find the corresponding FFS layout. </p>\r
\r
public String getPackageRelativeDir(){\r
prepareSpdFile();\r
\r
public String getPackageRelativeDir(){\r
prepareSpdFile();\r
- return spdFile.getParent().substring(GlobalData.getWorkspacePath().length() + 1);\r
+ String relativeDir =spdFile.getParent().substring(GlobalData.getWorkspacePath().length());\r
+ if(relativeDir.startsWith("\\") || relativeDir.startsWith("/")) {\r
+ relativeDir = relativeDir.substring(1);\r
+ }\r
+ return relativeDir;\r
}\r
\r
private void prepareSpdFile(){\r
}\r
\r
private void prepareSpdFile(){\r
}\r
\r
public String getRelativeFpdFile (){\r
}\r
\r
public String getRelativeFpdFile (){\r
- return fpdFile.getPath().substring(GlobalData.getWorkspacePath().length() + 1);\r
+ String relativeDir = fpdFile.getPath().substring(GlobalData.getWorkspacePath().length());\r
+ if(relativeDir.startsWith("\\") || relativeDir.startsWith("/")) {\r
+ relativeDir = relativeDir.substring(1);\r
+ }\r
+ return relativeDir;\r
}\r
\r
public String getPlatformRelativeDir(){\r
}\r
\r
public String getPlatformRelativeDir(){\r
- return fpdFile.getParent().substring(GlobalData.getWorkspacePath().length() + 1);\r
+ String relativeDir = fpdFile.getParent().substring(GlobalData.getWorkspacePath().length());\r
+ if(relativeDir.startsWith("\\") || relativeDir.startsWith("/")) {\r
+ relativeDir = relativeDir.substring(1);\r
+ }\r
+ return relativeDir;\r
}\r
}
\ No newline at end of file
}\r
}
\ No newline at end of file