Changeset 1180

Timestamp:

05/27/08 08:07:44 (8 months ago)

Author:

fraserofthenight

Message:

Added a couple actual options to the builder UI

Files:

• trunk/descent.building/src/descent/building/IDescentBuilderConstants.java (modified) (1 diff)
• trunk/descent.building/src/descent/building/compiler/BooleanOption.java (modified) (1 diff)
• trunk/descent.building/src/descent/building/compiler/CompilerOption.java (modified) (3 diffs)
• trunk/descent.building/src/descent/building/compiler/EnumOption.java (modified) (1 diff)
• trunk/descent.building/src/descent/building/compiler/StringOption.java (modified) (1 diff)
• trunk/descent.building/src/descent/internal/building/compiler/DmdCompilerInterface.java (modified) (3 diffs)
• trunk/descent.building/src/descent/internal/building/compiler/IDmdCompilerConstants.java (added)
• trunk/descent.building/src/descent/internal/building/ui/CompilerTab.java (modified) (15 diffs)

trunk/descent.building/src/descent/building/IDescentBuilderConstants.java

@@ -82 +82 @@
-    public static final String ATTR_OUTPUT_FILE = "descent.building.debuild.output_file";
-    
+    // TODO comment
+    public static final String ATTR_ADD_UNITTESTS = "descent.building.debuild.add_unittests";
+    public static final String ATTR_DISABLE_ASSERTS = "descent.building.debuild.disable_asserts";
+    public static final String ATTR_ADD_DEBUG_INFO = "descent.building.debuild.add_debug_info";
+    public static final String ATTR_INSTRUMENT_FOR_COVERAGE = "descent.building.debuild.instrument_for_coverage";
+    public static final String ATTR_INSTRUMENT_FOR_PROFILE = "descent.building.debuild.instrument_for_profile";
+    
-    /**
-     * Constant used for {@link #ATTR_OUTPUT_TYPE} to specify the output target

trunk/descent.building/src/descent/building/compiler/BooleanOption.java

@@ -7 +7 @@
-    
-    public BooleanOption(String attributeId, boolean defaultValue,
-
+
+
-    {
-
+, helpText
-        this.onText = onText;
-        this.offText = offText;

trunk/descent.building/src/descent/building/compiler/CompilerOption.java

@@ -7 +7 @@
-    private final String label;
-    private final String groupLabel;
+    private final String helpText;
-    
-    public CompilerOption(String attributeId, String defaultValue, String label,
-
+, String helpText
-    {
-        this.attributeId = attributeId;
@@ -15 +16 @@
-        this.label = label;
-        this.groupLabel = groupLabel;
+        this.helpText = helpText;
-    }
-    
@@ -36 +38 @@
-        return groupLabel;
-    }
+    
+    public final String getHelpText()
+    {
+        return helpText;
+    }
-}

trunk/descent.building/src/descent/building/compiler/EnumOption.java

@@ -9 +9 @@
-    public EnumOption(String attributeId, String defaultValue,
-            String label, String groupLabel, String[] optionValues,
-
+, String helpText
-    {
-        this(attributeId, defaultValue, label, groupLabel, 
-
+, helpText
-    }
-    
-    public EnumOption(String attributeId, String defaultValue,
-            String label, String groupLabel, String[] optionValues,
-
+
+
-    {
-
+, helpText
-        this.optionValues = optionValues;
-        this.optionEditLabels = optionEditLabels;

trunk/descent.building/src/descent/building/compiler/StringOption.java

@@ -4 +4 @@
-{
-    public StringOption(String attributeId, String defaultValue,
-
+, String helpText
-    {
-
+, helpText
-    }
-}

trunk/descent.building/src/descent/internal/building/compiler/DmdCompilerInterface.java

@@ -13 +13 @@
-import descent.building.compiler.IResponseInterpreter;
-import descent.building.compiler.BuildResponse;
+
+import static descent.building.IDescentBuilderConstants.*;
+import static descent.internal.building.compiler.IDmdCompilerConstants.*;
-
-public class DmdCompilerInterface implements ICompilerInterface
@@ -260 +263 @@
-    static
-    {
-
+
+
+
-        
+        // TODO file options for header & doc generation
-        uiOptions = new CompilerOption[]
-
+          
-            //------------------------------------------------------------------
-            // Features
-            
+            new BooleanOption(
+                    ATTR_ADD_DEBUG_INFO,
+                    true,
+                    "Add debugging symbols",
+                    GROUP_FEATURES,
+                    "-g",
+                    "",
+                    "Adds debugging symbols. These make the generated objects " +
+                    "slightly larger but is needed to use a debugger with the " +
+                    "program."),
+                    
+            new BooleanOption(
+                    ATTR_DISABLE_ASSERTS,
+                    false,
+                    "Release mode (disable asserts & contracts)",
+                    GROUP_FEATURES,
+                    "-release",
+                    "",
+                    "Turns off assert() statements in the code, in {} and out {} " +
+                    "blocks on functions, and checking for array bounds errors. This " +
+                    "makes the code run faster, so is a good choice for releasing the " +
+                    "application, but are often useful for development."),
+                    
+                    
+            new BooleanOption(
+                    ATTR_ADD_UNITTESTS,
+                    false,
+                    "Add unit tests",
+                    GROUP_FEATURES,
+                    "-unittest",
+                    "",
+                    "Adds code so that unittest {} blocks in your code are run before " +
+                    "the program launches and enables version(unitttest) {} blocks."),
+                            
+            new BooleanOption(
+                    ATTR_INSTRUMENT_FOR_COVERAGE,
+                    false,
+                    "Instrument for coverage analysis",
+                    GROUP_FEATURES,
+                    "-cov",
+                    "",
+                    "Adds code to the generated objects so that they will generate " +
+                    "a file containing code coverage information after the program " +
+                    "has been run. This is useful for seeing if unit tests execute " +
+                    "all paths in your code."),
+                                    
+            new BooleanOption(
+                    ATTR_INSTRUMENT_FOR_PROFILE,
+                    false,
+                    "Instrument for profiling",
+                    GROUP_FEATURES,
+                    "-profile",
+                    "",
+                    "Adds code to the generated objects so they can be prodiled. " +
+                    "This helps find bottlenecks that could be slowing down your " +
+                    "application."),
+            
+            //------------------------------------------------------------------
+            // Warnings
+            
+            new BooleanOption(
+                    ATTR_ALLOW_DEPRECATED,
+                    true,
+                    "Allow deprecated code",
+                    GROUP_WARNINGS,
+                    "-d",
+                    "",
+                    "Allows code marked with the \"deprecated\" tags to be included " +
+                    "in your program."),
+            
+            new BooleanOption(
+                    ATTR_SHOW_WARNINGS,
+                    false,
+                    "Show warnings",
+                    GROUP_WARNINGS,
+                    "-w",
+                    "",
+                    "Adds warnings for potentially unsafe or error-prone code. In " +
+                    "DMD, if warnings are encountered, the program will not be " +
+                    "compiled."),
+            
+              
+            //------------------------------------------------------------------
+            // Optimization
+            
+            new BooleanOption(
+                    ATTR_OPTIMIZE_CODE,
+                    false,
+                    "Optimize code",
+                    GROUP_OPTIMIZATION,
+                    "-O",
+                    "",
+                    "Optimizes the generated code for best efficiency."),
+            
+            new BooleanOption(
+                    ATTR_INLINE_CODE,
+                    false,
+                    "Inline functions",
+                    GROUP_OPTIMIZATION,
+                    "-inline",
+                    "",
+                    "Allows inlining of short functions for increased code efficiency. " +
+                    "This may cause issues with some debuggers."),
+            
+            new BooleanOption(
+                    ATTR_NOFLOAT,
+                    false,
+                    "Don't generate __fltused reference",
+                    GROUP_OPTIMIZATION,
+                    "-nofloat",
+                    "",
+                    "Prevents the emission of the __fltused reference in object files, " +
+                    "even if floating point code is present. This is useful in library " +
+                    "files."),
-        };
-    }
@@ -307 +427 @@
-    public CompilerOption[] getOptions()
-    {
-        // TODO Auto-generated method stub
-        return uiOptions;
-    }

trunk/descent.building/src/descent/internal/building/ui/CompilerTab.java

@@ -16 +16 @@
-import org.eclipse.jface.viewers.ComboBoxCellEditor;
-import org.eclipse.jface.viewers.EditingSupport;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.ITreeSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.TreeViewerColumn;
@@ -32 +36 @@
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.Link;
@@ -64 +70 @@
-            comp = new Composite(comp, SWT.NONE);
-            GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-1
+2
-            comp.setLayoutData(gd);
-            GridLayout layout = new GridLayout();
@@ -76 +82 @@
-                    "configurations.");
-            gd = new GridData(GridData.FILL_BOTH);
-1
+2
-            fHelpText.setLayoutData(gd);
-            fHelpText.addSelectionListener(new SelectionAdapter()
@@ -243 +249 @@
-            public abstract void setValue(Object value);
-            public abstract String getText();
+            public abstract void initializeTo(String value);
+            public abstract void applyTo(ILaunchConfigurationWorkingCopy config);
-        }
-        
@@ -288 +296 @@
-                return selected ? option.getOnText() : option.getOffText();
-            }
+            
+            @Override
+            public void initializeTo(String value)
+            {
+                selected = Boolean.valueOf(value);
+            }
+
+            @Override
+            public void applyTo(ILaunchConfigurationWorkingCopy config)
+            {
+                config.setAttribute(option.getAttributeId(),
+                        selected ? "true" : "false");
+            }
-        }
-        
@@ -335 +356 @@
-            {
-                return option.getOptionViewLabels()[selected];
+            }
+            
+            @Override
+            public void initializeTo(String value)
+            {
+                String[] optionValues = option.getOptionValues();
+                for(int i = 0; i < optionValues.length; i++)
+                {
+                    if(optionValues[i].equals(i))
+                    {
+                        selected = Integer.valueOf(i);
+                        return;
+                    }
+                }
+            }
+            
+            @Override
+            public void applyTo(ILaunchConfigurationWorkingCopy config)
+            {
+                config.setAttribute(getOption().getAttributeId(),
+                        option.getOptionValues()[selected.intValue()]);
-            }
-        }
@@ -380 +422 @@
-            {
-                selected = (String) value;
+            }
+            
+            @Override
+            public void initializeTo(String value)
+            {
+                selected = value;
+            }
+            
+            @Override
+            public void applyTo(ILaunchConfigurationWorkingCopy config)
+            {
+                config.setAttribute(getOption().getAttributeId(), selected);
-            }
-        }
@@ -435 +489 @@
-                    Object newInput)
-            {
-ODO
+his is handled externally
-            }
-        }
@@ -442 +496 @@
-        private TreeViewer fViewer;
-        private TreeEntry[] fEntries;
+        private Group fHelpGroup;
+        private Label fHelpText;
-        
-        public void addToControl(Composite comp)
-        {
-fEntries = get
+initialize
-            
-            fViewer = new TreeViewer(comp, SWT.BORDER | SWT.FULL_SELECTION);
+            fViewer.setContentProvider(new OptionsContentProvider());
-            fViewer.getTree().setHeaderVisible(true);
-            fViewer.getTree().setLinesVisible(true);
@@ -456 +513 @@
-            
-            TreeViewerColumn column = new TreeViewerColumn(fViewer, SWT.NONE);
-0
+5
-            column.getColumn().setText("Option");
-            column.setLabelProvider(new ColumnLabelProvider()
@@ -530 +587 @@
-            
-            GridData gd = new GridData(GridData.FILL_BOTH);
+            gd.horizontalSpan = 1;
-            fViewer.getControl().setLayoutData(gd);
-            
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            ICompilerInterface compilerInterface = 
-                getCompilerInterface(fSelectedCompiler);
@@ -545 +649 @@
-            {
-                String group = opt.getGroupLabel();
-;
+
-                    groups.put(group, new ArrayList<CompilerUIOption>());
-                groups.get(group).add(toUIOption(opt));
-            }
-            
-TreeEntry[] e
+fE
-            int i = 0;
-            for(String group : groups.keySet())
-            {
-                List<CompilerUIOption> list = groups.get(group);
-e
+fE
-                        list.toArray(new CompilerUIOption[list.size()]));
-                i++;
-            }
-            
-            return entries;
-        }
-        
@@ -588 +690 @@
-            fSelectedCompiler = compiler;
-            if(null != fViewer && null != fSelectedCompiler)
-
+
+
+
-        }
-
-        public void initializeFrom(ILaunchConfiguration config)
-        {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-        public void performApply(ILaunchConfigurationWorkingCopy config)
-        {
-
+
+
+
+
+
+
+
+
-        }
-
-        public void setDefaults(ILaunchConfigurationWorkingCopy config)
-        {
-
+
+
+
+
+
+
+
+
+
-        }
-
-        public String validate()
-        {
-TODO Auto-generated method stub
+PERHAPS should we allow options to validate themselves?
-            return null;
-        }
@@ -654 +789 @@
-    {
-        GridLayout layout = new GridLayout();
-1
+2
-        return layout;
-    }