[gnome-builder] build: move build to build-aux
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: move build to build-aux
- Date: Wed, 7 Jun 2017 20:29:36 +0000 (UTC)
commit 4a5deaad58c40ea474358cf883ca56814c5623fe
Author: Christian Hergert <chergert redhat com>
Date: Wed Jun 7 13:29:26 2017 -0700
build: move build to build-aux
People often use "build" for a build in-tree, so this is less likely to
clash with that. It's also the more standard name for things in auto*
world, and most of our other naming follows those conventions.
{build => build-aux}/asan.supp | 0
.../flatpak/docutils-fix-python3-shebang.patch | 0
...getting-lib-version-when-using-pkg-config.patch | 0
{build => build-aux}/flatpak/polkit-autogen | 0
...build-Add-option-to-build-without-polkitd.patch | 0
{build => build-aux}/flatpak/setuptools-makefile | 0
{build => build-aux}/meson/meson_dist.sh | 0
{build => build-aux}/meson/meson_post_install.py | 0
libide/meson.build | 2 +-
meson.build | 4 ++--
org.gnome.Builder.json | 14 +++++++-------
11 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/build/asan.supp b/build-aux/asan.supp
similarity index 100%
rename from build/asan.supp
rename to build-aux/asan.supp
diff --git a/build/flatpak/docutils-fix-python3-shebang.patch
b/build-aux/flatpak/docutils-fix-python3-shebang.patch
similarity index 100%
rename from build/flatpak/docutils-fix-python3-shebang.patch
rename to build-aux/flatpak/docutils-fix-python3-shebang.patch
diff --git a/build/flatpak/lxml-Fix-getting-lib-version-when-using-pkg-config.patch
b/build-aux/flatpak/lxml-Fix-getting-lib-version-when-using-pkg-config.patch
similarity index 100%
rename from build/flatpak/lxml-Fix-getting-lib-version-when-using-pkg-config.patch
rename to build-aux/flatpak/lxml-Fix-getting-lib-version-when-using-pkg-config.patch
diff --git a/build/flatpak/polkit-autogen b/build-aux/flatpak/polkit-autogen
similarity index 100%
rename from build/flatpak/polkit-autogen
rename to build-aux/flatpak/polkit-autogen
diff --git a/build/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch
b/build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch
similarity index 100%
rename from build/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch
rename to build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch
diff --git a/build/flatpak/setuptools-makefile b/build-aux/flatpak/setuptools-makefile
similarity index 100%
rename from build/flatpak/setuptools-makefile
rename to build-aux/flatpak/setuptools-makefile
diff --git a/build/meson/meson_dist.sh b/build-aux/meson/meson_dist.sh
similarity index 100%
rename from build/meson/meson_dist.sh
rename to build-aux/meson/meson_dist.sh
diff --git a/build/meson/meson_post_install.py b/build-aux/meson/meson_post_install.py
similarity index 100%
rename from build/meson/meson_post_install.py
rename to build-aux/meson/meson_post_install.py
diff --git a/libide/meson.build b/libide/meson.build
index 37cfd91..ceb5803 100644
--- a/libide/meson.build
+++ b/libide/meson.build
@@ -405,7 +405,7 @@ libide_args = []
#libide_vcs_version = vcs_tag(
# input: 'ide-vcs-version.h.in',
# output: 'ide-vcs-version.h',
-# command: '../build/meson/meson_vcs_tag.sh',
+# command: '../build-aux/meson/meson_vcs_tag.sh',
# fallback: '',
#)
diff --git a/meson.build b/meson.build
index 3d99923..701a60e 100644
--- a/meson.build
+++ b/meson.build
@@ -266,12 +266,12 @@ executable('gnome-builder-worker', 'src/main.c',
dependencies: libide_deps + [libide_dep],
)
-meson.add_install_script('build/meson/meson_post_install.py')
+meson.add_install_script('build-aux/meson/meson_post_install.py')
# 'dist' will be used by meson, avoid conflicting
run_target('builder-dist',
command: [
- find_program('build/meson/meson_dist.sh'),
+ find_program('build-aux/meson/meson_dist.sh'),
meson.project_version(),
meson.project_name(),
]
diff --git a/org.gnome.Builder.json b/org.gnome.Builder.json
index d695a49..876778c 100644
--- a/org.gnome.Builder.json
+++ b/org.gnome.Builder.json
@@ -145,11 +145,11 @@
},
{
"type": "patch",
- "path": "build/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch"
+ "path": "build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch"
},
{
"type": "file",
- "path": "build/flatpak/polkit-autogen",
+ "path": "build-aux/flatpak/polkit-autogen",
"dest-filename": "autogen.sh"
}
]
@@ -175,7 +175,7 @@
},
{
"type": "file",
- "path": "build/flatpak/setuptools-makefile",
+ "path": "build-aux/flatpak/setuptools-makefile",
"dest-filename": "Makefile"
}
]
@@ -199,12 +199,12 @@
},
{
"type": "file",
- "path": "build/flatpak/setuptools-makefile",
+ "path": "build-aux/flatpak/setuptools-makefile",
"dest-filename": "Makefile"
},
{
"type": "patch",
- "path": "build/flatpak/lxml-Fix-getting-lib-version-when-using-pkg-config.patch"
+ "path": "build-aux/flatpak/lxml-Fix-getting-lib-version-when-using-pkg-config.patch"
}
]
},
@@ -349,7 +349,7 @@
},
{
"type": "file",
- "path": "build/flatpak/setuptools-makefile",
+ "path": "build-aux/flatpak/setuptools-makefile",
"dest-filename": "Makefile"
}
]
@@ -565,7 +565,7 @@
},
{
"type": "file",
- "path": "build/flatpak/setuptools-makefile",
+ "path": "build-aux/flatpak/setuptools-makefile",
"dest-filename": "Makefile"
}
]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]