Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Install() and InstallAs() migrated to using a command generator as default #3573

Draft
wants to merge 13 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/engine/SCons/Node/FS.py
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,16 @@ def __get_rsrcdir(self):
def __get_dir(self):
return EntryProxy(self.get().dir)

def __get_node_type(self):
actual = self.get()
if isinstance(actual, Dir):
return "directory"
elif isinstance(actual, File):
return "file"
else:
return "other"


dictSpecialAttrs = { "base" : __get_base_path,
"posix" : __get_posix_path,
"windows" : __get_windows_path,
Expand All @@ -521,6 +531,7 @@ def __get_dir(self):
"file" : __get_file,
"rsrcpath" : __get_rsrcnode,
"rsrcdir" : __get_rsrcdir,
"type" : __get_node_type,
}

def __getattr__(self, name):
Expand Down
5 changes: 3 additions & 2 deletions src/engine/SCons/Platform/posix.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,9 @@ def generate(env):
env['ESCAPE'] = escape
env['TEMPFILE'] = TempFileMunge
env['TEMPFILEPREFIX'] = '@'
#Based on LINUX: ARG_MAX=ARG_MAX=131072 - 3000 for environment expansion
#Note: specific platforms might rise or lower this value

# Based on LINUX: ARG_MAX=ARG_MAX=131072 - 3000 for environment expansion
# Note: specific platforms might increase or decrease this value
env['MAXLINELENGTH'] = 128072

# This platform supports RPATH specifications.
Expand Down
1 change: 0 additions & 1 deletion src/engine/SCons/Platform/win32.py
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,6 @@ def generate(env):
if enable_virtualenv and not ignore_virtualenv:
ImportVirtualenv(env)


# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
Expand Down
Loading