From 3b1356a9c5601213ea80fbc79c2d91e4bb244e3a Mon Sep 17 00:00:00 2001
From: Ole Richter <o.j.richter@rug.nl>
Date: Tue, 1 Nov 2022 16:53:05 +0100
Subject: [PATCH] install act file and import via global import

---
 act/Makefile                                             | 9 ++++++---
 act/test_bench_lib.act                                   | 2 +-
 test/examples/helloworld/.actsim_history                 | 2 --
 test/{examples => }/helloworld/README.md                 | 0
 test/{examples => }/helloworld/check_0.csv               | 0
 test/{examples => }/helloworld/control.csv               | 0
 test/{examples => }/helloworld/source_0.csv              | 0
 .../helloworld/helloworld.act => helloworld/test.act}    | 4 ++--
 8 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 test/examples/helloworld/.actsim_history
 rename test/{examples => }/helloworld/README.md (100%)
 rename test/{examples => }/helloworld/check_0.csv (100%)
 rename test/{examples => }/helloworld/control.csv (100%)
 rename test/{examples => }/helloworld/source_0.csv (100%)
 rename test/{examples/helloworld/helloworld.act => helloworld/test.act} (95%)

diff --git a/act/Makefile b/act/Makefile
index c4ef5c9..6e455e4 100644
--- a/act/Makefile
+++ b/act/Makefile
@@ -1,6 +1,7 @@
-#-------------------------------------------------------------------------
+#************************************************************************
 #
 #  Copyright (c) 2018 Rajit Manohar
+#  Copyright 2022 Ole Richter - University of Groningen
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License
@@ -17,14 +18,16 @@
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #  Boston, MA  02110-1301, USA.
 #
-#-------------------------------------------------------------------------
+#*************************************************************************
+
 
 TARGETLIBS=actsim_test_bench_lib.so
 TARGETCONF=actsim_test_bench_lib.conf
+TARGETACT=test_bench_lib.act
+TARGETACTSUBDIR=sim
 
 SHOBJS=test_bench_lib.os
 
-
 SRCS= $(SHOBJS:.os=.c)
 
 include $(ACT_HOME)/scripts/Makefile.std
diff --git a/act/test_bench_lib.act b/act/test_bench_lib.act
index ff6c9d9..8e28174 100644
--- a/act/test_bench_lib.act
+++ b/act/test_bench_lib.act
@@ -25,7 +25,7 @@
 
 
 namespace sim{
-  namespace testbench {
+  namespace test_bench_lib {
 
 function finit (int verbose) : int;
 function fsource_next(int id; int sim_step) : int;
diff --git a/test/examples/helloworld/.actsim_history b/test/examples/helloworld/.actsim_history
deleted file mode 100644
index 2bb451d..0000000
--- a/test/examples/helloworld/.actsim_history
+++ /dev/null
@@ -1,2 +0,0 @@
-_HiStOrY_V2_
-cycle\012
diff --git a/test/examples/helloworld/README.md b/test/helloworld/README.md
similarity index 100%
rename from test/examples/helloworld/README.md
rename to test/helloworld/README.md
diff --git a/test/examples/helloworld/check_0.csv b/test/helloworld/check_0.csv
similarity index 100%
rename from test/examples/helloworld/check_0.csv
rename to test/helloworld/check_0.csv
diff --git a/test/examples/helloworld/control.csv b/test/helloworld/control.csv
similarity index 100%
rename from test/examples/helloworld/control.csv
rename to test/helloworld/control.csv
diff --git a/test/examples/helloworld/source_0.csv b/test/helloworld/source_0.csv
similarity index 100%
rename from test/examples/helloworld/source_0.csv
rename to test/helloworld/source_0.csv
diff --git a/test/examples/helloworld/helloworld.act b/test/helloworld/test.act
similarity index 95%
rename from test/examples/helloworld/helloworld.act
rename to test/helloworld/test.act
index 4c07792..f8972f4 100644
--- a/test/examples/helloworld/helloworld.act
+++ b/test/helloworld/test.act
@@ -23,9 +23,9 @@
  **************************************************************************
  */
 
-import "../../../act/test_bench_lib.act";
+import sim::test_bench_lib;
 import globals;
-open sim::testbench;
+open sim::test_bench_lib;
 
 defproc test(){
 	chan(int<5>) channel;