diff options
author | Emmanuele Bassi <ebassi@gnome.org> | 2017-04-13 11:38:35 +0100 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gnome.org> | 2017-06-03 12:26:17 +0100 |
commit | e942fd476b69f15d53a04c2c292c5e80fa444ff9 (patch) | |
tree | be6e3914df76e1c1f0b3eb9c542525005409161f | |
parent | 5c631b7c435066f13684a8a28faf7c3609a2d020 (diff) | |
download | json-glib-e942fd476b69f15d53a04c2c292c5e80fa444ff9.tar.gz |
build: Move ancillary build scripts to a separate directory
Avoid cluttering the source directories, and makes finding things
easier.
-rw-r--r-- | build-aux/gen-installed-test.py (renamed from json-glib/tests/gen-installed-test.py) | 0 | ||||
-rwxr-xr-x | build-aux/make_release.sh (renamed from make_release.sh) | 3 | ||||
-rw-r--r-- | json-glib/tests/meson.build | 3 | ||||
-rw-r--r-- | meson.build | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/json-glib/tests/gen-installed-test.py b/build-aux/gen-installed-test.py index 8fe4265..8fe4265 100644 --- a/json-glib/tests/gen-installed-test.py +++ b/build-aux/gen-installed-test.py diff --git a/make_release.sh b/build-aux/make_release.sh index 6d5727a..8c69990 100755 --- a/make_release.sh +++ b/build-aux/make_release.sh @@ -7,11 +7,10 @@ cd $srcdir PROJECT=json-glib VERSION=$(git describe --abbrev=0) -grep "version: '${VERSION}'" meson.build || { echo "*** Missing version bump (required version: ${VERSION}) ***"; exit 1; } - NAME="${PROJECT}-${VERSION}" rm -f "${NAME}.tar" +rm -f "${NAME}.tar.xz" echo "Creating git tree archiveā¦" git archive --prefix="${NAME}/" --format=tar HEAD > ${NAME}.tar diff --git a/json-glib/tests/meson.build b/json-glib/tests/meson.build index 25cb3da..c1cfee2 100644 --- a/json-glib/tests/meson.build +++ b/json-glib/tests/meson.build @@ -15,9 +15,6 @@ tests = [ 'serialize-full', ] -python3 = import('python3').find_python() -gen_installed_test = join_paths(meson.current_source_dir(), 'gen-installed-test.py') - test_data = [ 'stream-load.json', ] diff --git a/meson.build b/meson.build index 1cc75d8..5c6c6b1 100644 --- a/meson.build +++ b/meson.build @@ -149,6 +149,9 @@ gnome = import('gnome') gir = find_program('g-ir-scanner', required: false) build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable_introspection') +python3 = import('python3').find_python() +gen_installed_test = files('build-aux/gen-installed-test.py') + subdir('json-glib') subdir('po') |