diff options
4 files changed, 125 insertions, 9 deletions
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.properties b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.properties index 9ac547cf126..5dfb201d3a4 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.properties +++ b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.properties @@ -12,16 +12,16 @@ #Properties file for org.eclipse.cdt.managedbuilder.xlupc.ui Bundle-Vendor.0 = Eclispe.org Bundle-Name.0 = XL UPC Managed Build UI Plugin -category.name.1=UPC -wizard.name.1=UPC Project +category.name.1=XL UPC +wizard.name.1=XL UPC Project -ToolName.compiler.xlupc = UPC Compiler +ToolName.compiler.xlupc = XL UPC Compiler TargetName.xlupc.exe=Executable (XL UPC) TargetName.xlupc.so=Shared Library (XL UPC) TargetName.xlupc.lib=Static Library(XL UPC) -ToolChainName.Upc=UPC Tool Chain +ToolChainName.Upc=XL UPC Tool Chain ConfigName.Dbg=Debug ConfigName.Rel=Release @@ -29,6 +29,24 @@ ConfigName.Rel=Release PlatformName.Rel=Release Platform PlatformName.Dbg=Debug Platform -BuildProperty.type.name.xlupc.executable=Executable (UPC) -BuildProperty.type.name.xlupc.staticLibrary=Static Library (UPC) -BuildProperty.type.name.xlupc.sharedLibrary=Shared Library (UPC) +BuildProperty.type.name.xlupc.executable=Executable (XL UPC) +BuildProperty.type.name.xlupc.staticLibrary=Static Library (XL UPC) +BuildProperty.type.name.xlupc.sharedLibrary=Shared Library (XL UPC) + +OptionCategory.upc=XL UPC Compiler Options + +Option.qsourcetype=Use filename suffix to determine the programming language (-qsourcetype) +Option.qsourcetype.default=default +Option.qsourcetype.upc=upc + +Option.runtime=UPC runtime implementation (-qupc=rts=<suboption>) +Option.runtime.default=default +Option.runtime.lapi=lapi +Option.runtime.smp=smp + +Option.threads=Number of static THREADS (-qupc=threads=<n>) + +Option.compilation=Select either 32-bit or 64-bit compilation mode +Option.compilation.q32=-q32 +Option.compilation.q64=-q64 + diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.xml b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.xml index 3abe93e484f..0b91649348f 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.xml +++ b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.xml @@ -310,7 +310,100 @@ name="%ToolName.compiler.xlupc" natureFilter="cnature" outputFlag="-o" - superClass="cdt.managedbuild.tool.xlc.cpp.compiler"> + superClass="cdt.managedbuild.tool.xlc.c.compiler"> + <inputType + dependencyContentType="org.eclipse.cdt.core.cHeader" + dependencyExtensions="h" + id="org.eclipse.cdt.managedbuilder.xlupc.ui.inputType.upc" + primaryInput="true" + scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile" + sourceContentType="org.eclipse.cdt.core.parser.upc.upcSource" + sources="upc"> + </inputType> + <optionCategory + id="org.eclipse.cdt.managedbuilder.xlupc.ui.optionCategory.upc" + name="%OptionCategory.upc"> + </optionCategory> + <option + category="org.eclipse.cdt.managedbuilder.xlupc.ui.optionCategory.upc" + id="org.eclipse.cdt.managedbuilder.xlupc.ui.qsourcetype" + isAbstract="false" + name="%Option.qsourcetype" + valueType="enumerated"> + <enumeratedOptionValue + id="org.eclipse.cdt.managedbuilder.xlupc.ui.qsourcetype.empty" + isDefault="true" + name=""> + </enumeratedOptionValue> + <enumeratedOptionValue + command="-qsourcetype=default" + id="org.eclipse.cdt.managedbuilder.xlupc.ui.qsourcetype.default" + name="%Option.qsourcetype.default"> + </enumeratedOptionValue> + <enumeratedOptionValue + command="-qsourcetype=upc" + id="org.eclipse.cdt.managedbuilder.xlupc.ui.qsourcetype.upc" + name="%Option.qsourcetype.upc"> + </enumeratedOptionValue> + </option> + <option + category="org.eclipse.cdt.managedbuilder.xlupc.ui.optionCategory.upc" + id="org.eclipse.cdt.managedbuilder.xlupc.ui.runtime" + isAbstract="false" + name="%Option.runtime" + valueType="enumerated"> + <enumeratedOptionValue + id="org.eclipse.cdt.managedbuilder.xlupc.ui.runtime.empty" + isDefault="true" + name=""> + </enumeratedOptionValue> + <enumeratedOptionValue + command="-qupc=rts=default" + id="org.eclipse.cdt.managedbuilder.xlupc.ui.runtime.default" + name="%Option.runtime.default"> + </enumeratedOptionValue> + <enumeratedOptionValue + command="-qupc=rts=lapi" + id="org.eclipse.cdt.managedbuilder.xlupc.ui.runtime.lapi" + name="%Option.runtime.lapi"> + </enumeratedOptionValue> + <enumeratedOptionValue + command="-qupc=rts=smp" + id="org.eclipse.cdt.managedbuilder.xlupc.ui.runtime.smp" + name="%Option.runtime.smp"> + </enumeratedOptionValue> + </option> + <option + category="org.eclipse.cdt.managedbuilder.xlupc.ui.optionCategory.upc" + id="org.eclipse.cdt.managedbuilder.xlupc.ui.compilation" + isAbstract="false" + name="%Option.compilation" + valueType="enumerated"> + <enumeratedOptionValue + id="org.eclipse.cdt.managedbuilder.xlupc.ui.compilation.empty" + isDefault="true" + name=""> + </enumeratedOptionValue> + <enumeratedOptionValue + command="-q32" + id="org.eclipse.cdt.managedbuilder.xlupc.ui.compilation.q32" + name="%Option.compilation.q32"> + </enumeratedOptionValue> + <enumeratedOptionValue + command="-q64" + id="org.eclipse.cdt.managedbuilder.xlupc.ui.compilation.q64" + name="%Option.compilation.q64"> + </enumeratedOptionValue> + </option> + <option + category="org.eclipse.cdt.managedbuilder.xlupc.ui.optionCategory.upc" + command="-qupc=threads=" + id="org.eclipse.cdt.managedbuilder.xlupc.ui.threads" + isAbstract="false" + name="%Option.threads" + valueType="string"> + </option> + </tool> </extension> <extension diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/UpcProjectWizard.java b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/UpcProjectWizard.java index ff20c19e940..30dbe13c4ea 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/UpcProjectWizard.java +++ b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/UpcProjectWizard.java @@ -15,7 +15,9 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CProjectNature; +import org.eclipse.cdt.core.dom.upc.UPCLanguage; import org.eclipse.cdt.managedbuilder.xlupc.ui.Messages; import org.eclipse.cdt.ui.wizards.CDTCommonProjectWizard; import org.eclipse.cdt.ui.wizards.CDTMainWizardPage; @@ -92,4 +94,8 @@ public class UpcProjectWizard extends CDTCommonProjectWizard { return new String[] { CProjectNature.C_NATURE_ID/*, CCProjectNature.CC_NATURE_ID, RemoteNature.REMOTE_NATURE_ID*/}; } + @Override + public String[] getContentTypeIDs() { + return new String[] { CCorePlugin.CONTENT_TYPE_CSOURCE, CCorePlugin.CONTENT_TYPE_CHEADER, UPCLanguage.UPC_CONTENT_TYPE_ID }; + } } diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/XLUpcSettingsWizardRunnable.java b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/XLUpcSettingsWizardRunnable.java index e3839093a84..477592549cb 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/XLUpcSettingsWizardRunnable.java +++ b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/src/org/eclipse/cdt/managedbuilder/xlupc/ui/wizards/XLUpcSettingsWizardRunnable.java @@ -43,7 +43,6 @@ public class XLUpcSettingsWizardRunnable extends XLCSettingsWizardRunnable { public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { super.run(monitor); - // get a handle to the wizard IWizardPage[] pages = MBSCustomPageManager.getPages(); |