citrun

commit 6d74d62b006b8de64d8bfa9140745fb8c817e869
parent d4c47f2b1adb876a58d1a1b47721437193c8906b
Author: Kyle Milz <kyle@0x30.net>
Date:   Sun,  8 Jan 2017 14:46:40 -0700

wrap: use current script directory for CITRUN_PATH.

Diffstat:
M
Jamfile
 | 
17
++---------------
M
configure
 | 
13
-------------
M
wrap.sh
 | 
4
+++-

3 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/Jamfile b/Jamfile
@@ -38,20 +38,7 @@ if ! $(NT) {
 Library libcitrun : lib.c ;
 
 #
-# citrun_check
-#
-if ! $(NT) {
-	Shell citrun_check : check.sh ;
-}
-
-actions ReplaceToken
-{
-	perl -p -i.bak -e "s,_CITRUN_COMPILERS_,$(CITRUN_COMPILERS)," $(<)
-	$(RM) $(<).bak
-}
-
-#
-# citrun_wrap
+# citrun_wrap, citrun_check
 #
 if $(NT) {
 	File citrun_wrap.bat : wrap.bat ;
@@ -59,7 +46,7 @@ if $(NT) {
 }
 else {
 	Shell citrun_wrap : wrap.sh ;
-	ReplaceToken citrun_wrap ;
+	Shell citrun_check : check.sh ;
 }
 
 #
diff --git a/configure b/configure
@@ -60,17 +60,6 @@ fi
 echo
 
 #
-# citrun_inst needs to know the absolute installation path.
-#
-if [ -z ${PREFIX-} ]; then
-	CITRUN_COMPILERS="`pwd`/compilers"
-	CITRUN_LIB="`pwd`/libcitrun.a"
-else
-	CITRUN_COMPILERS="${PREFIX}/share/citrun"
-	CITRUN_LIB="${PREFIX}/share/citrun/libcitrun.a"
-fi
-
-#
 # Write top of Jamrules. Any errors inside backticks get ignored.
 #
 cat <<EOF > Jamrules
@@ -82,8 +71,6 @@ C++FLAGS += -std=c++11 -fno-exceptions -fno-rtti ${CFLAGS-} ;
 LINKFLAGS += ${LDFLAGS-} ;
 
 FONT_PATH = "${FONT_PATH}" ;
-CITRUN_COMPILERS = ${CITRUN_COMPILERS} ;
-CITRUN_LIB = ${CITRUN_LIB} ;
 
 GL_CFLAGS = `pkg-config --cflags glfw3 glew freetype2` ;
 GL_LIBS = ${GL_EXTRALIB-} `pkg-config --libs glfw3 glew freetype2` ;
diff --git a/wrap.sh b/wrap.sh
@@ -1,3 +1,5 @@
 
-export PATH="_CITRUN_COMPILERS_:$PATH"
+dirname=`dirname $0`
+export CITRUN_PATH="`cd $dirname && pwd`/"
+export PATH="${CITRUN_PATH}compilers:$PATH"
 exec $@