Changeset 345

Timestamp:

05/07/07 15:44:52 (5 years ago)

Author:

qbert

Message:

--

Files:

• trunk/anttasks/src/descent/ant/tasks/DmdWindows.java (modified) (3 diffs)

trunk/anttasks/src/descent/ant/tasks/DmdWindows.java

@@ -106 +106 @@
-
-        private String getCompiler(){
-\\bin\\dmd
+
-            if( !compiler.isFile() ){
-mpiler %s is not an existing file
+uld not find compiler at %s
-            }
-            return compiler.getAbsolutePath();
-        }
+        
+        private String getLinker()
+        {
+            File linker = new File( dTask.compilerdir ,"..\\..\\dm\\bin\\link.exe");
+            if( !linker .isFile() ){
+                throw new BuildException( String.format( "Could not find linker  at %s", linker .getAbsolutePath() ));
+            }
+            return linker .getAbsolutePath();
+        }
+        
-        private void compile() {
-            LinkedList<String> cmdline = new LinkedList<String>();
@@ -172 +182 @@
-            
-            LinkedList<String> cmdline = new LinkedList<String>();
-dTask.compilerdir + "dm\\bin\\link.exe"
+getLinker() 
-            
-            StringBuilder objectBuilder = new StringBuilder();
@@ -251 +261 @@
-                sb.append( " " + s );
-            }
-dmd\\lib;" + dTask.compilerdir + "
+\\..\\lib;" + dTask.compilerdir + "\\..\\..\\
-            
-            dTask.log( String.format("Setting Library path to : %s", libraryPath) , Project.MSG_INFO );