Message

Reply | Reply all

Date Prev | Date Next | Thread Prev | Thread Next Date Index | Thread Index

From: cvs at opencores.org<cvs@o...>
Date: Wed Jan 30 15:33:43 CET 2008
Subject: [cvs-checkins] MODIFIED: jop ...
Date: 00/08/01 30:15:33

Modified: jop Makefile build.xml
Log:
Fixing problems with invoking USBRunner.




Revision Changes Path
1.77 jop/Makefile

http://www.opencores.org/cvsweb.shtml/jop/Makefile.diff?r1=1.76&r2=1.77

(In the diff below, changes in quantity of whitespace are not shown.)

Index: Makefile
===================================================================
RCS file: /cvsroot/jeuneS2/jop/Makefile,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- Makefile 14 Jan 2008 22:01:21 -0000 1.76
+++ Makefile 30 Jan 2008 14:33:43 -0000 1.77
@@ -47,6 +47,12 @@
BLASTER_TYPE=ByteBlasterMV
#BLASTER_TYPE=USB-Blaster

+ifeq ($(WINDIR),)
+ USBRUNNER=./USBRunner
+else
+ USBRUNNER=USBRunner.exe
+endif
+
# 'some' different Quartus projects
QPROJ=cycmin cycbaseio cycbg dspio lego cycfpu cyc256x16 sopcmin cyccmp
# if you want to build only one Quartus project use e.q.:
@@ -399,7 +405,7 @@
cd quartus/$(DLPROJ) && quartus_pgm -c $(BLASTER_TYPE) -m JTAG jop.cdf

config_usb:
- cd rbf && ../USBRunner $(DLPROJ).rbf
+ cd rbf && ../$(USBRUNNER) $(DLPROJ).rbf

download:
# java -cp java/tools/dist/lib/jop-tools.jar\;java/lib/RXTXcomm.jar com.jopdesign.tools.JavaDown \



1.13 jop/build.xml

http://www.opencores.org/cvsweb.shtml/jop/build.xml.diff?r1=1.12&r2=1.13

(In the diff below, changes in quantity of whitespace are not shown.)

Index: build.xml
===================================================================
RCS file: /cvsroot/jeuneS2/jop/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- build.xml 25 Jan 2008 10:54:06 -0000 1.12
+++ build.xml 30 Jan 2008 14:33:43 -0000 1.13
@@ -38,6 +38,13 @@
<property name="blaster-type" value="ByteBlasterMV"/>
<!-- <property name="blaster-type" value="USB-Blaster"/> -->

+ <condition property="usbrunner" value="./USBRunner">
+ <os family="unix" name="linux"/>
+ </condition>
+ <condition property="usbrunner" value="USBRunner.exe">
+ <os family="windows"/>
+ </condition>
+
<!-- 'some' different Quartus projects -->
<!-- <property name="qproj" value="cycbaseio"/> -->
<!-- <property name="qproj" value="cycbg"/> -->
@@ -185,7 +192,6 @@

<!-- use this for serial download -->
<target name="all" depends="directories, tools, jopser, japp" description="Use this for serial download"/>
-
<target name="japp" depends="java-app, config-byteblast, download"/>

<!-- use this for USB download of FPGA configuration and Java program download -->
@@ -421,7 +427,7 @@
</target>

<target name="config-usb">
- <exec executable="USBRunner" resolveexecutable="true" dir="rbf" failonerror="true">
+ <exec executable="${usbrunner}" resolveexecutable="true" dir="rbf" failonerror="true">
<arg line="${dlproj}.rbf"/>
</exec>
</target>