Commit 1e47ffcc authored by Andrey Filippov's avatar Andrey Filippov
Browse files

Started ISE XST tool

parent 4ab58c67

src/com/elphel/vdt/ui/variables/SelectedResourceManager.java

+2 −1
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ public class SelectedResourceManager implements IWindowListener, ISelectionListe 
        		if (VerilogPlugin.getPreferenceBoolean(PreferenceStrings.DEBUG_OTHER))

        			System.out.println("Updated fSelectedVerilogFile: "+fSelectedVerilogFile);

            } else {

        		if (VerilogPlugin.getPreferenceBoolean(PreferenceStrings.DEBUG_OTHER))

        			System.out.println(selectedResource+" is not a file or not an HDL file");

            }

        }

src/com/elphel/vdt/ui/views/DesignFlowView.java

+10 −7
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import java.util.List; 
import java.util.Map;



import org.eclipse.swt.widgets.Composite;

import org.eclipse.swt.widgets.Display;



import org.eclipse.swt.widgets.Event;

import org.eclipse.swt.widgets.Listener;

import org.eclipse.swt.widgets.Shell;
@@ -104,7 +104,7 @@ public class DesignFlowView extends ViewPart implements ISelectionListener { 
    private static final String TAG_LINKED_TOOLS =        "LinkedTools";



    private TreeViewer viewer;

    private DrillDownAdapter drillDownAdapter;

//    private DrillDownAdapter drillDownAdapter;

    private Action showLaunchConfigAction;

//    private Action launchAction;
@@ -154,7 +154,7 @@ public class DesignFlowView extends ViewPart implements ISelectionListener { 
    IDoubleClickListener doubleClickListener=null;

    private Action [] launchActions;

    private ToolSequence toolSequence=null;

    private Composite compositeParent;

//    private Composite compositeParent;

    /**

     * The constructor.

     */
@@ -201,9 +201,9 @@ public class DesignFlowView extends ViewPart implements ISelectionListener { 
		if (VerilogPlugin.getPreferenceBoolean(PreferenceStrings.DEBUG_OTHER))

			System.out.println("+++++ createPartControl()");

    	

    	compositeParent=parent; // will it help to re-draw

//    	compositeParent=parent; // will it help to re-draw

        viewer = new TreeViewer(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL);

        drillDownAdapter = new DrillDownAdapter(viewer);

//        drillDownAdapter = new DrillDownAdapter(viewer);



        viewer.setContentProvider(new ViewContentProvider());

        viewer.setLabelProvider(new ViewLabelProvider());
@@ -1109,7 +1109,9 @@ public class DesignFlowView extends ViewPart implements ISelectionListener { 
            Object obj = ((IStructuredSelection)selection).getFirstElement();

            selectedItem = (DesignMenuModel.Item) obj;

            if (selectedResource == null)

                selectedResource = SelectedResourceManager.getDefault().getViewSelectedResource(IPageLayout.ID_RES_NAV);

//                selectedResource = SelectedResourceManager.getDefault().getViewSelectedResource(IPageLayout.ID_RES_NAV);

            	selectedResource = SelectedResourceManager.getDefault().getViewSelectedResource(IPageLayout.ID_PROJECT_EXPLORER);

            //

            updateLaunchAction();

        }    

    } // class ToolSelectionChangedListener
@@ -1362,6 +1364,7 @@ public class DesignFlowView extends ViewPart implements ISelectionListener { 
        if (selectedResource != null) {

            String location = selectedResource.getFullPath().toPortableString();

            memento.putString(TAG_SELECTED_RESOURCE, location);

        	if (VerilogPlugin.getPreferenceBoolean(PreferenceStrings.DEBUG_OTHER))

        		System.out.println("saveState(memento): selectedResource="+selectedResource);

        }

        IResource HDLFile=SelectedResourceManager.getDefault().getChosenVerilogFile();

tools/BasicInterface.xml

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ 
	<syntax name="DashListIndividual"  format="%(-%%ParamName %%ParamValue%| %)" />

	<syntax name="DashListCommon"      format="-%%ParamName %(%%ParamValue%| %)" />

	<syntax name="DashName"            format=" -%%ParamName" />

	<syntax name="QuotedDash"          format=' -%%ParamName "%%ParamValue"' />

<!--

Does not work according to 2.2.1. "Inside text-repetitor, one and only one pattern-generator is mandatory".

tools/DesignMenu.xml

+4 −1
Original line number Diff line number Diff line
@@ -48,7 +48,10 @@ 
                          label="Run ISE partgen"

                          icon="bitstream.png"

                          call="ISEPartgen"/>



               	<menuitem name="ISESynthesis"

                          label="Synthesize design"

                          icon="Retort.png"

                          call="ISExst"/>

        </menu>

                          

        <menu name="Vivado"

tools/FPGA_project.xml

+6 −6
Original line number Diff line number Diff line
@@ -201,17 +201,17 @@ 
			type="String" default="vdt_ise" format="RemoteRootSyntax" readonly="false" />



		<parameter id="ISERemoteDir" label="Remote ISE directory" tooltip="Remote ISE output subdirectroy for snapshot and result files"

			type="Pathname" default="vivado_build" format="CopyValue" readonly="false" />

			type="Pathname" default="ise_build" format="CopyValue" readonly="false" />



		<parameter id="ISELocalDir" label="Local ISE directory" tooltip="Local project subdirectroy for Xilinx ISE snapshot files"

			type="Pathname" default="vivado_state" format="CopyValue" readonly="false" />

			type="Pathname" default="ise_state" format="CopyValue" readonly="false" />



		<parameter id="ISELocalResultDir" label="Local ISE results directory"

		    tooltip="Local project subdirectroy for Xilinx ISE generated result files"

			type="Pathname" default="vivado_results" format="CopyValue" readonly="false" />

			type="Pathname" default="ise_results" format="CopyValue" readonly="false" />



		<parameter id="ISELogDir" label="Local ISE tool logs directory" tooltip="Local project subdirectroy for Xilinx ISE tools log files"

			type="Pathname" default="vivado_logs" format="CopyValue" readonly="false" />

			type="Pathname" default="ise_logs" format="CopyValue" readonly="false" />



		<parameter id="ISEIgnoreSource" label="Ignore source files" tooltip="Pattern to ignore source files that match this regular expression"

			type="String" default=".*unisims.*" format="CopyValue" readonly="false" />
@@ -306,16 +306,16 @@ 
	

		<parameter id="ISESedPaths" type="String" format="CopyValue"

		label="sed command line" tooltip="Remote file prefix to be removed for the local error parser when running ISE tools"

		default="sed -u 's@/home/%RemoteUser/%VivadoProjectRoot/%%ProjectName/@@'"/>

		default="sed -u 's@/home/%RemoteUser/%ISEProjectRoot/%%ProjectName/@@'"/>

			

		<input>

			<group name="Genaral" label="General parameters">

			    "part"

				"ImplementationTopFile"

			</group>

			<group name="Simulation" label="Simulation properties">

				"SimulationTopFile"

				"SimulationTopModule"

				"ImplementationTopFile"

				"SimulDir"

			</group>