This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

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

(-)a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/MakeConfiguration.java (+4 lines)
Lines 1151-1157 Link Here
1151 
        if (!CndPathUtilities.isPathAbsolute(output)) {
 1151 
        if (!CndPathUtilities.isPathAbsolute(output)) {
1152 
            output = getBaseDir() + "/" + output; // NOI18N
 1152 
            output = getBaseDir() + "/" + output; // NOI18N
1153 
            output = CndPathUtilities.normalizeSlashes(output);
 1153 
            output = CndPathUtilities.normalizeSlashes(output);
1154 
            boolean isNetworkPath = output.startsWith("//");
1154 
            output = CndPathUtilities.normalizeUnixPath(output);
 1155 
            output = CndPathUtilities.normalizeUnixPath(output);
1156 
            if (isNetworkPath && !output.startsWith("//")) {
1157 
                output = "/"+output; // NOI18N
1158 
            }
1155 
        }
 1159 
        }
1156 
        return expandMacros(output);
 1160 
        return expandMacros(output);
1157 
    }
 1161 
    }
(-)a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/MakeConfigurationDescriptor.java (-1 / +1 lines)
Lines 637-643 Link Here
637 
            // Then try absolute if relative or relative if absolute
 637 
            // Then try absolute if relative or relative if absolute
638 
            String newPath;
 638 
            String newPath;
639 
            if (CndPathUtilities.isPathAbsolute(path)) {
 639 
            if (CndPathUtilities.isPathAbsolute(path)) {
640 
                newPath = CndPathUtilities.toRelativePath(getBaseDir(), CndPathUtilities.naturalizeSlashes(path));
 640 
                newPath = CndPathUtilities.toRelativePath(getBaseDir(), path);
641 
            } else {
 641 
            } else {
642 
                newPath = CndPathUtilities.toAbsolutePath(getBaseDirFileObject(), path);
 642 
                newPath = CndPathUtilities.toAbsolutePath(getBaseDirFileObject(), path);
643 
            }
 643 
            }
(-)a/cnd.utils/src/org/netbeans/modules/cnd/utils/CndPathUtilities.java (-1 / +4 lines)
Lines 702-708 Link Here
702 
        String absPrefix = null;
 702 
        String absPrefix = null;
703 

          703
          

        

        

          704
          
        if (isPathAbsolute(path)) {

          704
          
        if (isPathAbsolute(path)) {

        

          
            

              705
              
            if (path.charAt(0) == '/') {


              705
              
            if (path.length() >= 2 && path.charAt(0) == '/' && path.charAt(1) == '/') {

            

            

              
              

              706
              
                absPrefix = "//"; // NOI18N

            

            


              707
              
                path = path.substring(2);

            

            


              708
              
            } else if (path.charAt(0) == '/') {

            

        

          706
          
                absPrefix = "/"; // NOI18N

          709
          
                absPrefix = "/"; // NOI18N

        

        

          707
          
                path = path.substring(1);

          710
          
                path = path.substring(1);

        

        

          708
          
            } else if (path.charAt(1) == ':') {

          711
          
            } else if (path.charAt(1) == ':') {

        






  

  Return to bug 258822