diff options
| -rw-r--r-- | docs/markdown/Users.md | 5 | ||||
| -rw-r--r-- | docs/markdown/Using-wraptool.md | 22 | ||||
| -rw-r--r-- | mesonbuild/backend/backends.py | 9 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 12 |
4 files changed, 32 insertions, 16 deletions
diff --git a/docs/markdown/Users.md b/docs/markdown/Users.md index 4c3bdbf..1665922 100644 --- a/docs/markdown/Users.md +++ b/docs/markdown/Users.md @@ -10,6 +10,7 @@ If you have a project that uses Meson that you want to add to this list, let us - [Arduino sample project](https://github.com/jpakkane/mesonarduino) - [Budgie Desktop](https://github.com/budgie-desktop/budgie-desktop), a desktop environment built on GNOME technologies - [casync](https://github.com/systemd/casync), Content-Addressable Data Synchronization Tool + - [cinnamon-desktop](https://github.com/linuxmint/cinnamon-desktop), the cinnamon desktop library - [dbus-broker](https://github.com/bus1/dbus-broker), Linux D-Bus Message Broker - [Dpdk](http://dpdk.org/ml/archives/dev/2018-January/089724.html), Data plane development kit, a set of libraries and drivers for fast packet processing - [DXVK](https://github.com/doitsujin/dxvk), a Vulkan-based Direct3D 11 implementation for Linux using Wine @@ -47,18 +48,22 @@ lookup based on OpenStreetMap data - [Mesa](https://www.mesa3d.org/), An open source graphics driver project - [MiracleCast](https://github.com/albfan/miraclecast), connect external monitors to your system via Wifi-Display specification aka Miracast - [Nautilus](https://git.gnome.org/browse/nautilus/commit/?id=ed5652c89ac0654df2e82b54b00b27d51c825465), the Gnome file manager + - [Nemo](https://github.com/linuxmint/nemo), the file manager for the Cinnamon desktop environment - [Orc](http://cgit.freedesktop.org/gstreamer/orc/), the Optimized Inner Loop Runtime Compiler (not the default yet) - [Outlier](https://github.com/kerolasa/outlier), a small Hello World style meson example project - [Pango](https://git.gnome.org/browse/pango/), an Internationalized text layout and rendering library (not the default yet) - [Parzip](https://github.com/jpakkane/parzip), a multithreaded reimplementation of Zip - [PipeWire](https://pipewire.org/), a framework for video and audio for containerized applications + - [Pithos](https://github.com/pithos/pithos), a Pandora Radio client - [Pitivi](http://pitivi.org/), a nonlinear video editor - [Polari](https://git.gnome.org/browse/polari), an IRC client - [radare2](https://github.com/radare/radare2), unix-like reverse engineering framework and commandline tools (not the default) - [SSHFS](https://github.com/libfuse/sshfs), allows you to mount a remote filesystem using SFTP - [Sysprof](https://wiki.gnome.org/Apps/Sysprof), a profiling tool - [systemd](https://github.com/systemd/systemd), the init system + - [szl](https://github.com/dimkr/szl), a lightweight, embeddable scripting language - [Taisei Project](https://taisei-project.org/), an open-source Touhou Project clone and fangame + - [xi-gtk](https://github.com/eyelash/xi-gtk), a GTK+ front-end for the Xi editor - [Xorg](https://cgit.freedesktop.org/xorg/xserver/), the X.org display server (not the default yet) - [Valum](https://github.com/valum-framework/valum), a micro web framework written in Vala - [Wayland and Weston](https://lists.freedesktop.org/archives/wayland-devel/2016-November/031984.html), a next generation display server (not merged yet) diff --git a/docs/markdown/Using-wraptool.md b/docs/markdown/Using-wraptool.md index 08b1bfa..f6023e8 100644 --- a/docs/markdown/Using-wraptool.md +++ b/docs/markdown/Using-wraptool.md @@ -1,9 +1,9 @@ # Using wraptool -Wraptool is a helper tool that allows you to manage your source -dependencies using the WrapDB database. It gives you all things you -would expect, such as installing and updating dependencies. The wrap -tool works on all platforms, the only limitation is that the wrap +Wraptool is a subcommand of Meson that allows you to manage your +source dependencies using the WrapDB database. It gives you all things +you would expect, such as installing and updating dependencies. The +wrap tool works on all platforms, the only limitation is that the wrap definition works on your target platform. If you find some Wraps that don't work, please file bugs or, even better, patches. @@ -16,7 +16,7 @@ are commands to type. The simplest operation to do is to query the list of packages available. To list them all issue the following command: - $ wraptool list + $ meson wrap list box2d enet gtest @@ -33,13 +33,13 @@ available. To list them all issue the following command: Usually you want to search for a specific package. This can be done with the `search` command: - $ wraptool search jpeg + $ meson wrap search jpeg libjpeg To determine which versions of libjpeg are available to install, issue the `info` command: - $ wraptool info libjpeg + $ meson wrap info libjpeg Available versions of libjpeg: 9a 2 @@ -54,7 +54,7 @@ Installing dependencies is just as straightforward. First just create the `subprojects` directory at the top of your source tree and issue the install command. - $ wraptool install libjpeg + $ meson wrap install libjpeg Installed libjpeg branch 9a revision 2 Now you can issue a `subproject('libjpeg')` in your `meson.build` file @@ -62,7 +62,7 @@ to use it. To check if your projects are up to date you can issue the `status` command. - $ wraptool status + $ meson wrap status Subproject status libjpeg up to date. Branch 9a, revision 2. zlib not up to date. Have 1.2.8 2, but 1.2.8 4 is available. @@ -70,12 +70,12 @@ To check if your projects are up to date you can issue the `status` command. In this case `zlib` has a newer release available. Updating it is straightforward: - $ wraptool update zlib + $ meson wrap update zlib Updated zlib to branch 1.2.8 revision 4 Wraptool can do other things besides these. Documentation for these can be found in the command line help, which can be accessed by -`wraptool --help`. +`meson wrap --help`. ## Promoting dependencies diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 215d73b..62cc756 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -323,9 +323,12 @@ class Backend: if os.path.splitext(libpath)[1] not in ['.dll', '.lib', '.so']: continue absdir = os.path.dirname(libpath) - rel_to_src = absdir[len(self.environment.get_source_dir()) + 1:] - assert(not os.path.isabs(rel_to_src)) - paths.append(os.path.join(self.build_to_src, rel_to_src)) + if absdir.startswith(self.environment.get_source_dir()): + rel_to_src = absdir[len(self.environment.get_source_dir()) + 1:] + assert not os.path.isabs(rel_to_src), 'rel_to_src: {} is absolute'.format(rel_to_src) + paths.append(os.path.join(self.build_to_src, rel_to_src)) + else: + paths.append(absdir) return paths def determine_rpath_dirs(self, target): diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 8d64cc4..c2c4fe3 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1735,8 +1735,16 @@ external dependencies (including libraries) must go to "dependencies".''') return self.do_subproject(dirname, kwargs) def do_subproject(self, dirname, kwargs): - if '/' in dirname or '\\' in dirname: - raise InterpreterException('Subproject name must not contain a path separator.') + if dirname == '': + raise InterpreterException('Subproject dir name must not be empty.') + if dirname[0] == '.': + raise InterpreterException('Subproject dir name must not start with a period.') + if '..' in dirname: + raise InterpreterException('Subproject name must not contain a ".." path segment.') + if os.path.isabs(dirname): + raise InterpreterException('Subproject name must not be an absolute path.') + if '\\' in dirname or '/' in dirname: + mlog.warning('Subproject name has a path separator. This may cause unexpected behaviour.') if dirname in self.subproject_stack: fullstack = self.subproject_stack + [dirname] incpath = ' => '.join(fullstack) |