From 45a081e77e44ef252439cafc6feee4fa6f865019 Mon Sep 17 00:00:00 2001
From: Erik Kooistra <kooistra@astron.nl>
Date: Fri, 17 Apr 2015 09:38:56 +0000
Subject: [PATCH] Moved build_dir_sim and build_dir_synth keys from local
 hdllib.cfg to central hdltool.cfg

---
 libraries/base/common/hdllib.cfg                     | 3 ---
 libraries/base/diag/hdllib.cfg                       | 3 ---
 libraries/base/diagnostics/hdllib.cfg                | 3 ---
 libraries/base/dp/designs/unb1_dp_offload/hdllib.cfg | 3 ---
 libraries/base/dp/hdllib.cfg                         | 3 ---
 libraries/base/mm/hdllib.cfg                         | 3 ---
 libraries/base/reorder/hdllib.cfg                    | 3 ---
 libraries/base/sens/hdllib.cfg                       | 3 ---
 libraries/base/ss/hdllib.cfg                         | 3 ---
 libraries/base/tst/hdllib.cfg                        | 3 ---
 libraries/base/uth/hdllib.cfg                        | 3 ---
 libraries/external/easics/hdllib.cfg                 | 3 ---
 libraries/external/numonyx_m25p128/hdllib.cfg        | 3 ---
 libraries/io/ddr/hdllib.cfg                          | 3 ---
 libraries/io/ddr3/hdllib.cfg                         | 3 ---
 libraries/io/epcs/hdllib.cfg                         | 3 ---
 libraries/io/eth/hdllib.cfg                          | 3 ---
 libraries/io/i2c/hdllib.cfg                          | 3 ---
 libraries/io/mac_10g/hdllib.cfg                      | 3 ---
 libraries/io/mdio/hdllib.cfg                         | 3 ---
 libraries/io/ppsh/hdllib.cfg                         | 3 ---
 libraries/io/remu/hdllib.cfg                         | 3 ---
 libraries/io/tr_10GbE/hdllib.cfg                     | 3 ---
 libraries/io/tr_nonbonded/hdllib.cfg                 | 3 ---
 libraries/io/tr_xaui/hdllib.cfg                      | 3 ---
 25 files changed, 75 deletions(-)

diff --git a/libraries/base/common/hdllib.cfg b/libraries/base/common/hdllib.cfg
index aaeb3ebd01..6460fa6d67 100644
--- a/libraries/base/common/hdllib.cfg
+++ b/libraries/base/common/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $UNB/Firmware/modules/common/src/vhdl/common_pkg.vhd
     $UNB/Firmware/modules/common/src/vhdl/common_str_pkg.vhd
diff --git a/libraries/base/diag/hdllib.cfg b/libraries/base/diag/hdllib.cfg
index 335002e190..277e0f7785 100644
--- a/libraries/base/diag/hdllib.cfg
+++ b/libraries/base/diag/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     src/vhdl/diag_pkg.vhd
     $UNB/Firmware/modules/Lofar/diag/src/vhdl/diag_bypass.vhd
diff --git a/libraries/base/diagnostics/hdllib.cfg b/libraries/base/diagnostics/hdllib.cfg
index b71d98faf0..2f615dd7f2 100644
--- a/libraries/base/diagnostics/hdllib.cfg
+++ b/libraries/base/diagnostics/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     src/vhdl/diagnostics.vhd
     $UNB/Firmware/modules/diagnostics/src/vhdl/diagnostics_reg.vhd
diff --git a/libraries/base/dp/designs/unb1_dp_offload/hdllib.cfg b/libraries/base/dp/designs/unb1_dp_offload/hdllib.cfg
index ed80f07d12..76ba2cbee7 100644
--- a/libraries/base/dp/designs/unb1_dp_offload/hdllib.cfg
+++ b/libraries/base/dp/designs/unb1_dp_offload/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = ip_stratixiv
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_top_level_entity =                                                                                                                                                            
                                                                                                                                                                                     
 quartus_copy_files =
diff --git a/libraries/base/dp/hdllib.cfg b/libraries/base/dp/hdllib.cfg
index 9d399d9af6..b52394c2d5 100644
--- a/libraries/base/dp/hdllib.cfg
+++ b/libraries/base/dp/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     src/vhdl/dp_stream_pkg.vhd
     src/vhdl/dp_example_dut.vhd
diff --git a/libraries/base/mm/hdllib.cfg b/libraries/base/mm/hdllib.cfg
index 7ec4d76385..d7176ff265 100644
--- a/libraries/base/mm/hdllib.cfg
+++ b/libraries/base/mm/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $UNB/Firmware/modules/mm/src/vhdl/mm_fields.vhd
     $UNB/Firmware/modules/mm/tb/vhdl/mm_file_pkg.vhd
diff --git a/libraries/base/reorder/hdllib.cfg b/libraries/base/reorder/hdllib.cfg
index 58beb975ec..e431d42e08 100644
--- a/libraries/base/reorder/hdllib.cfg
+++ b/libraries/base/reorder/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim = io_ddr tech_ddr
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 modelsim_compile_ip_files =
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
 
diff --git a/libraries/base/sens/hdllib.cfg b/libraries/base/sens/hdllib.cfg
index fad7a603df..8728d2eeb8 100644
--- a/libraries/base/sens/hdllib.cfg
+++ b/libraries/base/sens/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $UNB/Firmware/modules/Lofar/sens/src/vhdl/sens_ctrl.vhd
     $UNB/Firmware/modules/Lofar/sens/src/vhdl/sens.vhd
diff --git a/libraries/base/ss/hdllib.cfg b/libraries/base/ss/hdllib.cfg
index 13ea78cce2..866c4b433f 100644
--- a/libraries/base/ss/hdllib.cfg
+++ b/libraries/base/ss/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $UNB/Firmware/modules/Lofar/ss/src/vhdl/ss_store.vhd
     $UNB/Firmware/modules/Lofar/ss/src/vhdl/ss_retrieve.vhd
diff --git a/libraries/base/tst/hdllib.cfg b/libraries/base/tst/hdllib.cfg
index 0570982ab6..174ed3fad9 100644
--- a/libraries/base/tst/hdllib.cfg
+++ b/libraries/base/tst/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $UNB/Firmware/modules/Lofar/tst/src/vhdl/tst_output.vhd
     $UNB/Firmware/modules/Lofar/tst/src/vhdl/tst_input.vhd
diff --git a/libraries/base/uth/hdllib.cfg b/libraries/base/uth/hdllib.cfg
index 6265285502..23dc7827df 100644
--- a/libraries/base/uth/hdllib.cfg
+++ b/libraries/base/uth/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $UNB/Firmware/modules/uth/src/vhdl/uth_pkg.vhd
     $UNB/Firmware/modules/uth/src/vhdl/uth_tx.vhd
diff --git a/libraries/external/easics/hdllib.cfg b/libraries/external/easics/hdllib.cfg
index 296625546b..f4c8b0a6c1 100644
--- a/libraries/external/easics/hdllib.cfg
+++ b/libraries/external/easics/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $UNB/Firmware/modules/easics/src/vhdl/PCK_CRC64_D8.vhd
     $UNB/Firmware/modules/easics/src/vhdl/PCK_CRC64_D16.vhd
diff --git a/libraries/external/numonyx_m25p128/hdllib.cfg b/libraries/external/numonyx_m25p128/hdllib.cfg
index eae83f538e..b59f84c060 100644
--- a/libraries/external/numonyx_m25p128/hdllib.cfg
+++ b/libraries/external/numonyx_m25p128/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     
 test_bench_files = 
diff --git a/libraries/io/ddr/hdllib.cfg b/libraries/io/ddr/hdllib.cfg
index f3d103744e..2a0dde8785 100644
--- a/libraries/io/ddr/hdllib.cfg
+++ b/libraries/io/ddr/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 modelsim_compile_ip_files =
     $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
     $RADIOHDL/libraries/technology/ip_arria10/ddr4_4g_1600/copy_hex_files.tcl
diff --git a/libraries/io/ddr3/hdllib.cfg b/libraries/io/ddr3/hdllib.cfg
index 85f135f0f9..dd928d2e56 100644
--- a/libraries/io/ddr3/hdllib.cfg
+++ b/libraries/io/ddr3/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology =
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 modelsim_compile_ip_files =
      $RADIOHDL/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/copy_hex_files.tcl
      #$RADIOHDL/libraries/io/ddr3/src/tcl/compile_ip.tcl
diff --git a/libraries/io/epcs/hdllib.cfg b/libraries/io/epcs/hdllib.cfg
index 7a25a1b158..172489e485 100644
--- a/libraries/io/epcs/hdllib.cfg
+++ b/libraries/io/epcs/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     src/vhdl/epcs_reg.vhd
     src/vhdl/mms_epcs.vhd
diff --git a/libraries/io/eth/hdllib.cfg b/libraries/io/eth/hdllib.cfg
index f63da4ecc7..99246411e7 100644
--- a/libraries/io/eth/hdllib.cfg
+++ b/libraries/io/eth/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     src/vhdl/eth_pkg.vhd
     $UNB/Firmware/modules/tse/src/vhdl/eth_checksum.vhd
diff --git a/libraries/io/i2c/hdllib.cfg b/libraries/io/i2c/hdllib.cfg
index 875b18fe49..d7a8949573 100644
--- a/libraries/io/i2c/hdllib.cfg
+++ b/libraries/io/i2c/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $UNB/Firmware/modules/Lofar/i2c/src/vhdl/i2c_pkg.vhd
     $UNB/Firmware/modules/Lofar/i2c/src/vhdl/i2c_bit.vhd
diff --git a/libraries/io/mac_10g/hdllib.cfg b/libraries/io/mac_10g/hdllib.cfg
index 5c3fdb71e5..7b180d825b 100644
--- a/libraries/io/mac_10g/hdllib.cfg
+++ b/libraries/io/mac_10g/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     io_mac_10g.vhd
 
diff --git a/libraries/io/mdio/hdllib.cfg b/libraries/io/mdio/hdllib.cfg
index d2651a9d8c..e5b60aab44 100644
--- a/libraries/io/mdio/hdllib.cfg
+++ b/libraries/io/mdio/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $UNB/Firmware/modules/Lofar/mdio/src/vhdl/mdio_pkg.vhd
     $UNB/Firmware/modules/Lofar/mdio/src/vhdl/mdio_mm.vhd
diff --git a/libraries/io/ppsh/hdllib.cfg b/libraries/io/ppsh/hdllib.cfg
index 72c1511f50..4da823c093 100644
--- a/libraries/io/ppsh/hdllib.cfg
+++ b/libraries/io/ppsh/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     $UNB/Firmware/modules/ppsh/src/vhdl/ppsh.vhd
     $UNB/Firmware/modules/ppsh/src/vhdl/mm_ppsh.vhd
diff --git a/libraries/io/remu/hdllib.cfg b/libraries/io/remu/hdllib.cfg
index d836a02b13..f498233824 100644
--- a/libraries/io/remu/hdllib.cfg
+++ b/libraries/io/remu/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     src/vhdl/remu_reg.vhd
     src/vhdl/mms_remu.vhd
diff --git a/libraries/io/tr_10GbE/hdllib.cfg b/libraries/io/tr_10GbE/hdllib.cfg
index 5b98241dc8..218f417e1b 100644
--- a/libraries/io/tr_10GbE/hdllib.cfg
+++ b/libraries/io/tr_10GbE/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     src/vhdl/tr_10GbE.vhd
 
diff --git a/libraries/io/tr_nonbonded/hdllib.cfg b/libraries/io/tr_nonbonded/hdllib.cfg
index 5a529edfaa..14f7d86cf3 100644
--- a/libraries/io/tr_nonbonded/hdllib.cfg
+++ b/libraries/io/tr_nonbonded/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 synth_files =
     src/vhdl/tr_nonbonded.vhd
     $UNB/Firmware/modules/tr_nonbonded/src/vhdl/tr_nonbonded_reg.vhd
diff --git a/libraries/io/tr_xaui/hdllib.cfg b/libraries/io/tr_xaui/hdllib.cfg
index 3cbbb9a327..45e0511cbc 100644
--- a/libraries/io/tr_xaui/hdllib.cfg
+++ b/libraries/io/tr_xaui/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
 
 hdl_lib_technology = 
 
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
 modelsim_search_libraries =
     altera_ver lpm_ver sgate_ver altera_mf_ver altera_lnsim_ver stratixiv_ver stratixiv_hssi_ver stratixiv_pcie_hip_ver
     altera     lpm     sgate     altera_mf     altera_lnsim     stratixiv     stratixiv_hssi     stratixiv_pcie_hip
-- 
GitLab