|
From: Teiniker E. <tei...@us...> - 2007-05-16 07:59:17
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/ant In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19948/src/ccmtools/ant Modified Files: IdljTask.java CcmtoolsTask.java Log Message: Added quotes to some of the Ant tasks parameters to support spaces within paths. Index: IdljTask.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ant/IdljTask.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IdljTask.java 13 Apr 2007 10:37:08 -0000 1.3 --- IdljTask.java 16 May 2007 07:59:00 -0000 1.4 *************** *** 266,275 **** cmdline.createArgument().setValue("-" + binding); ! cmdline.createArgument().setLine("-td " + destDir.getAbsolutePath()); for(String s : includePaths) { ! cmdline.createArgument().setLine("-i " + s); } ! cmdline.createArgument().setValue(idlFile.getAbsolutePath()); log("command line = " + cmdline, Project.MSG_VERBOSE); --- 266,275 ---- cmdline.createArgument().setValue("-" + binding); ! cmdline.createArgument().setLine("-td \"" + destDir.getAbsolutePath() + "\""); for(String s : includePaths) { ! cmdline.createArgument().setLine("-i \"" + s + "\""); } ! cmdline.createArgument().setValue("\"" + idlFile.getAbsolutePath() + "\""); log("command line = " + cmdline, Project.MSG_VERBOSE); Index: CcmtoolsTask.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ant/CcmtoolsTask.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CcmtoolsTask.java 13 Apr 2007 10:37:09 -0000 1.3 --- CcmtoolsTask.java 16 May 2007 07:59:00 -0000 1.4 *************** *** 160,164 **** for(String s : includePaths) { ! cmd.append(" -I" + s); } --- 160,164 ---- for(String s : includePaths) { ! cmd.append(" -I\"").append(s).append("\""); } *************** *** 208,215 **** for(String s : includePaths) { ! cmd.append(" -I" + s); } ! cmd.append(" -o " + destDir.getAbsolutePath()); for(FileSet fs: filesets) --- 208,215 ---- for(String s : includePaths) { ! cmd.append(" -I\"").append(s).append("\""); } ! cmd.append(" -o ").append(destDir.getAbsolutePath()); for(FileSet fs: filesets) *************** *** 270,277 **** for(String s : includePaths) { ! cmd.append(" -I" + s); } ! cmd.append(" -o " + destDir.getAbsolutePath()); for(FileSet fs: filesets) --- 270,277 ---- for(String s : includePaths) { ! cmd.append(" -I\"").append(s).append("\""); } ! cmd.append(" -o ").append(destDir.getAbsolutePath()); for(FileSet fs: filesets) |