Commit 080053fa authored by Mikhail Karpenko's avatar Mikhail Karpenko

Merge remote-tracking branch 'vdt-open/master'

Conflicts:
	.gitignore
	build.properties
	install_and_patch_veditor.sh
	tools/Altera_Quartus/quartus_place.xml
	tools/Altera_Quartus/quartus_synthesis.xml
	tools/DesignMenu.xml
	tools/Xilinx_Vivado/vivado_test.xml
parents 707ddf4c ceb85327
bin
tmp
\ No newline at end of file
tmp
src/com/elphel/vdt/veditor
_generated
src/com/elphel/vdt/core/launching/VDTErrorParser.java
about_veditor.html
ChangeLogVeditor.txt
CONTRIBUTORS_VEDITOR.txt
This diff is collapsed.
......@@ -14,7 +14,8 @@ bin.includes = icons/,\
LICENSE,\
INSTALL,\
CONTRIBUTORS_VEDITOR.txt,\
parsers/
parsers/,\
bin/
#
# Set the following to override the environment
......
......@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
#
# Additional permission under GNU GPL version 3 section 7:
# If you modify this Program, or any covered work, by linking or combining it
# with Eclipse or Eclipse plugins (or a modified version of those libraries),
......@@ -33,7 +33,7 @@ INITIAL_DIRECTORY=`pwd`
if [ ! -f "$PATCH_FILE" ]; then
echo "Patch file $INITIAL_DIRECTORY/$PATCH_FILE is not found"
exit 1
fi
fi
if [ ! -d "$TMPDIR" ]; then
mkdir "$TMPDIR"
fi
......@@ -44,7 +44,7 @@ cp -v "$PATCH_FILE" "$TMPDIR"
cd "$TMPDIR"
if [ ! -d "$GITREPO" ]; then
git clone "$GITURL"
fi
fi
mkdir -p vdt-veditor/src/com/elphel/vdt/core/launching
#Different structure of the files generated by JavaCC, manual copying
mkdir -p vdt-veditor/_generated/com/elphel/vdt/veditor/parser/verilog
......
......@@ -100,7 +100,7 @@
<menu name="Vivado"
label="Vivado Tools"
icon="xilinx.png">
icon="vivado_logo.png">
<menu name="VivadoUtils"
label="Vivado utilities"
icon="setup.png">
......
......@@ -41,7 +41,7 @@
</extensions-list>
<action-menu>
<action label="Vivado Command" resource="" icon="xilinx.png" />
<action label="Vivado Command" resource="" icon="vivado_logo.png" />
</action-menu>
<parameter id="TCLCommand" label="Remote TCL Command to send"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment