From 73e68fe323408e7ca953bf6e57ff23387696bc3c Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sun, 27 Oct 2013 09:33:26 +0100 Subject: [PATCH] Added API and Makefile rules for share/ files --- .gitignore | 1 + Makefile | 3 +++ kernel/driver.cc | 21 +++++++++++++++++++++ kernel/register.h | 1 + 4 files changed, 26 insertions(+) diff --git a/.gitignore b/.gitignore index 72c0f2f62..f251d2b6d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /yosys-filterlib /yosys-svgviewer /kernel/version_*.cc +/share diff --git a/Makefile b/Makefile index 1af48d4e0..312225ef1 100644 --- a/Makefile +++ b/Makefile @@ -106,6 +106,8 @@ test: yosys install: $(TARGETS) install $(TARGETS) /usr/local/bin/ + mkdir -p /usr/local/share/yosys + cp -r share/. /usr/local/share/yosys/. install-abc: install yosys-abc /usr/local/bin/ @@ -114,6 +116,7 @@ manual: cd manual && bash make.sh clean: + rm -rf share rm -f $(OBJS) $(GENFILES) $(TARGETS) rm -f kernel/version_*.o kernel/version_*.cc rm -f libs/*/*.d frontends/*/*.d passes/*/*.d backends/*/*.d kernel/*.d diff --git a/kernel/driver.cc b/kernel/driver.cc index 8d8f29e77..d726639c4 100644 --- a/kernel/driver.cc +++ b/kernel/driver.cc @@ -421,6 +421,27 @@ std::string rewrite_yosys_exe(std::string exe) return exe; } +std::string get_share_file_name(std::string file) +{ + char buffer[1024]; + ssize_t buflen = readlink("/proc/self/exe", buffer, sizeof(buffer)-1); + + if (buflen < 0) + log_error("Can't find file `%s': reading of /proc/self/exe failed!\n", file.c_str()); + + buffer[buflen] = 0; + + std::string newfile_inplace = stringf("%s/share/%s", dirname(buffer), file.c_str()); + if (access(newfile_inplace.c_str(), F_OK) == 0) + return newfile_inplace; + + std::string newfile_system = stringf("%s/../share/yosys/%s", dirname(buffer), file.c_str()); + if (access(newfile_system.c_str(), F_OK) == 0) + return newfile_system; + + log_error("Can't find file `%s': no `%s' and no `%s' found!\n", file.c_str(), newfile_inplace.c_str(), newfile_system.c_str()); +} + int main(int argc, char **argv) { std::string frontend_command = "auto"; diff --git a/kernel/register.h b/kernel/register.h index 5983211d1..f66cbfd30 100644 --- a/kernel/register.h +++ b/kernel/register.h @@ -34,6 +34,7 @@ extern Tcl_Interp *yosys_get_tcl_interp(); // implemented in driver.cc extern RTLIL::Design *yosys_get_design(); std::string rewrite_yosys_exe(std::string exe); +std::string get_share_file_name(std::string file); struct Pass { -- 2.30.2