Commit 3bb6b738 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

Adder %%UserName generator, set default remote Vivado server to

username@127.0.0.1
parent a1fdf168
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ public class VDT {
    public static final String GENERATOR_ID_CURRENT_BASE  = "CurrentFileBase"; 
    public static final String GENERATOR_ID_CHOSEN_ACTION = "ChosenActionIndex"; 
    public static final String GENERATOR_ID_BUILD_STAMP   = "BuildStamp"; 
    public static final String GENERATOR_ID_USERNAME      = "UserName"; 
    public static final String GENERATOR_ID_BLANK         = "Blank"; 
    public static final String GENERATOR_ID_NEWLINE       = "NewLine"; 
} // class VDT
+11 −13
Original line number Diff line number Diff line
/*******************************************************************************
 * Copyright (c) 2006 Elphel, Inc and Excelsior, LLC.
 * Copyright (c) 2014 Elphel, Inc.
 * This file is a part of Eclipse/VDT plug-in.
 * Eclipse/VDT plug-in is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by the
 * Free Software Foundation; either version 2 of the License, or (at your option)
 * any later version.
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * Eclipse/VDT plug-in is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 * FITNESS FOR A PARTICULAR PURPOSE.
 * See the GNU General Public License for more details.
 * Eclipse/VDT plug-in is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License along
 * with Eclipse VDT plug-in; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 *******************************************************************************/
package com.elphel.vdt.core.tools.generators;

@@ -30,5 +30,3 @@ public class BuildStampGenerator extends AbstractGenerator {
    	return new String[] {SelectedResourceManager.getDefault().getBuildStamp()};
    }
}

+31 −0
Original line number Diff line number Diff line
/*******************************************************************************
 * Copyright (c) 2014 Elphel, Inc.
 * This file is a part of Eclipse/VDT plug-in.
 * Eclipse/VDT plug-in is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * Eclipse/VDT plug-in is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 *******************************************************************************/
package com.elphel.vdt.core.tools.generators;

import com.elphel.vdt.VDT;

public class UserNameGenerator extends AbstractGenerator {
    public static final String NAME = VDT.GENERATOR_ID_USERNAME;
    public String getName() {
        return NAME;
    }
    
    protected String[] getStringValues() {
    	return new String[] {System.getProperty("user.name")};
    }
} //UserNameGenerator
+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ public class SimpleGeneratorRecognizer implements Recognizer {
        new CurrentFileGenerator(),
        new CurrentFileBaseGenerator(),
        new ChosenActionGenerator(),
        new BuildStampGenerator()
        new BuildStampGenerator(),
        new UserNameGenerator()
    };
  
    public SimpleGeneratorRecognizer(){
+2 −2
Original line number Diff line number Diff line
@@ -11,11 +11,11 @@
	              label="Common parameters for FPGA projects"
	              interface="FPGAPprojectInterface">
	     <parameter id="RemoteHost" label="Remote Host IP" tooltip="Remote Host IP" type="String"
			format="CopyValue" default="192.168.0.122" readonly="false" visible="true" />
			format="CopyValue" default="127.0.0.1" readonly="false" visible="true" />


		<parameter id="RemoteUser" label="Remote user name" tooltip="Remote user name" type="String"
			format="CopyValue" default="xilinx" readonly="false" visible="true" />
			format="CopyValue" default="%%UserName" readonly="false" visible="true" />

		<parameter id="PreSSH" label="pre-ssh" tooltip="pre-ssh shell parameters"
			type="String" format="CopyValue" default="" readonly="false" visible="true" />