Skip to content
Merged
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
2 changes: 1 addition & 1 deletion alibuild_helpers/analytics.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def askForAnalytics():
" https://github.com/alisw/alibuild/blob/master/ANALYTICS.md\n")
a = input("Is that ok for you [YES/no]? ")
if a.strip() and a.strip().lower().startswith("n"):
debug("User requsted disabling analytics.")
debug("User requested disabling analytics.")
return disable_analytics()
return generate_analytics_id()

Expand Down
2 changes: 1 addition & 1 deletion alibuild_helpers/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ def generate_initdotsh(package, specs, architecture, post_build=False):
if key != "DYLD_LIBRARY_PATH")

# Return string without a trailing newline, since we expect call sites to
# append that (and the obvious way to inesrt it into the build tempate is by
# append that (and the obvious way to inesrt it into the build template is by
# putting the "%(initdotsh_*)s" on its own line, which has the same effect).
return "\n".join(lines)

Expand Down
2 changes: 1 addition & 1 deletion alibuild_helpers/deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def doDeps(args, parser):
s["build_requires"] = [r for r in s["build_requires"] if r not in args.disable and r != "defaults-release"]
s["runtime_requires"] = [r for r in s["runtime_requires"] if r not in args.disable and r != "defaults-release"]

# Determine which pacakages are only build/runtime dependencies
# Determine which packages are only build/runtime dependencies
all_build = set()
all_runtime = set()
for k,spec in specs.items():
Expand Down
2 changes: 1 addition & 1 deletion alibuild_helpers/sl.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

# Sapling is a novel SCM by Meta (i.e. Facebook) that is fully compatible with
# git, but has a different command line interface. Among the reasons why it's
# worth suporting it is the ability to handle unnamed branches, the ability to
# worth supporting it is the ability to handle unnamed branches, the ability to
# absorb changes to the correct commit without having to explicitly rebase and
# the integration with github to allow for pull requests to be created from the
# command line from each commit of a branch.
Expand Down
2 changes: 1 addition & 1 deletion alibuild_helpers/sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ def fetch_tarball(self, spec) -> None:
err = execute("""\
for storePath in {storePaths}; do
# Only get the first matching tarball. If there are multiple with the
# same hash, we only need one and they should be interchangable.
# same hash, we only need one and they should be interchangeable.
if tars=$(rsync -s --list-only "{remoteStore}/$storePath/{pkg}-{ver}-*.{arch}.tar.gz" 2>/dev/null) &&
# Strip away the metadata in rsync's file listing, leaving only the first filename.
tar=$(echo "$tars" | sed -rn '1s#[- a-z0-9,/]* [0-9]{{2}}:[0-9]{{2}}:[0-9]{{2}} ##p') &&
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/quick.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use it from there:
This will provide you the tool itself.

In order to work you will need a set of recipes from a repository called
[alidist](https://github.com/alisw/alidist.git). On the first invokation of
[alidist](https://github.com/alisw/alidist.git). On the first invocation of
`alibuild` the recipes will be downloaded and put in a `alidist` folder.
In case you need to use a special branch / repository you can always `git clone`
the repository yourself. By default alibuild will pickup the recipes found
Expand Down
6 changes: 3 additions & 3 deletions docs/docs/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ aliBuild had troubles with it. Upgrading to the latest version via:
or by doing `git pull` should fix the issue.


### aliBuild does not pick up tool X from the sytem
### aliBuild does not pick up tool X from the system

By default aliBuild prefers using tools from the system whenever
possible. Examples of those tools are CMake, the GCC compiler or the
Expand Down Expand Up @@ -206,7 +206,7 @@ subsequent rebuild will ignore the changes. This can be worked around in two way
What 1. does is to make alibuild aware of the changes of the new file, so you
will get a new build for each change to the file. What 2. does is to always
execute the incremental recipe to refresh the installation folder on each aliBuild
invokation, possibly updating untracked files if so specified in the recipe itself.
invocation, possibly updating untracked files if so specified in the recipe itself.

### How do I set compilation options for AliRoot and / or AliPhysics?

Expand Down Expand Up @@ -274,7 +274,7 @@ third party does the work and provides a pull request.

### Can I build on an unsupported architecture?

You can try, but of course your milage might vary. In case the architecture is similar to one of the supported ones (e.g. Ubuntu and Kubuntu) this should be recognized automatically and the build should proceed, attempting to use the supported one. This will still not guarantee things will not break for some packages.
You can try, but of course your mileage might vary. In case the architecture is similar to one of the supported ones (e.g. Ubuntu and Kubuntu) this should be recognized automatically and the build should proceed, attempting to use the supported one. This will still not guarantee things will not break for some packages.

In case the architecture is completely unknown to us, you will get a message:

Expand Down
2 changes: 1 addition & 1 deletion templates/alibuild_to_please.jnj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# A alibuild template to convert the alidist recipes to
# the please build system. While not fully functional, it serves
# as explanatory example on how one can use templates to
# extract informations from alidist, without having to instrument
# extract information from alidist, without having to instrument
# alibuild itself.
#
# Use with:
Expand Down