Commits

Volker Braun committed 3985dbc

fixed installation for testing

Comments (0)

Files changed (8)

 doc/html
 doc/text
 doc/pdf
+compilerwrapper-*
 spkg/compilerwrapper-*.spkg
 test/*pyc
 test/local

spkg/make_spkg.sh

     exit 1
 fi
 
+cd "$TOPDIR"
+make dist
 
 cd "$TOPDIR/spkg"
 rm -rf "compilerwrapper-$VERSION"
 mv "compilerwrapper-$VERSION" src
 echo 'src' > .hgignore
 hg init
+hg add .
 hg commit -m "Updated to compilerwrapper-$VERSION"
 
 cd "$TOPDIR/spkg"

spkg/template/spkg-install

 CC_PATH=`dirname "$CC_FILENAME"`
 
 LD_FILENAME=`src/scripts/find_executable.sh --LD --exclude="$SAGE_LOCAL/bin"`
-LD_PATH=`dirname "$LD_FILENAME"`
+GFORTRAN_FILENAME=`src/scripts/find_executable.sh --exclude="$SAGE_LOCAL/bin" gfortran`
 
 echo "Setting up the compiler/binutils wrapper"
 echo "Real location of compiler: $CC_PATH" 
-echo "Real location of binutils: $LD_PATH" 
+echo "Real linker: $LD_FILENAME" 
+echo "Real fortran: $GFORTRAN_FILENAME" 
 
 cd src
 ./configure --prefix="$SAGE_LOCAL" \
             --with-ccpath="$CC_PATH" \
-            --with-ldpath="$LD_PATH" \
+            --with-ld="$LD_FILENAME" \
+            --with-gfortran="$GFORTRAN_FILENAME" \
             --enable-sage
 if [ $? -ne 0 ]; then
   echo "Error configuring the compiler wrapper."
 
 #ifdef WITH_SAGE
   const string SAGE_OLD_LD_LIBRARY_PATH = 
-    string(SAGE_OLD_) + LD_LIBRARY_PATH;
+    string("SAGE_OLD_") + LD_LIBRARY_PATH;
   if (new_path == NULL)
     new_path = getenv(SAGE_OLD_LD_LIBRARY_PATH.c_str());
 #endif
 
-
+# Attention: for now, only one test allowed!
+# Multiple concurrent tests need their own local/ directory
 TESTS = rpath.py
+
 TEST_EXTENSIONS = .py
 
+EXTRA_DIST = \
+	install_test_wrapper.sh test_executable.sh \
+	rpath.py support.py 
+
 
-all-local:
-	./install_test_wrapper.sh
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+
+# Attention: for now, only one test allowed!
+# Multiple concurrent tests need their own local/ directory
 TESTS = rpath.py
 TEST_EXTENSIONS = .py
+EXTRA_DIST = \
+	install_test_wrapper.sh test_executable.sh \
+	rpath.py support.py 
+
 all: all-am
 
 .SUFFIXES:
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-all-am: Makefile all-local
+all-am: Makefile
 installdirs:
 install: install-am
 install-exec: install-exec-am
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: all all-am all-local check check-TESTS check-am clean \
-	clean-generic distclean distclean-generic distdir dvi dvi-am \
-	html html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am
-
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am html html-am \
+	info info-am install install-am install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+	uninstall-am
 
-all-local:
-	./install_test_wrapper.sh
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 """
 
 import os, sys
-from subprocess import Popen, PIPE
+from subprocess import Popen, PIPE, check_output
+
+
+print check_output('./install_test_wrapper.sh')
+
 
 class WrappedExecutable(object):