Ecere Software
/
sdk
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
63ded70
)
ide; (#975) fixed space char in resources file name regression.
author
Rejean Loyer
<rejean.loyer@gmail.com>
Thu, 8 Aug 2013 19:02:20 +0000
(15:02 -0400)
committer
Jerome St-Louis
<jerome@ecere.com>
Fri, 9 Aug 2013 06:34:24 +0000
(
02:34
-0400)
ide/src/project/ProjectNode.ec
patch
|
blob
|
history
diff --git
a/ide/src/project/ProjectNode.ec
b/ide/src/project/ProjectNode.ec
index
7b714dc
..
aaf2e93
100644
(file)
--- a/
ide/src/project/ProjectNode.ec
+++ b/
ide/src/project/ProjectNode.ec
@@
-1452,7
+1452,7
@@
private:
strcpy(tempPath, path);
PathCatSlash(tempPath, name);
}
strcpy(tempPath, path);
PathCatSlash(tempPath, name);
}
- EscapeForMake(modulePath, tempPath,
tru
e, true, false);
+ EscapeForMake(modulePath, tempPath,
fals
e, true, false);
sprintf(s, "%s%s%s%s", ts.a, useRes ? "$(RES)" : "", modulePath, ts.b);
items.Add(CopyString(s));
}
sprintf(s, "%s%s%s%s", ts.a, useRes ? "$(RES)" : "", modulePath, ts.b);
items.Add(CopyString(s));
}
@@
-1463,8
+1463,8
@@
private:
!strcmpi(extension, "m") || !strcmpi(extension, "mm"))
{
char modulePath[MAX_LOCATION];
!strcmpi(extension, "m") || !strcmpi(extension, "mm"))
{
char modulePath[MAX_LOCATION];
- EscapeForMake(modulePath, path,
tru
e, true, false);
- EscapeForMake(moduleName, name,
tru
e, true, false);
+ EscapeForMake(modulePath, path,
fals
e, true, false);
+ EscapeForMake(moduleName, name,
fals
e, true, false);
sprintf(s, "%s%s%s%s%s", ts.a, modulePath, path[0] ? SEPS : "", moduleName, ts.b);
items.Add(CopyString(s));
}
sprintf(s, "%s%s%s%s%s", ts.a, modulePath, path[0] ? SEPS : "", moduleName, ts.b);
items.Add(CopyString(s));
}
@@
-1486,8
+1486,8
@@
private:
if(!strcmpi(extension, "rc"))
{
char modulePath[MAX_LOCATION];
if(!strcmpi(extension, "rc"))
{
char modulePath[MAX_LOCATION];
- EscapeForMake(modulePath, path,
tru
e, true, false);
- EscapeForMake(moduleName, name,
tru
e, true, false);
+ EscapeForMake(modulePath, path,
fals
e, true, false);
+ EscapeForMake(moduleName, name,
fals
e, true, false);
sprintf(s, "%s%s%s%s%s", ts.a, modulePath, path[0] ? SEPS : "", moduleName, ts.b);
items.Add(CopyString(s));
count++;
sprintf(s, "%s%s%s%s%s", ts.a, modulePath, path[0] ? SEPS : "", moduleName, ts.b);
items.Add(CopyString(s));
count++;
@@
-1502,7
+1502,7
@@
private:
bool collision;
NameCollisionInfo info;
count++;
bool collision;
NameCollisionInfo info;
count++;
- EscapeForMake(moduleName, name,
tru
e, true, false);
+ EscapeForMake(moduleName, name,
fals
e, true, false);
StripExtension(moduleName);
info = namesInfo[moduleName];
collision = info ? info.IsExtensionColliding(extension) : false;
StripExtension(moduleName);
info = namesInfo[moduleName];
collision = info ? info.IsExtensionColliding(extension) : false;
@@
-2111,8
+2111,6
@@
private:
char tempPath[MAX_LOCATION];
char resPath[MAX_LOCATION];
char tempPath[MAX_LOCATION];
char resPath[MAX_LOCATION];
- char * quotes;
-
// $(EAR) aw%s --- /*quiet ? "q" : */""
if(count == 0)
f.Printf("\t%s$(EAR) aw$(EARFLAGS) $(TARGET)", ts.a);
// $(EAR) aw%s --- /*quiet ? "q" : */""
if(count == 0)
f.Printf("\t%s$(EAR) aw$(EARFLAGS) $(TARGET)", ts.a);
@@
-2129,12
+2127,8
@@
private:
strcpy(tempPath, child.path);
PathCatSlash(tempPath, child.name);
}
strcpy(tempPath, child.path);
PathCatSlash(tempPath, child.name);
}
- EscapeForMake(resPath, tempPath, true, true, false);
- if(strchr(tempPath, ' '))
- quotes = "\"";
- else
- quotes = "";
- f.Printf(" %s%s%s%s", quotes, useRes ? "$(RES)" : "", resPath, quotes);
+ EscapeForMake(resPath, tempPath, false, true, false);
+ f.Printf(" %s%s", useRes ? "$(RES)" : "", resPath);
count++;
}
if(count == 10 || (count > 0 && (ts || !child.next)))
count++;
}
if(count == 10 || (count > 0 && (ts || !child.next)))