diff options
author | David Walter Seikel | 2013-04-24 13:04:14 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-04-24 13:04:14 +1000 |
commit | 85444c4aff8cc51da35468df62aa70ed87339622 (patch) | |
tree | 4a42742dcbd8d0a60baf099a7a7ec4f3330dd6ce /linden | |
parent | Fix http://redmine.kokuaviewer.org/issues/1139 and provide better protection ... (diff) | |
download | meta-impy-85444c4aff8cc51da35468df62aa70ed87339622.zip meta-impy-85444c4aff8cc51da35468df62aa70ed87339622.tar.gz meta-impy-85444c4aff8cc51da35468df62aa70ed87339622.tar.bz2 meta-impy-85444c4aff8cc51da35468df62aa70ed87339622.tar.xz |
Add compatibility with autobuild pre built libraries.
Now Imprudence can share them with Kokua.
Diffstat (limited to 'linden')
-rwxr-xr-x | linden/scripts/install.py | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/linden/scripts/install.py b/linden/scripts/install.py index 99e8b73..b39dd5a 100755 --- a/linden/scripts/install.py +++ b/linden/scripts/install.py | |||
@@ -565,6 +565,7 @@ windows/i686/vs/2003 -- specify a windows visual studio 2003 package""" | |||
565 | tar.extractall(path=install_dir) | 565 | tar.extractall(path=install_dir) |
566 | except AttributeError: | 566 | except AttributeError: |
567 | _extractall(tar, path=install_dir) | 567 | _extractall(tar, path=install_dir) |
568 | |||
568 | symlinks = [] | 569 | symlinks = [] |
569 | if _get_platform() == 'linux' or _get_platform() == 'linux64': | 570 | if _get_platform() == 'linux' or _get_platform() == 'linux64': |
570 | first = 1 | 571 | first = 1 |
@@ -591,6 +592,43 @@ windows/i686/vs/2003 -- specify a windows visual studio 2003 package""" | |||
591 | os.symlink(target, link_name) | 592 | os.symlink(target, link_name) |
592 | symlinks += [LINK] | 593 | symlinks += [LINK] |
593 | print " %s --> %s" % (LINK, target) | 594 | print " %s --> %s" % (LINK, target) |
595 | |||
596 | # Reroute autobuilds | ||
597 | auto_name = install_dir + "/include" | ||
598 | if os.path.exists(auto_name): | ||
599 | print "Moving autobuilt include files to legacy locations." | ||
600 | for entry in os.listdir(auto_name): | ||
601 | os.rename(auto_name + "/" + entry, install_dir + "/libraries/include/" + entry) | ||
602 | os.rmdir(auto_name) | ||
603 | |||
604 | auto_name = install_dir + "/lib" | ||
605 | dest_name = '' | ||
606 | if _get_platform() == 'darwin': | ||
607 | dest_name = 'universal-darwin/' | ||
608 | if _get_platform() == 'linux64': | ||
609 | dest_name = 'x86_64-linux/' | ||
610 | if _get_platform() == 'linux': | ||
611 | dest_name = 'i686-linux/' | ||
612 | if _get_platform() == 'windows': | ||
613 | dest_name = 'i686-win32/' | ||
614 | if os.path.exists(auto_name): | ||
615 | print "Moving autobuilt lib files to legacy locations." | ||
616 | for entry in os.listdir(auto_name): | ||
617 | if os.path.isdir(auto_name + "/" + entry): | ||
618 | path = install_dir + "/libraries/" + dest_name + "lib_" + entry | ||
619 | if entry == 'release': | ||
620 | # Linux is special, coz it's got server code. | ||
621 | if _get_platform() == 'linux' or _get_platform() == 'linux64': | ||
622 | path = install_dir + "/libraries/" + dest_name + "lib_" + entry + "_client" | ||
623 | if not os.path.exists(path): | ||
624 | os.makedirs(path) | ||
625 | for filename in os.listdir(auto_name + "/" + entry): | ||
626 | os.rename(auto_name + "/" + entry + "/" + filename, path + "/" + filename) | ||
627 | os.rmdir(auto_name + "/" + entry) | ||
628 | else: | ||
629 | os.rename(auto_name + "/" + entry, install_dir + "/libraries/" + dest_name + "lib/" + entry) | ||
630 | os.rmdir(auto_name) | ||
631 | |||
594 | if ifile.pkgname in self._installed: | 632 | if ifile.pkgname in self._installed: |
595 | self._installed[ifile.pkgname].add_files( | 633 | self._installed[ifile.pkgname].add_files( |
596 | ifile.url, | 634 | ifile.url, |