diff options
| author | Max Kellermann <max@duempel.org> | 2015-11-23 10:38:48 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2015-11-23 10:38:48 +0100 |
| commit | 21439108ed48776a97c74c2f4666ee2577263d04 (patch) | |
| tree | 4d20006250d3c7e46a00815dc4ec35823530f52f | |
| parent | 754b30a7a6ea9d0200e36c9b66819d9c1d40b05e (diff) | |
| download | mpd-21439108ed48776a97c74c2f4666ee2577263d04.tar.gz mpd-21439108ed48776a97c74c2f4666ee2577263d04.tar.xz mpd-21439108ed48776a97c74c2f4666ee2577263d04.zip | |
{android,win32}/build.py: move code to python/build/dirs.py
| -rwxr-xr-x | android/build.py | 8 | ||||
| -rw-r--r-- | python/build/dirs.py | 9 | ||||
| -rwxr-xr-x | win32/build.py | 8 |
3 files changed, 11 insertions, 14 deletions
diff --git a/android/build.py b/android/build.py index 4ff9ec71e..56ef1f790 100755 --- a/android/build.py +++ b/android/build.py @@ -27,13 +27,7 @@ mpd_path = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]) or '.', '.. sys.path[0] = os.path.join(mpd_path, 'python') # output directories -lib_path = os.path.abspath('lib') - -shared_path = lib_path -if 'MPD_SHARED_LIB' in os.environ: - shared_path = os.environ['MPD_SHARED_LIB'] -tarball_path = os.path.join(shared_path, 'download') -src_path = os.path.join(shared_path, 'src') +from build.dirs import lib_path, tarball_path, src_path arch_path = os.path.join(lib_path, arch) build_path = os.path.join(arch_path, 'build') diff --git a/python/build/dirs.py b/python/build/dirs.py new file mode 100644 index 000000000..bdbf2b18c --- /dev/null +++ b/python/build/dirs.py @@ -0,0 +1,9 @@ +import os.path + +lib_path = os.path.abspath('lib') + +shared_path = lib_path +if 'MPD_SHARED_LIB' in os.environ: + shared_path = os.environ['MPD_SHARED_LIB'] +tarball_path = os.path.join(shared_path, 'download') +src_path = os.path.join(shared_path, 'src') diff --git a/win32/build.py b/win32/build.py index 05095d86f..a4fc411a8 100755 --- a/win32/build.py +++ b/win32/build.py @@ -16,13 +16,7 @@ mpd_path = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]) or '.', '.. sys.path[0] = os.path.join(mpd_path, 'python') # output directories -lib_path = os.path.abspath('lib') - -shared_path = lib_path -if 'MPD_SHARED_LIB' in os.environ: - shared_path = os.environ['MPD_SHARED_LIB'] -tarball_path = os.path.join(shared_path, 'download') -src_path = os.path.join(shared_path, 'src') +from build.dirs import lib_path, tarball_path, src_path arch_path = os.path.join(lib_path, host_arch) build_path = os.path.join(arch_path, 'build') |