From 66bcc876a7b52dac5e3c5f48f9107bf98512830c Mon Sep 17 00:00:00 2001
From: Stefan Schippers <schippes@miniguru.lan>
Date: Tue, 13 Sep 2022 18:53:17 +0200
Subject: [PATCH] look for inutile stimuli files in schematic directory instead
 of in simulation directory

---
 src/xschem.tcl                           |  4 ++--
 xschem_library/examples/loading.sch      | 13 +++++++------
 xschem_library/examples/pump.sch         |  7 ++++---
 xschem_library/examples/real_capa.sch    |  7 ++++---
 xschem_library/examples/switch_rreal.sch | 16 ++++++++++------
 5 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/xschem.tcl b/src/xschem.tcl
index bd7ba5a2..2fcabda1 100644
--- a/src/xschem.tcl
+++ b/src/xschem.tcl
@@ -5335,11 +5335,11 @@ proc build_widgets { {topwin {} } } {
   $topwin.menubar.simulation.menu add command -label {Configure simulators and tools} -command {simconf}
   $topwin.menubar.simulation.menu add command -label {Utile Stimuli Editor (GUI)} -command {
      simuldir
-     inutile stimuli.[file rootname [file tail [xschem get schname]]]
+     inutile [xschem get current_dirname]/stimuli.[file rootname [file tail [xschem get schname]]]
   }
   $topwin.menubar.simulation.menu add command -label {Utile Stimuli Translate} -command {
      simuldir
-     inutile_translate  stimuli.[file rootname [file tail [xschem get schname]]]
+     inutile_translate  [xschem get current_dirname]/stimuli.[file rootname [file tail [xschem get schname]]]
   }
   $topwin.menubar.simulation.menu add command -label {Shell [simulation path]} -command {
      if { [select_netlist_dir 0] ne "" } {
diff --git a/xschem_library/examples/loading.sch b/xschem_library/examples/loading.sch
index c558e90e..776fd3b1 100644
--- a/xschem_library/examples/loading.sch
+++ b/xschem_library/examples/loading.sch
@@ -1,4 +1,5 @@
-v {xschem version=3.0.0 file_version=1.2 }
+v {xschem version=3.1.0 file_version=1.2
+}
 G {}
 K {}
 V {// test}
@@ -119,7 +120,7 @@ use std.TEXTIO.all;
 use ieee.std_logic_1164.all;
 
 library work;
-use work.rrreal.all;
+use work.rrreal_pkg.all;
 
 }
 C {pump.sym} 250 -680 0 0 {name=x4 conduct="1.0/20000.0" val=4.5}
@@ -145,7 +146,7 @@ C {package_not_shown.sym} 830 -340 0 0 {
     library ieee, std;
     use std.textio.all;
  
-    package rrreal is
+    package rrreal_pkg is
 
 
 
@@ -184,10 +185,10 @@ C {package_not_shown.sym} 830 -340 0 0 {
         constant del: IN time
     );
 
-    end rrreal; -- end package declaration
+    end rrreal_pkg; -- end package declaration
  
  
-    package body rrreal is
+    package body rrreal_pkg is
 
 procedure print(s : in string) is
 variable outbuf: line;
@@ -351,7 +352,7 @@ end procedure;
     end glitch;
 
 
-    end rrreal; -- end package body
+    end rrreal_pkg; -- end package body
 }
 C {title.sym} 160 -40 0 0 {name=l9 author="Stefan Schippers"}
 C {arch_declarations.sym} 830 -280 0 0 {
diff --git a/xschem_library/examples/pump.sch b/xschem_library/examples/pump.sch
index c7f69a0a..d4f4df5e 100644
--- a/xschem_library/examples/pump.sch
+++ b/xschem_library/examples/pump.sch
@@ -1,4 +1,5 @@
-v {xschem version=2.9.5_RC5 file_version=1.1}
+v {xschem version=3.1.0 file_version=1.2
+}
 G {
 
 process 
@@ -33,6 +34,7 @@ end process;
 
 
 }
+K {}
 V {}
 S {}
 E {}
@@ -41,9 +43,8 @@ C {ipin.sym} -80 -90 0 0 {name=p2 lab=ING}
 C {use.sym} -150 -260 0 0 {library ieee;
 use std.TEXTIO.all;
 use ieee.std_logic_1164.all;
-use work.rrreal.all;
 
 library work;
-use work.rrreal.all;
+use work.rrreal_pkg.all;
 
 }
diff --git a/xschem_library/examples/real_capa.sch b/xschem_library/examples/real_capa.sch
index 46125c31..edb500aa 100644
--- a/xschem_library/examples/real_capa.sch
+++ b/xschem_library/examples/real_capa.sch
@@ -1,4 +1,5 @@
-v {xschem version=2.9.5_RC5 file_version=1.1}
+v {xschem version=3.1.0 file_version=1.2
+}
 G {
 
 process
@@ -30,6 +31,7 @@ begin
    end if;
 end process;
 }
+K {}
 V {}
 S {}
 E {}
@@ -37,9 +39,8 @@ C {iopin.sym} 50 -80 0 0 {name=p1 lab=USC sig_type=rreal}
 C {use.sym} -120 -340 0 0 {library ieee;
 use std.TEXTIO.all;
 use ieee.std_logic_1164.all;
-use work.rrreal.all;
 
 library work;
-use work.rrreal.all;
+use work.rrreal_pkg.all;
 
 }
diff --git a/xschem_library/examples/switch_rreal.sch b/xschem_library/examples/switch_rreal.sch
index cc6b4197..fbd54e77 100644
--- a/xschem_library/examples/switch_rreal.sch
+++ b/xschem_library/examples/switch_rreal.sch
@@ -1,4 +1,5 @@
-v {xschem version=2.9.7 file_version=1.2}
+v {xschem version=3.1.0 file_version=1.2
+}
 G {
 
 -- process
@@ -96,11 +97,6 @@ L 4 -150 -10 -110 -10 {}
 L 4 -150 10 -110 10 {}
 T {@symname} -49.5 -6 0 0 0.3 0.3 {}
 T {@name} 65 -32 0 0 0.2 0.2 {}
-C {use.sym} 120 -280 0 0 {    library ieee,work;
-    use ieee.std_logic_1164.all;
-    use work.rrreal.all;
-    use std.textio.all;
-}
 C {ipin.sym} -150 10 0 0 {name=p3 lab=ENAB}
 C {iopin.sym} -150 -10 0 1 {name=p2 lab=A sig_type=rreal}
 C {arch_declarations.sym} 140 -160 0 0 {
@@ -116,3 +112,11 @@ begin
 end print2;
 }
 C {iopin.sym} 150 -10 0 0 {name=p1 lab=B sig_type=rreal}
+C {use.sym} -130 -260 0 0 {library ieee;
+use std.TEXTIO.all;
+use ieee.std_logic_1164.all;
+
+library work;
+use work.rrreal_pkg.all;
+
+}