install setuptools ourselves

Author: timfel

graalpython/lib-python/3/distutils/command/install.py

@@ -29,8 +29,8 @@
 
 INSTALL_SCHEMES = {
     'unix_prefix': {
-        'purelib': '$base/lib/python$py_version_short/site-packages',
-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
+        'purelib': '$base/lib-python/$py_version_major/site-packages',
+        'platlib': '$platbase/lib-python/$py_version_major/site-packages',
         'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base',
@@ -291,6 +291,7 @@ def finalize_options(self):
                             'dist_version': self.distribution.get_version(),
                             'dist_fullname': self.distribution.get_fullname(),
                             'py_version': py_version,
+                            'py_version_major': '%d' % sys.version_info[0],
                             'py_version_short': '%d.%d' % sys.version_info[:2],
                             'py_version_nodot': '%d%d' % sys.version_info[:2],
                             'sys_prefix': prefix,

graalpython/lib-python/3/site-packages/.keep

@@ -1,20 +1,30 @@
 .PHONY: clean install
 
-SHELL = /bin/bash
-SITE_PATH = ../lib-python/3/site-packages
-SETUPTOOLS_VERSION = 40.4.3
 
-default: install
+SETUPTOOLS_VERSION = 40.6.3
+PYTHON_VERSION = 3.7
+
+SETUPTOOLS_DIR = setuptools-${SETUPTOOLS_VERSION}
+IN_SETUPTOOLS_DIR = cd ${SETUPTOOLS_DIR} &&
+SITE_PATH = ../lib-python/3/site-packages/
+
 
-install: ${SITE_PATH} ${SITE_PATH}/setuptools.pth
+QUIETLY$(MX_VERBOSE) = @
+OPT_QUIET$(MX_VERBOSE) = --quiet
+OPT_VERBOSE =
 
-${SITE_PATH}:
-	mkdir -p ${SITE_PATH}
+ifeq ($(MX_VERBOSE),y)
+	OPT_VERBOSE = -v
+endif
+
+
+default: install
 
-${SITE_PATH}/setuptools.pth:
-	PYTHONPATH=${SITE_PATH} python3 -m easy_install --always-copy --exclude-scripts --always-unzip --install-dir ${SITE_PATH} setuptools==${SETUPTOOLS_VERSION}
-	find ${SITE_PATH} -name "*.pyc" -exec rm "{}" ";"
-	rm -rf ${SITE_PATH}/__pycache__
+install:
+	$(QUIETLY) mx $(OPT_VERBOSE) python3 -m zipfile -e ${SETUPTOOLS_ZIP} .
+	$(QUIETLY) ${IN_SETUPTOOLS_DIR} mx $(OPT_VERBOSE) python3 bootstrap.py
+	$(QUIETLY) ${IN_SETUPTOOLS_DIR} mx $(OPT_VERBOSE) python3 setup.py $(OPT_QUIET) install
 
 clean:
-	rm -rf ${SITE_PATH}
+	$(QUIETLY) rm -rf ${SETUPTOOLS_DIR}
+	$(QUIETLY) rm -rf ${SITE_PATH}/*

graalpython/site-packages/Makefile

@@ -84,6 +84,12 @@
     #
     # --------------------------------------------------------------------------------------------------------------
     "libraries": {
+        "SETUPTOOLS": {
+            "urls": [
+                "https://github.com/pypa/setuptools/archive/v40.6.3.zip",
+            ],
+            "sha1": "7a5960b8062ddbf0c0e79f806e23785d55fec3c8",
+        }
     },
 
     # --------------------------------------------------------------------------------------------------------------
@@ -242,6 +248,14 @@
             "output": ".",
             "license": ["MIT"],
             "defaultBuild": False,
+            "buildEnv": {
+                "SETUPTOOLS_ZIP": "<path:SETUPTOOLS>",
+            },
+            "buildDependencies": [
+                "SETUPTOOLS",
+                "GRAALPYTHON-LAUNCHER",
+                "GRAALPYTHON",
+            ],
         },
     },