Changeset 1183

Timestamp:

05/29/08 04:27:12 (7 months ago)

Author:

fraserofthenight

Message:

Few minor builder UI changes

Files:

• trunk/descent.building/src/descent/building/IDescentBuilderConstants.java (modified) (1 diff)
• trunk/descent.building/src/descent/building/compiler/IValidatableOption.java (added)
• trunk/descent.building/src/descent/building/compiler/StringOption.java (modified) (2 diffs)
• trunk/descent.building/src/descent/internal/building/compiler/DmdCompilerInterface.java (modified) (13 diffs)
• trunk/descent.building/src/descent/internal/building/compiler/IDmdCompilerConstants.java (modified) (2 diffs)
• trunk/descent.building/src/descent/internal/building/ui/AbstractBuilderTab.java (modified) (7 diffs)
• trunk/descent.building/src/descent/internal/building/ui/CompilerTab.java (modified) (25 diffs)
• trunk/descent.building/src/descent/internal/building/ui/GeneralTab.java (modified) (11 diffs)

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

@@ -82 +82 @@
-    public static final String ATTR_OUTPUT_FILE = "descent.building.debuild.output_file";
-    
-
+
+
+
+
+
-    public static final String ATTR_ADD_UNITTESTS = "descent.building.debuild.add_unittests";
+    
+    /**
+     * Disable asserts and contracts (in DMD this is called "release mode"). In
+     * other compilers, if asserions, contracts, and array bounds errors can be
+     * disabled separately, this option should only be for disabling asserts,
+     * however clients should be aware that other features may be disabled as well
+     * in generated code.
+     * 
+     * If the compiler does not support disabling of assertions, this option
+     * should be ignored. If the compiler does not support assertions at all, but
+     * this attribute was specified outside the UI to be explicitly "false", an error
+     * should be marked.
+     * 
+     * Type: String of "true" or "false"
+     */
-    public static final String ATTR_DISABLE_ASSERTS = "descent.building.debuild.disable_asserts";
+    
+    /**
+     * Include debugging symbols in the generated executable. 
+     * 
+     * If the compiler supports multiple kinds of debugging symbols, the system
+     * default should be used. If a default cannot be determined or the compiler
+     * does not support adding of debugging symbols, an error should be marked.
+     * 
+     * Type: String of "true" or "false"
+     */
-    public static final String ATTR_ADD_DEBUG_INFO = "descent.building.debuild.add_debug_info";
+    
+    /**
+     * Include code allowing code coverage to be tracked in the generated
+     * executable.
+     * 
+     * If the compiler does not support debug symbols, an error should be marked.
+     * 
+     * Type: String of "true" or "false"
+     */
-    public static final String ATTR_INSTRUMENT_FOR_COVERAGE = "descent.building.debuild.instrument_for_coverage";
+    
+    /**
+     * Include code for profiling the executable.
+     * 
+     * If the compiler supports multiple kinds of profile information, the system
+     * default should be used. If a default cannot be determined or the compiler
+     * does not support adding of profile information, an error should be marked.
+     * 
+     * Type: String of "true" or "false"
+     */
-    public static final String ATTR_INSTRUMENT_FOR_PROFILE = "descent.building.debuild.instrument_for_profile";
+    
+    /**
+     * A set of additional compiler arguments that should be added to
+     * the command line when calling the compiler.
+     * 
+     * Type: String
+     */
+    public static final String ATTR_ADDITIONAL_COMPILER_ARGS = "descent.building.debuild.compiler_args";
+    
+    /**
+     * A set of additional linker arguments that should be added to
+     * the command line when calling the linker.
+     * 
+     * Type: String
+     */
+    public static final String ATTR_ADDITIONAL_LINKER_ARGS = "descent.building.debuild.linker_args";
-    
-    /**

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

@@ -1 +1 @@
-package descent.building.compiler;
-
-
+ implements IValidatableOption
-{
-    public StringOption(String attributeId, String defaultValue,
@@ -8 +8 @@
-        super(attributeId, defaultValue, label, groupLabel, helpText);
-    }
+    
+    public String isValid(String value)
+    {
+        return null;
+    }
-}

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

@@ -268 +268 @@
-        
-        // TODO file options for header & doc generation
+        // TODO Only Windows uses OPTLINK, make a separate list of linker
+        // options for Linux
-        uiOptions = new CompilerOption[]
-        {           
@@ -273 +275 @@
-            // Features
-            
-
+
+
-                    ATTR_ADD_DEBUG_INFO,
-                    true,
@@ -282 +285 @@
-                    "Adds debugging symbols. These make the generated objects " +
-                    "slightly larger but is needed to use a debugger with the " +
-
+
+
-                    
-
+
+
-                    ATTR_DISABLE_ASSERTS,
-                    false,
- (disable asserts & contracts)
+
-                    GROUP_FEATURES,
-                    "-release",
@@ -294 +299 @@
-                    "blocks on functions, and checking for array bounds errors. This " +
-                    "makes the code run faster, so is a good choice for releasing the " +
-
+
+
-                    
-        
-new BooleanOption
+new BooleanOption
+
-                    ATTR_ADD_UNITTESTS,
-                    false,
@@ -305 +311 @@
-                    "",
-                    "Adds code so that unittest {} blocks in your code are run before " +
-
+
+
-                            
-
+
+
-                    ATTR_INSTRUMENT_FOR_COVERAGE,
-                    false,
@@ -317 +325 @@
-                    "a file containing code coverage information after the program " +
-                    "has been run. This is useful for seeing if unit tests execute " +
-
+
+
-                                    
-
+
+
-                    ATTR_INSTRUMENT_FOR_PROFILE,
-                    false,
@@ -328 +338 @@
-                    "Adds code to the generated objects so they can be prodiled. " +
-                    "This helps find bottlenecks that could be slowing down your " +
-
+
+
-            
-            //------------------------------------------------------------------
-            // Warnings
-            
-
+
+
-                    ATTR_ALLOW_DEPRECATED,
-                    true,
@@ -341 +353 @@
-                    "",
-                    "Allows code marked with the \"deprecated\" tags to be included " +
-
-
-
+
+
+
+
+
-                    ATTR_SHOW_WARNINGS,
-                    false,
@@ -352 +366 @@
-                    "Adds warnings for potentially unsafe or error-prone code. In " +
-                    "DMD, if warnings are encountered, the program will not be " +
-
+
+
-            
-              
@@ -358 +373 @@
-            // Optimization
-            
-
+
+
-                    ATTR_OPTIMIZE_CODE,
-                    false,
@@ -365 +381 @@
-                    "-O",
-                    "",
-
+
+
-            
-
+
+
-                    ATTR_INLINE_CODE,
-                    false,
@@ -375 +393 @@
-                    "",
-                    "Allows inlining of short functions for increased code efficiency. " +
-
-
-
+
+
+
+
+
-                    ATTR_NOFLOAT,
-                    false,
@@ -386 +406 @@
-                    "Prevents the emission of the __fltused reference in object files, " +
-                    "even if floating point code is present. This is useful in library " +
-
+
+
-        };
-    }

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

@@ -4 +4 @@
-{
-    // TODO comment
+    
+    // Compiler
-    public static final String ATTR_ALLOW_DEPRECATED = "descent.building.compiler.dmd.allow_deprectaed";
-    public static final String ATTR_SHOW_WARNINGS = "descent.building.compiler.dmd.show_warnings";
@@ -9 +11 @@
-    public static final String ATTR_OPTIMIZE_CODE = "descent.building.compiler.dmd.optimize_code";
-    public static final String ATTR_NOFLOAT = "descent.building.compiler.dmd.nofloat";
+    
+    // TODO linker options (both optlink and ld). Many of these options will be
+    // passed by the compiler, and about half of OPTLINK's options are ignored or
+    // apply to 16-bit code anyways. It may be fine to just have a box for "additional
+    // arguments" somewhere and allow the user to put them in as they want.
-}

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

@@ -3 +3 @@
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Map;
+import java.util.Set;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
@@ -193 +195 @@
-        private final boolean fEditable;
-        
-        protected Label fLabel;
-        protected Text fText;
-        protected Button fButton;
-        
-        /**
@@ -203 +203 @@
-         * @param label         the text of the label
-         * @param numColumns    the number of columns the three controls should
-
-
+
-         * @param browseButton  should there be a browse button? if this is true,
-
-
+
-         * @param editable      sets whether or not the text field is editable.
-         *                      This should only be false if browseButton is true,
@@ -224 +222 @@
-        public final void addToControl(Composite comp)
-        {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            gd.horizontalSpan = 1;
-fL
+l
-    
-            fText = new Text(comp, SWT.SINGLE | SWT.BORDER);
-            gd = new GridData(GridData.FILL_HORIZONTAL);
-fNumColumns - (fBrowseButton ? 2 : 1)
+1
-            fText.setLayoutData(gd);
-            fText.setEditable(fEditable);
@@ -246 +253 @@
-            if(fBrowseButton)
-            {
-fB
-fB
+Button b
+b
-                gd = new GridData();
-                gd.horizontalSpan = 1;
-fB
-fB
-fB
+b
+b
+b
-                {
-                    public void widgetSelected(SelectionEvent evt)
@@ -276 +283 @@
-
-        public final void initializeFrom(ILaunchConfiguration config)
-
-
-
-
-
-
-
-
-
+
+
-        }
-
@@ -586 +586 @@
-        return ResourcesPlugin.getWorkspace().getRoot();
-    }
+    
+    //--------------------------------------------------------------------------
+    // Wrappers for ILaunchConfiguration methods which hide the exceptions,
+    // since the exception will never be thrown
+    
+    protected static String getAttribute(ILaunchConfiguration config, String id,
+            String defaultValue)
+    {
+        String value = defaultValue;
+        try
+        {
+            value = config.getAttribute(id, defaultValue);
+        }
+        catch(CoreException e) { }
+        return value;
+    }
+    
+    protected static boolean getAttribute(ILaunchConfiguration config, String id,
+            boolean defaultValue)
+    {
+        boolean value = defaultValue;
+        try
+        {
+            value = config.getAttribute(id, defaultValue);
+        }
+        catch(CoreException e) { }
+        return value;
+    }
+    
+    protected static int getAttribute(ILaunchConfiguration config, String id,
+            int defaultValue)
+    {
+        int value = defaultValue;
+        try
+        {
+            value = config.getAttribute(id, defaultValue);
+        }
+        catch(CoreException e) { }
+        return value;
+    }
+    
+    @SuppressWarnings("unchecked")
+    protected static List getAttribute(ILaunchConfiguration config, String id,
+            List defaultValue)
+    {
+        List value = defaultValue;
+        try
+        {
+            value = config.getAttribute(id, defaultValue);
+        }
+        catch(CoreException e) { }
+        return value;
+    }
+    
+    @SuppressWarnings("unchecked")
+    protected static Map getAttribute(ILaunchConfiguration config, String id,
+            Map defaultValue)
+    {
+        Map value = defaultValue;
+        try
+        {
+            value = config.getAttribute(id, defaultValue);
+        }
+        catch(CoreException e) { }
+        return value;
+    }
+    
+    @SuppressWarnings("unchecked")
+    protected static Set getAttribute(ILaunchConfiguration config, String id,
+            Set defaultValue)
+    {
+        Set value = defaultValue;
+        try
+        {
+            value = config.getAttribute(id, defaultValue);
+        }
+        catch(CoreException e) { }
+        return value;
+    }
-}

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

@@ -6 +6 @@
-import java.util.TreeMap;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
@@ -31 +30 @@
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
@@ -40 +41 @@
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.Link;
+import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-
@@ -47 +49 @@
-import descent.building.compiler.EnumOption;
-import descent.building.compiler.ICompilerInterface;
+import descent.building.compiler.IValidatableOption;
-import descent.building.compiler.StringOption;
-import descent.internal.building.compiler.DmdCompilerInterface;
@@ -77 +80 @@
-            
-            fHelpText = new Link(comp, SWT.LEFT | SWT.WRAP);
-
-
-
-
+
+
-            gd = new GridData(GridData.FILL_BOTH);
-            gd.horizontalSpan = 2;
@@ -102 +103 @@
-            
-            fCombo = new Combo(comp, SWT.DROP_DOWN | SWT.READ_ONLY);
-BEGINNING
+FILL
-            gd.horizontalSpan = 1;
-            gd.grabExcessHorizontalSpace = true;
-            fCombo.addModifyListener(new ModifyListener()
-            {
@@ -167 +167 @@
-        public void initializeFrom(ILaunchConfiguration config)
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-            
-            for(int i = 0; i < fCompilers.length; i++)
@@ -238 +229 @@
-    }
-    
-ublic
+rivate final
-    {
-        private abstract class CompilerUIOption
@@ -250 +241 @@
-            public abstract String getText();
-            public abstract void initializeTo(String value);
-void applyTo(ILaunchConfigurationWorkingCopy config
+String getStringValue(
-        }
-        
@@ -304 +295 @@
-
-            @Override
-
-
-
-
+
+
+
-            }
-        }
@@ -373 +363 @@
-            
-            @Override
-
-
-
-
+
+
+
-            }
-        }
@@ -431 +420 @@
-            
-            @Override
-void applyTo(ILaunchConfigurationWorkingCopy config
-
-config.setAttribute(getOption().getAttributeId(), selected)
+String getStringValue(
+
+return selected
-            }
-        }
@@ -497 +486 @@
-        private TreeEntry[] fEntries;
-        private Group fHelpGroup;
+        private Label fHelpHeader;
-        private Label fHelpText;
-        
@@ -528 +518 @@
-            
-            column = new TreeViewerColumn(fViewer, SWT.NONE);
-200
+175
-            column.getColumn().setText("Value");
-            column.setLabelProvider(new ColumnLabelProvider()
@@ -593 +583 @@
-            gd = new GridData(GridData.FILL_VERTICAL);
-            gd.horizontalSpan = 1;
-00
+25
-            fHelpGroup.setLayoutData(gd);
-            
@@ -599 +589 @@
-            groupLayout.numColumns = 1;
-            fHelpGroup.setLayout(groupLayout);
+            
+            fHelpHeader = new Label(fHelpGroup, SWT.LEFT);
+            gd = new GridData(GridData.FILL_HORIZONTAL);
+            gd.horizontalSpan = 1;
+            fHelpHeader.setText("");
+            fHelpHeader.setFont(getBoldFont(comp));
+            fHelpHeader.setLayoutData(gd);
-            
-            fHelpText = new Label(fHelpGroup, SWT.LEFT | SWT.WRAP);
@@ -613 +610 @@
-                    if(0 == paths.length)
-                    {
-
-
+
-                        return;
-                    }
@@ -621 +617 @@
-                    if(!(selected instanceof CompilerUIOption))
-                    {
-
-
+
-                        return;
-                    }
-                    
+                    
+                    fHelpHeader.setText(((CompilerUIOption) selected).getOption().
+                            getLabel());
-                    fHelpText.setText(((CompilerUIOption) selected).getOption().
-                            getHelpText());
+                    updateHelp();
+                }
+                
+                private void unsetHelp()
+                {
+                    fHelpHeader.setText("");
+                    fHelpText.setText("");
+                    updateHelp();
+                }
+                
+                private void updateHelp()
+                {
+                    fHelpHeader.update();
-                    fHelpText.update();
-                }
@@ -704 +715 @@
-                    CompilerOption opt = uiOpt.getOption();
-                    String defaultValue = opt.getDefaultValue();
-
-
-
-
-
-
+
-                    uiOpt.initializeTo(value);
-                    fViewer.update(uiOpt, null);
@@ -723 +729 @@
-                for(CompilerUIOption uiOpt : group.children)
-                {
-
+
+
-                }
-            }
@@ -743 +750 @@
-        public String validate()
-        {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            return null;
-        }
@@ -749 +768 @@
-    
-    //--------------------------------------------------------------------------
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    // This needs to be done at the tab level to allow for disposing)
@@ -755 +853 @@
-    private Image fCheckedIcon = createImage("obj16/checked.png");
-    private Image fUncheckedIcon = createImage("obj16/unchecked.png");
+    private Font fBoldFont;
+    
+    private Font getBoldFont(Composite comp)
+    {
+        if(null == fBoldFont)
+        {
+            FontData[] fontData = comp.getFont().getFontData();
+            for(FontData dataItem : fontData)
+                dataItem.setStyle(dataItem.getStyle() | SWT.BOLD);
+            fBoldFont = new Font(comp.getDisplay(), fontData);
+        }
+        return fBoldFont;
+    }
-    
-    public void dispose()
@@ -761 +872 @@
-        fCheckedIcon.dispose();
-        fUncheckedIcon.dispose();
+        if(null != fBoldFont)
+            fBoldFont.dispose();
-    }
-    
@@ -782 +895 @@
-            new CompilerSetting(),
-            compilerOptions,
+            new ArgumentsSetting(),
-        };
-    }

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

@@ -1 +1 @@
-package descent.internal.building.ui;
-
+import java.util.ArrayList;
-import java.util.List;
-
@@ -6 +7 @@
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
@@ -13 +13 @@
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
@@ -27 +29 @@
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-
+import descent.core.IJavaElement;
-import descent.core.IJavaProject;
-import descent.core.JavaCore;
@@ -174 +177 @@
-    private final class OutputTypeSetting implements ISetting
-    {
-        private Label fLabel;
-        private Button fExecutableRadio;
-        private Button fStaticLibRadio;
@@ -183 +185 @@
-        public void addToControl(Composite comp)
-        {   
-fL
-fL
+Label l
+l
-            GridData gd = new GridData();
-            gd.horizontalSpan = 3;
-fL
+l
-            
-            fExecutableRadio = createRadioButton(comp, 3, "Executable", 25, 
@@ -221 +223 @@
-                        }
-                    });
-            createSpacer(comp, 3);
-        }
-
-        public void initializeFrom(ILaunchConfiguration config)
-        {
-
-
-
-
-
-
+
+
-            
-            if(outputType.equals(OUTPUT_TYPE_STATIC_LIBRARY))
@@ -431 +428 @@
-    private final class ModulesSetting implements ISetting
-    {
-        private Group fGroup;