Show More
@@ -103,6 +103,12 b' def make_exe(dist):' | |||||
103 | exe.add_python_resources( |
|
103 | exe.add_python_resources( | |
104 | exe.pip_install(["-r", ROOT + "/contrib/packaging/requirements-windows-py3.txt"]), |
|
104 | exe.pip_install(["-r", ROOT + "/contrib/packaging/requirements-windows-py3.txt"]), | |
105 | ) |
|
105 | ) | |
|
106 | extra_packages = VARS.get("extra_py_packages", "") | |||
|
107 | if extra_packages: | |||
|
108 | for extra in extra_packages.split(","): | |||
|
109 | extra_src, pkgs = extra.split("=") | |||
|
110 | pkgs = pkgs.split(":") | |||
|
111 | exe.add_python_resources(exe.read_package_root(extra_src, pkgs)) | |||
106 |
|
112 | |||
107 | return exe |
|
113 | return exe | |
108 |
|
114 | |||
@@ -144,6 +150,17 b' def make_windows_install_layout(manifest' | |||||
144 | print("copying %s to %s" % (path, new_path)) |
|
150 | print("copying %s to %s" % (path, new_path)) | |
145 | manifest.add_file(manifest.get_file(path), path = new_path) |
|
151 | manifest.add_file(manifest.get_file(path), path = new_path) | |
146 |
|
152 | |||
|
153 | extra_install_files = VARS.get("extra_install_files", "") | |||
|
154 | if extra_install_files: | |||
|
155 | for extra in extra_install_files.split(","): | |||
|
156 | print("adding extra files from %s" % extra) | |||
|
157 | # TODO: I expected a ** glob to work, but it didn't. | |||
|
158 | # | |||
|
159 | # TODO: I know this has forward-slash paths. As far as I can tell, | |||
|
160 | # backslashes don't ever match glob() expansions in | |||
|
161 | # tugger-starlark, even on Windows. | |||
|
162 | manifest.add_manifest(glob(include=[extra + "/*/*"], strip_prefix=extra+"/")) | |||
|
163 | ||||
147 | # We also install a handful of additional files. |
|
164 | # We also install a handful of additional files. | |
148 | EXTRA_CONTRIB_FILES = [ |
|
165 | EXTRA_CONTRIB_FILES = [ | |
149 | "bash_completion", |
|
166 | "bash_completion", |
General Comments 0
You need to be logged in to leave comments.
Login now