diff options
author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-11-27 14:20:19 +0100 |
---|---|---|
committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-11-27 14:20:19 +0100 |
commit | 836ecd4574bcd7f0db9b32ee2f64db8bb466a057 (patch) | |
tree | c2e5db57b4aeade447b32aa423981cdfbadcabef /src/main/java/net/sf/antcontrib/cpptasks/apple | |
parent | e38d012eb2885c08b67ede65cbce13d8f8ea9f93 (diff) | |
download | cpptasks-parallel-836ecd4574bcd7f0db9b32ee2f64db8bb466a057.tar.gz cpptasks-parallel-836ecd4574bcd7f0db9b32ee2f64db8bb466a057.tar.bz2 cpptasks-parallel-836ecd4574bcd7f0db9b32ee2f64db8bb466a057.tar.xz cpptasks-parallel-836ecd4574bcd7f0db9b32ee2f64db8bb466a057.zip |
Fixed NAR-109
Diffstat (limited to 'src/main/java/net/sf/antcontrib/cpptasks/apple')
-rw-r--r-- | src/main/java/net/sf/antcontrib/cpptasks/apple/XcodeProjectWriter.java | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/apple/XcodeProjectWriter.java b/src/main/java/net/sf/antcontrib/cpptasks/apple/XcodeProjectWriter.java index f901b4d..1701506 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/apple/XcodeProjectWriter.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/apple/XcodeProjectWriter.java @@ -16,20 +16,6 @@ */ package net.sf.antcontrib.cpptasks.apple; -import net.sf.antcontrib.cpptasks.CCTask; -import net.sf.antcontrib.cpptasks.CUtil; -import net.sf.antcontrib.cpptasks.TargetInfo; -import net.sf.antcontrib.cpptasks.compiler.CommandLineCompilerConfiguration; -import net.sf.antcontrib.cpptasks.compiler.CommandLineLinkerConfiguration; -import net.sf.antcontrib.cpptasks.compiler.ProcessorConfiguration; -import net.sf.antcontrib.cpptasks.gcc.GccCCompiler; -import net.sf.antcontrib.cpptasks.ide.DependencyDef; -import net.sf.antcontrib.cpptasks.ide.ProjectDef; -import net.sf.antcontrib.cpptasks.ide.ProjectWriter; -import org.apache.tools.ant.BuildException; -import org.xml.sax.SAXException; - -import javax.xml.transform.TransformerConfigurationException; import java.io.File; import java.io.IOException; import java.text.NumberFormat; @@ -38,12 +24,27 @@ import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; -import java.util.Hashtable; import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; +import javax.xml.transform.TransformerConfigurationException; + +import net.sf.antcontrib.cpptasks.CCTask; +import net.sf.antcontrib.cpptasks.CUtil; +import net.sf.antcontrib.cpptasks.TargetInfo; +import net.sf.antcontrib.cpptasks.compiler.CommandLineCompilerConfiguration; +import net.sf.antcontrib.cpptasks.compiler.CommandLineLinkerConfiguration; +import net.sf.antcontrib.cpptasks.compiler.ProcessorConfiguration; +import net.sf.antcontrib.cpptasks.gcc.GccCCompiler; +import net.sf.antcontrib.cpptasks.ide.DependencyDef; +import net.sf.antcontrib.cpptasks.ide.ProjectDef; +import net.sf.antcontrib.cpptasks.ide.ProjectWriter; + +import org.apache.tools.ant.BuildException; +import org.xml.sax.SAXException; + /** * Writes a Apple Xcode 2.1+ project directory. XCode stores project @@ -74,7 +75,7 @@ public final class XcodeProjectWriter final CCTask task, final ProjectDef projectDef, final List sources, - final Hashtable targets, + final Map targets, final TargetInfo linkTarget) throws IOException { File xcodeDir = new File(fileName + ".xcodeproj"); @@ -337,7 +338,7 @@ public final class XcodeProjectWriter private List addSources(final Map objects, final String sourceTree, final String basePath, - final Hashtable targets) { + final Map targets) { List sourceGroupChildren = new ArrayList(); ArrayList sourceList = new ArrayList(targets.size()); @@ -988,7 +989,7 @@ public final class XcodeProjectWriter * @return representative (hopefully) compiler configuration */ private CommandLineCompilerConfiguration - getBaseCompilerConfiguration(Hashtable targets) { + getBaseCompilerConfiguration(Map targets) { // // find first target with an GNU C++ compilation // |