diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 23:17:45 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 23:17:45 +0000 |
| commit | 3cc47e816234d732f9dca9f35f4071ccf17cccf5 (patch) | |
| tree | e004ac0d7d4c4503163b154d7d1453d08f8b305c /native_client_sdk | |
| parent | fc0ed30a2eab16e76206c4969c357f536824e1eb (diff) | |
| download | chromium_src-3cc47e816234d732f9dca9f35f4071ccf17cccf5.zip chromium_src-3cc47e816234d732f9dca9f35f4071ccf17cccf5.tar.gz chromium_src-3cc47e816234d732f9dca9f35f4071ccf17cccf5.tar.bz2 | |
Turning off use of manifests.
Should fall back on archiving hard links as files.
This should be ok as they are currently small shims.
BUG=None
TEST=None
R=noelallen@google.com
TBR
Review URL: http://codereview.chromium.org/8733006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112062 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/generate_windows_installer.py | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/native_client_sdk/src/build_tools/generate_windows_installer.py b/native_client_sdk/src/build_tools/generate_windows_installer.py index cf6db7d..3a019e0 100755 --- a/native_client_sdk/src/build_tools/generate_windows_installer.py +++ b/native_client_sdk/src/build_tools/generate_windows_installer.py @@ -119,40 +119,13 @@ def main(argv): UpdatePermissions(dirs) UpdatePermissions(files) - # Grab the toolchain manifest files and massage them so their paths are - # corrected for the actual toolchain layout in the SDK. The newlib toolchain - # manifest has these changes made: - # 1. Transform path components 'sdk/nacl-sdk' to 'toolchain/win_x86_newlib' - # 2. Remove the spurious 'sdk' directory entry. - # The glibc manifests can be used unmolested. - bot.BuildStep('generate toolchain manifests') - def TransformNewlibPath(npath): - return os.path.normpath(npath.replace('sdk/nacl-sdk', - 'toolchain/win_x86_newlib')) - newlib_manifest = tar_archive.TarArchive() - newlib_manifest.path_filter = TransformNewlibPath - newlib_manifest_path = os.path.join( - home_dir, - 'src', - installer_contents.GetToolchainManifest('newlib')) - newlib_manifest.InitWithManifest(newlib_manifest_path) - newlib_manifest.dirs.discard('sdk') - - glibc_manifest_path = os.path.join( - home_dir, - 'src', - installer_contents.GetToolchainManifest('glibc')) - glibc_manifest = tar_archive.TarArchive() - glibc_manifest.InitWithManifest(glibc_manifest_path) - - # Merge the newlib and glibc manifests and send them to the script generator. bot.BuildStep('create Windows installer') bot.Print('generate_windows_installer is creating the windows installer.') build_tools_dir = os.path.join(home_dir, 'src', 'build_tools') make_nsis_installer.MakeNsisInstaller( installer_dir, cwd=build_tools_dir, - toolchain_manifests=newlib_manifest | glibc_manifest) + toolchain_manifests=None) bot.Print("Installer created!") # Clean up. |