diff --git a/tclapp/xilinx/projutils/app.xml b/tclapp/xilinx/projutils/app.xml index 3592b54c8..5cadddba1 100755 --- a/tclapp/xilinx/projutils/app.xml +++ b/tclapp/xilinx/projutils/app.xml @@ -2,7 +2,7 @@ - support for XPM files for -of_objects + removed unneeded call to generate_mem_files, CR:948099 projutils Vivado 2014.1 xilinx diff --git a/tclapp/xilinx/projutils/export_simulation.tcl b/tclapp/xilinx/projutils/export_simulation.tcl index 6cfebfe0d..ec11837e4 100755 --- a/tclapp/xilinx/projutils/export_simulation.tcl +++ b/tclapp/xilinx/projutils/export_simulation.tcl @@ -767,8 +767,6 @@ proc xps_gen_mem_files { run_dir } { foreach file [glob -nocomplain -directory $a_sim_cache_gen_mem_files($s_hash) *.mem] { if { [catch {file copy -force $file $run_dir} error] } { send_msg_id exportsim-Tcl-069 ERROR "failed to copy '${file}' to '${run_dir}': $error" - } else { - generate_mem_files $run_dir } } return diff --git a/tclapp/xilinx/projutils/pkgIndex.tcl b/tclapp/xilinx/projutils/pkgIndex.tcl index d92416576..5645d15f5 100755 --- a/tclapp/xilinx/projutils/pkgIndex.tcl +++ b/tclapp/xilinx/projutils/pkgIndex.tcl @@ -8,4 +8,4 @@ # script is sourced, the variable $dir must contain the # full path name of this file's directory. -package ifneeded ::tclapp::xilinx::projutils 3.157 [list source [file join $dir projutils.tcl]] +package ifneeded ::tclapp::xilinx::projutils 3.158 [list source [file join $dir projutils.tcl]] diff --git a/tclapp/xilinx/projutils/projutils.tcl b/tclapp/xilinx/projutils/projutils.tcl index 238c3bd7e..4090665b0 100755 --- a/tclapp/xilinx/projutils/projutils.tcl +++ b/tclapp/xilinx/projutils/projutils.tcl @@ -9,4 +9,4 @@ namespace eval ::tclapp::xilinx::projutils { lappend ::auto_path $home } } -package provide ::tclapp::xilinx::projutils 3.157 +package provide ::tclapp::xilinx::projutils 3.158