From 9c750a5fd75b7b63032f8369cf63fbfdcdf0157f Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 2 Apr 2020 20:51:37 +0200
Subject: Switch to a submodule for autowaf and update to waf 2.0.19
---
.gitlab-ci.yml | 3 +++
.gitmodules | 3 +++
waf | 27 +++++++++++++++++++++++++++
waflib | 1 +
4 files changed, 34 insertions(+)
create mode 100644 .gitmodules
create mode 100755 waf
create mode 160000 waflib
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d1d166d..29dc8be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,9 @@ stages:
- build
- deploy
+variables:
+ GIT_SUBMODULE_STRATEGY: normal
+
.build_template: &build_definition
stage: build
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..cc8b569
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "waflib"]
+ path = waflib
+ url = ../../drobilla/autowaf.git
diff --git a/waf b/waf
new file mode 100755
index 0000000..58d14c3
--- /dev/null
+++ b/waf
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+
+# Minimal waf script for projects that include waflib directly
+
+import sys
+import inspect
+import os
+
+try:
+ from waflib import Context, Scripting
+except Exception as e:
+ sys.stderr.write('error: Failed to import waf (%s)\n' % e)
+ if os.path.exists('.git'):
+ sys.stderr.write("Are submodules up to date? "
+ "Try 'git submodule update --init --recursive'\n")
+
+ sys.exit(1)
+
+
+def main():
+ script_path = os.path.abspath(inspect.getfile(inspect.getmodule(main)))
+ project_path = os.path.dirname(os.path.realpath(script_path))
+ Scripting.waf_entry_point(os.getcwd(), Context.WAFVERSION, project_path)
+
+
+if __name__ == '__main__':
+ main()
diff --git a/waflib b/waflib
new file mode 160000
index 0000000..569d532
--- /dev/null
+++ b/waflib
@@ -0,0 +1 @@
+Subproject commit 569d532e011bcad1ac308391e6d00b1b28789c10
--
cgit v1.2.1