Cleaning up path issues.

Author: culler

Sage_base/sage/Makefile

@@ -41,7 +41,6 @@ ${STMP}/setup: notabot.cfg entitlements.plist
 	touch ${STMP}/setup
 
 ${STMP}/finish: ${STMP}/python
-	local/bin/python3 -m pip install setuptools
 	cp pkgconfig/* local/lib/pkgconfig
 	touch ${STMP}/finish
 
@@ -87,7 +86,7 @@ ${STMP}/tcltk: ${STMP}/setup
 
 ${STMP}/xz: ${STMP}/setup
 	bash xz/build_xz.sh
-	python -m notabot.sign local/lib/liblzma.dylib
+	python3 -m notabot.sign local/lib/liblzma.dylib
 	touch ${STMP}/xz
 
 ${STMP}/python: ${STMP}/xz ${STMP}/openssl ${STMP}/tcltk

Sage_framework/build_sage_framework.sh

@@ -122,15 +122,12 @@ popd
 # Fix up rpaths and shebangs 
 echo "Rewriting load paths ..."
 source ../IDs.sh
-python3 fix_paths.py repo "${VERSION_DIR}"/local/bin 2> /dev/null
-python3 fix_paths.py repo "${VERSION_DIR}"/local/lib 2> /dev/null
-python3 fix_paths.py repo "${VERSION_DIR}"/local/libexec 2> /dev/null
-python3 fix_scripts.py "${VERSION_DIR}"/local/bin
+python3 fix_paths.py repo "${VERSION_DIR}"/local 2> /dev/null
 
 # Some sagelib extension modules have bad rpaths
 ECL_SO="${SITE_PACKAGES}/sage/libs/ecl.cpython-${PY_VRSN}-darwin.so"
 macher clear_rpaths ${ECL_SO}
-macher add_rpath @loader_path/../../../../ ${ECL_SO}
+macher add_rpath @loader_path/../../../.. ${ECL_SO}
 
 BLISS_SO="${SITE_PACKAGES}/sage/graphs/bliss.cpython-${PY_VRSN}-darwin.so"
 macher add_rpath @loader_path/../../../.. $BLISS_SO
@@ -152,7 +149,7 @@ xattr -rc ${BUILD}/Sage.framework
 find ${BUILD}/Sage.framework -name '*.pyc' -delete
 
 # Fix up load paths
-python3 fix_paths.py repo/sage Frameworks/Sage.framework
+python3 fix_paths.py repo Frameworks/Sage.framework
 
 echo "Starting Sage to create byte code files ..."
 "${SAGE_SYMLINK}"/local/bin/sage -c "print(2 + 2) ; exit"

Sage_framework/fix_paths.py

@@ -201,7 +201,7 @@ def fix_files(directory):
     try:
         repo, directory = sys.argv[1], sys.argv[2]
     except IndexError:
-        print('Usage python3 fixpaths.py repo <directory>')
+        print('Usage python3 fixpaths.py <repo> <directory>')
     with open(os.path.join(repo, 'sage', 'VERSION.txt')) as input_file:
         sage_version = input_file.read().strip()
     LOCAL_LIB = LOCAL_LIB.replace('X.X', sage_version)