From 1740aaa313da77af5ab44af059d6e00242f45422 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Wed, 4 Feb 2015 19:26:27 -0800 Subject: [PATCH] A little cleanup in setup.py --- setup.py | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/setup.py b/setup.py index 988c49cf..a5c524f5 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,6 @@ import os import os.path import platform -import re import shutil import sys import tempfile @@ -23,12 +22,6 @@ LIBSASS_DIR = 'libsass' -MAKEFILE_SOURCES_LIST_RE = re.compile(r''' - (?: ^ | \n ) (?: libsass_la_ )? SOURCES [ \t]* = [ \t]* - (?P (?: (?: $ | [ \t] | \\ [\n] )+ - [^ \n\t\\]+ )+ ) -''', re.VERBOSE) - if not os.path.isfile(os.path.join(LIBSASS_DIR, 'Makefile')) and \ os.path.isdir('.git'): @@ -38,27 +31,12 @@ print(' git submodule update --init', file=sys.stderr) print(file=sys.stderr) -libsass_sources = set() -for makefilename in [ - os.path.join(LIBSASS_DIR, 'Makefile'), - os.path.join(LIBSASS_DIR, 'Makefile.am')]: - with open(makefilename) as makefile: - sources_match = MAKEFILE_SOURCES_LIST_RE.search(makefile.read()) - sources_list = sources_match.group('sources').replace('\\\n', ' ') - libsass_sources.update(sources_list.split()) -libsass_sources = set( - x for x in libsass_sources if not x.endswith('.hpp') and not x.endswith('.h') -) - -libsass_headers = [ - os.path.join(LIBSASS_DIR, 'sass_interface.h'), - os.path.join(LIBSASS_DIR, 'sass.h'), - os.path.join(LIBSASS_DIR, 'win32', 'unistd.h'), -] -libsass_headers.extend(glob.glob('*.hpp')) -include_dirs = ['b64', 'utf8'] -sources = ['pysass.cpp'] -sources.extend([os.path.join(LIBSASS_DIR, s) for s in libsass_sources]) +libsass_files = os.listdir(LIBSASS_DIR) +libsass_sources = [f for f in libsass_files if f.endswith(('.c', '.cpp'))] +libsass_headers = [f for f in libsass_files if f.endswith(('.h', '.hpp'))] +headers = [os.path.join(LIBSASS_DIR, f) for f in libsass_headers] +sources = [os.path.join(LIBSASS_DIR, f) for f in libsass_sources] +sources.append('pysass.cpp') if sys.platform == 'win32': from distutils.msvc9compiler import get_build_version pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy