citrun

commit 0f7d354faf121060f279bada15ebcd6ccc8a70e0
parent 49a12988c5859a561aef97b35e905baaba538709
Author: Kyle Milz <kyle@windows.krwm.net>
Date:   Sat,  7 Jan 2017 01:22:40 -0800

inst: use runtime configuration for library and compiler paths

Diffstat:
M
Jamfile
 | 
3
---
M
configure.bat
 | 
2
--
M
inst_frontend.cc
 | 
32
+++++++++++++++++++++++---------

3 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/Jamfile b/Jamfile
@@ -113,9 +113,6 @@ INST_SRCS =
 Stringize lib_h.h : lib.h ;
 
 ObjectC++Flags $(INST_SRCS) : $(INST_CFLAGS) ;
-ObjectDefines $(INST_SRCS) :
-	CITRUN_COMPILERS=$(CITRUN_COMPILERS)
-	CITRUN_LIB=$(CITRUN_LIB) ;
 
 LINKFLAGS on citrun_inst$(SUFEXE) = $(LINKFLAGS) $(INST_LDFLAGS) ;
 LINKLIBS on citrun_inst$(SUFEXE) += $(INST_LIBS) ;
diff --git a/configure.bat b/configure.bat
@@ -57,8 +57,6 @@ DEL Jamrules 2>nul
 >> Jamrules ECHO.
 
 >> Jamrules ECHO FONT_PATH = "C:\Windows\Fonts\consola.ttf" ;
->> Jamrules ECHO CITRUN_COMPILERS = %CD:\=/%/compilers ;
->> Jamrules ECHO CITRUN_LIB = %CD:\=/%/libcitrun.lib ;
 >> Jamrules ECHO.
 
 REM GL_CFLAGS = `pkg-config --cflags glfw3 glew freetype2` ;
diff --git a/inst_frontend.cc b/inst_frontend.cc
@@ -71,7 +71,19 @@ InstFrontend::InstFrontend(int argc, char *argv[], bool is_citrun_inst) :
 {
 	log_identity();
 
-	m_log << "CITRUN_COMPILERS = '" << xstr(CITRUN_COMPILERS) << "'" << std::endl;
+	const char *citrun_path = std::getenv("CITRUN_PATH");
+
+	m_compilers_path = citrun_path ? citrun_path : "" ;
+	m_compilers_path.append("compilers");
+
+	m_lib_path = citrun_path ? citrun_path : "" ;
+#ifdef _WIN32
+	m_lib_path.append("libcitrun.lib");
+#else
+	m_lib_path_append("libcitrun.a");
+#endif // _WIN32
+
+	m_log << "CITRUN_COMPILERS = '" << m_compilers_path << "'" << std::endl;
 
 #ifndef _WIN32
 	// Sometimes we're not called as citrun_inst so force that here.
@@ -101,7 +113,7 @@ InstFrontend::log_identity()
 }
 
 //
-// Tries to remove CITRUN_COMPILERS from PATH otherwise it exits easily.
+// Tries to remove m_compilers_path from PATH otherwise it exits easily.
 //
 void
 InstFrontend::clean_PATH()
@@ -109,13 +121,14 @@ InstFrontend::clean_PATH()
 	char *path;
 
 	if ((path = std::getenv("PATH")) == NULL) {
-		m_log << "Error: PATH is not set." << std::endl;
+		std::cerr << "Error: PATH is not set." << std::endl;
+		m_log <<     "Error: PATH is not set." << std::endl;
 		exit(1);
 	}
 
 	m_log << "PATH='" << path << "'" << std::endl;
 
-	// Filter CITRUN_COMPILERS out of PATH
+	// Filter m_compilers_path out of PATH
 	std::stringstream path_ss(path);
 	std::ostringstream new_path;
 	std::string component;
@@ -123,7 +136,7 @@ InstFrontend::clean_PATH()
 	bool found_citrun_path = 0;
 
 	while (std::getline(path_ss, component, PATH_SEP)) {
-		if (component.compare(xstr(CITRUN_COMPILERS)) == 0) {
+		if (component == m_compilers_path) {
 			found_citrun_path = 1;
 			continue;
 		}
@@ -131,13 +144,14 @@ InstFrontend::clean_PATH()
 		if (first_component == 0)
 			new_path << PATH_SEP;
 
-		// It wasn't CITRUN_COMPILERS, keep it
+		// It wasn't m_compilers_path, keep it
 		new_path << component;
 		first_component = 0;
 	}
 
 	if (!found_citrun_path) {
-		m_log << "Error: CITRUN_COMPILERS not in PATH." << std::endl;
+		std::cerr << "Error: " << m_compilers_path << " not in PATH." << std::endl;
+		m_log <<     "Error: " << m_compilers_path << " not in PATH." << std::endl;
 		exit(1);
 	}
 
@@ -254,9 +268,9 @@ InstFrontend::if_link_add_runtime(bool object_arg, bool compile_arg)
 		return;
 #endif // _WIN32
 
-	m_log << "Link detected, adding '"<< xstr(CITRUN_LIB)
+	m_log << "Link detected, adding '"<< m_lib_path
 		<< "' to command line." << std::endl;
-	m_args.push_back(const_cast<char *>(xstr(CITRUN_LIB)));
+	m_args.push_back(const_cast<char *>(m_lib_path.c_str()));
 }
 
 //