Handle non-Joonix file paths properly.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4197 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -122,7 +122,7 @@ public class GenReceiverTask extends InvocationTask
|
|||||||
// determine the path to our sender file
|
// determine the path to our sender file
|
||||||
String mpath = source.getPath();
|
String mpath = source.getPath();
|
||||||
mpath = StringUtil.replace(mpath, "Receiver", "Sender");
|
mpath = StringUtil.replace(mpath, "Receiver", "Sender");
|
||||||
mpath = StringUtil.replace(mpath, "/client/", "/server/");
|
mpath = replacePath(mpath, "/client/", "/server/");
|
||||||
|
|
||||||
writeFile(mpath, sw.toString());
|
writeFile(mpath, sw.toString());
|
||||||
|
|
||||||
|
|||||||
@@ -186,7 +186,7 @@ public class GenServiceTask extends InvocationTask
|
|||||||
// determine the path to our marshaller file
|
// determine the path to our marshaller file
|
||||||
String mpath = source.getPath();
|
String mpath = source.getPath();
|
||||||
mpath = StringUtil.replace(mpath, "Service", "Marshaller");
|
mpath = StringUtil.replace(mpath, "Service", "Marshaller");
|
||||||
mpath = StringUtil.replace(mpath, "/client/", "/data/");
|
mpath = replacePath(mpath, "/client/", "/data/");
|
||||||
|
|
||||||
writeFile(mpath, sw.toString());
|
writeFile(mpath, sw.toString());
|
||||||
|
|
||||||
@@ -229,7 +229,7 @@ public class GenServiceTask extends InvocationTask
|
|||||||
// determine the path to our marshaller file
|
// determine the path to our marshaller file
|
||||||
String mpath = source.getPath();
|
String mpath = source.getPath();
|
||||||
mpath = StringUtil.replace(mpath, "Service", "Dispatcher");
|
mpath = StringUtil.replace(mpath, "Service", "Dispatcher");
|
||||||
mpath = StringUtil.replace(mpath, "/client/", "/server/");
|
mpath = replacePath(mpath, "/client/", "/server/");
|
||||||
|
|
||||||
writeFile(mpath, sw.toString());
|
writeFile(mpath, sw.toString());
|
||||||
|
|
||||||
@@ -269,7 +269,7 @@ public class GenServiceTask extends InvocationTask
|
|||||||
// determine the path to our provider file
|
// determine the path to our provider file
|
||||||
String mpath = source.getPath();
|
String mpath = source.getPath();
|
||||||
mpath = StringUtil.replace(mpath, "Service", "Provider");
|
mpath = StringUtil.replace(mpath, "Service", "Provider");
|
||||||
mpath = StringUtil.replace(mpath, "/client/", "/server/");
|
mpath = replacePath(mpath, "/client/", "/server/");
|
||||||
|
|
||||||
writeFile(mpath, sw.toString());
|
writeFile(mpath, sw.toString());
|
||||||
|
|
||||||
|
|||||||
@@ -315,6 +315,14 @@ public abstract class InvocationTask extends Task
|
|||||||
return (didx == -1) ? name : name.substring(0, didx);
|
return (didx == -1) ? name : name.substring(0, didx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected static String replacePath (
|
||||||
|
String source, String oldstr, String newstr)
|
||||||
|
{
|
||||||
|
return StringUtil.replace(source,
|
||||||
|
oldstr.replace('/', File.separatorChar),
|
||||||
|
newstr.replace('/', File.separatorChar));
|
||||||
|
}
|
||||||
|
|
||||||
/** A list of filesets that contain tile images. */
|
/** A list of filesets that contain tile images. */
|
||||||
protected ArrayList _filesets = new ArrayList();
|
protected ArrayList _filesets = new ArrayList();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user