[Wesnoth-commits] r49839 - /trunk/utils/java/org.wesnoth/src/org/wesnoth/utils/PreprocessorUtils.java

[timotei_cluj]

Author: timotei
Date: Sat Jun 11 18:25:31 2011
New Revision: 49839

URL: http://svn.gna.org/viewcvs/wesnoth?rev=49839&view=rev
Log:
eclipse plugin: Switch to the new '--preprocess'
command line syntax

Modified:
    trunk/utils/java/org.wesnoth/src/org/wesnoth/utils/PreprocessorUtils.java

Modified: 
trunk/utils/java/org.wesnoth/src/org/wesnoth/utils/PreprocessorUtils.java
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/java/org.wesnoth/src/org/wesnoth/utils/PreprocessorUtils.java?rev=49839&r1=49838&r2=49839&view=diff
==============================================================================
--- trunk/utils/java/org.wesnoth/src/org/wesnoth/utils/PreprocessorUtils.java 
(original)
+++ trunk/utils/java/org.wesnoth/src/org/wesnoth/utils/PreprocessorUtils.java 
Sat Jun 11 18:25:31 2011
@@ -12,6 +12,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -22,10 +23,10 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.dialogs.DialogSettings;
-import org.wesnoth.WesnothPlugin;
 import org.wesnoth.Constants;
 import org.wesnoth.Logger;
 import org.wesnoth.Messages;
+import org.wesnoth.WesnothPlugin;
 import org.wesnoth.preferences.Preferences;
 
 public class PreprocessorUtils
@@ -129,22 +130,27 @@
                                defines.add("NO_TERRAIN_GFX"); //$NON-NLS-1$
                        }
 
+                       // --preprocess
+            arguments.add("-p"); //$NON-NLS-1$
+            arguments.add(filePath);
+            arguments.add(targetDirectory);
+
+            // --preprocess-defines
                        if (defines != null && !defines.isEmpty())
                        {
-                               String argument = "-p="; //$NON-NLS-1$
-                               for(int i=0;i< defines.size() - 1;i++)
+                           arguments.add( "--preprocess-defines" ); 
//$NON-NLS-1$
+
+                               StringBuilder definesArg = new StringBuilder();
+                               for( Iterator<String> itor = 
defines.iterator(); itor.hasNext(); )
                                {
-                                       argument += (defines.get(i) + ","); 
//$NON-NLS-1$
+                                   if ( definesArg.length() > 0 )
+                                       definesArg.append( "," ); //$NON-NLS-1$
+
+                                   definesArg.append( itor.next() );
                                }
-                               argument += defines.get(defines.size()-1);
-                               arguments.add(argument);
-                       }
-                       else
-                       {
-                               arguments.add("-p"); //$NON-NLS-1$
-                       }
-                       arguments.add(filePath);
-                       arguments.add(targetDirectory);
+
+                               arguments.add( definesArg.toString() );
+                       }
 
                        Logger.getInstance().log(Messages.PreprocessorUtils_10 
+ filePath);
                        ExternalToolInvoker wesnoth = new ExternalToolInvoker(


_______________________________________________
Wesnoth-commits mailing list
Wesnoth-commits@gna.org
https://mail.gna.org/listinfo/wesnoth-commits