diff options
| author | Josh Blum <josh@joshknows.com> | 2010-06-18 12:33:40 -0700 | 
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-06-18 12:33:40 -0700 | 
| commit | efbeb60d1dd7e870a48cf42df9a3650aefbf26cd (patch) | |
| tree | 12131942ff9f85f7776a864cb79120bab778d8f9 /fpga/usrp2/top/tcl | |
| parent | df80be9c61d95402976d3349acf62630044c1939 (diff) | |
| parent | edcc2df10ba59ed91ac9513c2dc1d36e155caaec (diff) | |
| download | uhd-efbeb60d1dd7e870a48cf42df9a3650aefbf26cd.tar.gz uhd-efbeb60d1dd7e870a48cf42df9a3650aefbf26cd.tar.bz2 uhd-efbeb60d1dd7e870a48cf42df9a3650aefbf26cd.zip  | |
Merge branch 'uhd_fpga_merge' into pre_merge
Diffstat (limited to 'fpga/usrp2/top/tcl')
| -rw-r--r-- | fpga/usrp2/top/tcl/ise_helper.tcl | 17 | 
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  | 
