summaryrefslogtreecommitdiffstats
path: root/fpga/usrp2/top/tcl
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-06-15 18:24:33 -0700
committerJosh Blum <josh@joshknows.com>2010-06-15 18:24:33 -0700
commitedcc2df10ba59ed91ac9513c2dc1d36e155caaec (patch)
tree1a1ec2c0b5500990c991c27af03dbe48c10ce7ca /fpga/usrp2/top/tcl
parenta89d684ba2b81c6e18d348965dffb919edb56fea (diff)
parent9445315e6a5cdfb29c4ead73b0fcd4d5fd75b900 (diff)
downloaduhd-edcc2df10ba59ed91ac9513c2dc1d36e155caaec.tar.gz
uhd-edcc2df10ba59ed91ac9513c2dc1d36e155caaec.tar.bz2
uhd-edcc2df10ba59ed91ac9513c2dc1d36e155caaec.zip
Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_master
Conflicts: fpga/.gitignore
Diffstat (limited to 'fpga/usrp2/top/tcl')
-rw-r--r--fpga/usrp2/top/tcl/ise_helper.tcl17
1 files changed, 8 insertions, 9 deletions
diff --git a/fpga/usrp2/top/tcl/ise_helper.tcl b/fpga/usrp2/top/tcl/ise_helper.tcl
index fe9db87af..a4bee76b8 100644
--- a/fpga/usrp2/top/tcl/ise_helper.tcl
+++ b/fpga/usrp2/top/tcl/ise_helper.tcl
@@ -40,12 +40,12 @@ proc set_props {process options} {
}
}
-if [file isfile $env(PROJ_FILE)] {
- puts ">>> Opening project: $env(PROJ_FILE)"
- project open $env(PROJ_FILE)
+if [file isfile $env(ISE_FILE)] {
+ puts ">>> Opening project: $env(ISE_FILE)"
+ project open $env(ISE_FILE)
} else {
- puts ">>> Creating project: $env(PROJ_FILE)"
- project new $env(PROJ_FILE)
+ puts ">>> Creating project: $env(ISE_FILE)"
+ project new $env(ISE_FILE)
##################################################
# Set the project properties
@@ -56,7 +56,6 @@ if [file isfile $env(PROJ_FILE)] {
# Add the sources
##################################################
foreach source $env(SOURCES) {
- set source $env(SOURCE_ROOT)$source
puts ">>> Adding source to project: $source"
xfile add $source
}
@@ -78,9 +77,9 @@ if [file isfile $env(PROJ_FILE)] {
set_props "Generate Post-Place & Route Simulation Model" $env(SIM_MODEL_PROPERTIES)
}
-if [string compare $env(PROCESS_RUN) ""] {
- puts ">>> Running Process: $env(PROCESS_RUN)"
- process run $env(PROCESS_RUN)
+if [string compare [lindex $argv 0] ""] {
+ puts ">>> Running Process: [lindex $argv 0]"
+ process run [lindex $argv 0]
}
project close