TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 09:23:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

oops, #push broken for multiple targets

Browse Source
This commit is contained in:
David Rose 2002-06-05 22:19:58 +00:00
parent 5de192e871
commit 1110bbeea3
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ppremake/ppCommandFile.cxx
View File

@ -1434,23 +1434,19 @@ handle_mkdir_command() {
vector<string> words; vector<string> words;
tokenize_whitespace(_scope->expand_string(_params), words); tokenize_whitespace(_scope->expand_string(_params), words);
if (words.empty()) { vector<string>::const_iterator wi;
cerr << "No directory name specifed to #mkdir.\n"; for (wi = words.begin(); wi != words.end(); ++wi) {
} else { Filename dirname(*wi);
vector<string>::const_iterator wi;
for (wi = words.begin(); wi != words.end(); ++wi) { if (dirname.is_local()) {
Filename dirname(*wi); string prefix = _scope->expand_variable("DIRPREFIX");
dirname = Filename(prefix, dirname);
if (dirname.is_local()) { }
string prefix = _scope->expand_variable("DIRPREFIX");
dirname = Filename(prefix, dirname); Filename filename(dirname, "file");
} if (!filename.make_dir()) {
if (!dirname.is_directory()) {
Filename filename(dirname, "file"); cerr << "Unable to create directory " << dirname << "\n";
if (!filename.make_dir()) {
if (!dirname.is_directory()) {
cerr << "Unable to create directory " << dirname << "\n";
}
} }
} }
} }
@ -1655,7 +1651,7 @@ handle_push_command() {
while (p < _params.length()) { while (p < _params.length()) {
// Pull off the next varname. // Pull off the next varname.
size_t q = _scope->scan_to_whitespace(_params, p); size_t q = _scope->scan_to_whitespace(_params, p);
string varname = trim_blanks(_scope->expand_string(_params.substr(p, q))); string varname = trim_blanks(_scope->expand_string(_params.substr(p, q - p)));
string def = _scope->get_variable(varname); string def = _scope->get_variable(varname);
enclosing_scope->define_variable(varname, def); enclosing_scope->define_variable(varname, def);