Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/ant
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13681/src/ccmtools/ant
Modified Files:
IdljTask.java CcmtoolsTask.java
Log Message:
Bugfix: added isWindows() method to handle path calculations.
Index: IdljTask.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ant/IdljTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IdljTask.java 16 May 2007 07:59:00 -0000 1.4
--- IdljTask.java 9 Jul 2007 09:50:52 -0000 1.5
***************
*** 35,38 ****
--- 35,40 ----
import org.apache.tools.ant.types.FileSet;
+ import ccmtools.utils.ConfigurationLocator;
+
/**
***************
*** 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);
--- 268,289 ----
cmdline.createArgument().setValue("-" + binding);
!
! if(ConfigurationLocator.getInstance().isWindows())
! cmdline.createArgument().setLine("-td \"" + destDir.getAbsolutePath() + "\"");
! else
! cmdline.createArgument().setLine("-td " + destDir.getAbsolutePath());
!
for(String s : includePaths)
{
! if(ConfigurationLocator.getInstance().isWindows())
! cmdline.createArgument().setLine("-i \"" + s + "\"");
! else
! cmdline.createArgument().setLine("-i " + s);
}
!
! if(ConfigurationLocator.getInstance().isWindows())
! cmdline.createArgument().setValue("\"" + idlFile.getAbsolutePath() + "\"");
! else
! 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CcmtoolsTask.java 6 Jul 2007 09:01:19 -0000 1.5
--- CcmtoolsTask.java 9 Jul 2007 09:50:52 -0000 1.6
***************
*** 31,34 ****
--- 31,36 ----
import org.apache.tools.ant.types.FileSet;
+ import ccmtools.utils.ConfigurationLocator;
+
/**
* This <ccmtools> ant task is used to execute different ccmtools generators
***************
*** 185,191 ****
static void appendIncludePath( StringBuilder cmd, String s )
{
! // TODO: replace this ugly check for Windows
! if (java.io.File.separatorChar == '\\')
! cmd.append(" -I\"").append(s).append("\"");
else
cmd.append(" -I").append(s);
--- 187,192 ----
static void appendIncludePath( StringBuilder cmd, String s )
{
! if(ConfigurationLocator.getInstance().isWindows())
! cmd.append(" -I\"").append(s).append("\"");
else
cmd.append(" -I").append(s);
|
