rename config param 'config-actions' to 'configure'

pustotnik · Apr 8, 2021 · 81927c0 · 81927c0
1 parent 09ebde3
commit 81927c0
Show file tree

Hide file tree

Showing 46 changed files with 123 additions and 121 deletions.
diff --git a/demos/asm/01-simple-gas/buildconf.py b/demos/asm/01-simple-gas/buildconf.py
@@ -10,9 +10,6 @@ def check(**kwargs):
         'defines'   : 'foo=12',
         'asflags'   : '-Os',
         'toolchain' : 'gcc gas',
-        'config-actions' : [
-            #{ 'do' : 'call-pyfunc', 'func' : check, 'mandatory': False  },
-            check,
-        ],
+        'configure' : [ check ],
     },
 }
diff --git a/demos/asm/02-simple-nasm/buildconf.py b/demos/asm/02-simple-nasm/buildconf.py
@@ -10,7 +10,7 @@ def check():
         'asflags'     : '-f elf64',
         'aslinkflags' : '-s',
         'toolchain'   : 'nasm',
-        'config-actions' : [
+        'configure' : [
             check,
             { 'do' : 'find-program', 'names' : 'ld', 'var' : 'ASLINK' },
         ],

diff --git a/demos/c/03-withshlib/buildconf.py b/demos/c/03-withshlib/buildconf.py
@@ -4,7 +4,7 @@
         'features' : 'cshlib',
         'source'   : 'shlib/**/*.c',
         'includes' : '.',
-        'config-actions'  : [
+        'configure'  : [
             { 'do' : 'check-headers', 'names' : 'stdio.h' },
         ],
         'ver-num' : '0.1.2',
@@ -14,7 +14,7 @@
         'source'   : 'prog/**/*.c',
         'includes' : '.',
         'use'      : 'util',
-        'config-actions'  : [
+        'configure'  : [
             { 'do' : 'check-headers', 'names' : 'stdio.h' },
         ],
     },

diff --git a/demos/c/04-simple2/buildconf.yaml b/demos/c/04-simple2/buildconf.yaml
@@ -4,8 +4,9 @@ tasks :
     features : cprogram
     source   : test.c util.c
     includes : '.'
-    config-actions:
-      - { do: check-headers, names: stdio.h }
+    configure:
+      - do: check-headers
+        names: stdio.h
 
 buildtypes:
   debug :

diff --git a/demos/c/05-startdir/zenmake/buildconf.py b/demos/c/05-startdir/zenmake/buildconf.py
@@ -8,15 +8,15 @@
         'source'   : 'src/shlib/**/*.c',
         'includes' : 'includes',
         'export-includes': True,
-        'config-actions'  : [
+        'configure'  : [
             dict(do = 'check-headers', names = 'stdio.h'),
         ],
     },
     'test' : {
         'features' : 'cprogram',
         'source'   : 'src/prog/**/*.c',
         'use'      : 'util',
-        'config-actions'  : [
+        'configure'  : [
             dict(do = 'check-headers', names = 'stdio.h'),
         ],
     },

diff --git a/demos/c/06-strip-release/buildconf.py b/demos/c/06-strip-release/buildconf.py
@@ -5,7 +5,7 @@
     'program' : {
         'features' : 'cprogram',
         'source'   : 'test.c util.c',
-        'config-actions' : [ { 'do' : 'find-program', 'names' : 'strip'} ],
+        'configure' : [ { 'do' : 'find-program', 'names' : 'strip'} ],
         'run': '${STRIP} ${TARGET}',
     },
 }

diff --git a/demos/c/07-with spaces/buildconf.py b/demos/c/07-with spaces/buildconf.py
@@ -7,15 +7,15 @@
         'source'   : '"my shlib/**/*.c"',
         'includes' : '"my includes"',
         'export-includes' : True,
-        'config-actions'  : [
+        'configure'  : [
             { 'do' : 'check-headers', 'names' : 'stdio.h' },
         ],
     },
     'my test' : {
         'features' : 'cprogram',
         'source'   : '"my prog/**/*.c"',
         'use'      : "'my util'",
-        'config-actions'  : [
+        'configure'  : [
             { 'do' : 'check-headers', 'names' : 'stdio.h' },
         ],
     },
@@ -25,15 +25,15 @@
         'source'   : '"my shlib/my util.c" "my shlib/my util2.c"',
         'includes' : '"my includes"',
         'export-includes' : True,
-        'config-actions'  : [
+        'configure'  : [
             { 'do' : 'check-headers', 'names' : 'stdio.h' },
         ],
     },
     'my test alt' : {
         'features' : 'cprogram',
         'source'   : '"my prog/my test.c"',
         'use'      : "'my util alt'",
-        'config-actions'  : [
+        'configure'  : [
             { 'do' : 'check-headers', 'names' : 'stdio.h' },
         ],
     },

diff --git a/demos/codegen/01-simple/buildconf.py b/demos/codegen/01-simple/buildconf.py
@@ -1,7 +1,7 @@
 
 tasks = {
     'gen-code1' : {
-        'config-actions' : [ dict(do = 'find-program', names = 'python'), ],
+        'configure' : [ dict(do = 'find-program', names = 'python'), ],
         'run' : '${PYTHON} ${TOP_DIR}/gencode.py ${BUILDTYPE_DIR}/generated',
         'target' : '',
         'export-config-results' : True,

diff --git a/demos/cpp/03-withshlib/buildconf.yaml b/demos/cpp/03-withshlib/buildconf.yaml
@@ -3,9 +3,10 @@ tasks:
   util :
     features : cxxshlib
     source   : 'shlib/**/*.cpp'
-    config-actions:
-      - { do : 'check-headers', names : 'cstdio iostream' }
-
+    configure:
+      - do : check-headers
+        names : cstdio iostream
+
   prog :
     features : cxxprogram
     source   : 'prog/**/*.cpp'

diff --git a/demos/cpp/04-complex/buildconf.py b/demos/cpp/04-complex/buildconf.py
@@ -22,7 +22,7 @@
         'export-includes' : True,
         'export-defines' : True,
         'install-path' : False,
-        'config-actions'  : [
+        'configure'  : [
             {
                 'do' : 'parallel', 'actions' : [
                     { 'do' : 'check-headers', 'names' : 'cstdio iostream', 'id' : 'first' },

diff --git a/demos/cpp/05-custom-toolchain/buildconf.py b/demos/cpp/05-custom-toolchain/buildconf.py
@@ -3,14 +3,14 @@
     'shlib' : {
         'features' : 'cxxshlib',
         'source'   : 'shlib/**/*.cpp',
-        'config-actions'  : [
+        'configure'  : [
             dict(do = 'check-headers', names = 'cstdio'),
         ],
     },
     'stlib' : {
         'features' : 'cxxstlib',
         'source'   : 'stlib/**/*.cpp',
-        'config-actions'  : [
+        'configure'  : [
             dict(do = 'check-headers', names = 'cstdio'),
         ],
     },

diff --git a/demos/cpp/09-complex-unittest/buildconf.py b/demos/cpp/09-complex-unittest/buildconf.py
@@ -29,11 +29,11 @@ def somefunc(args):
         'source'   : 'shlib/**/*.cpp',
         'includes' : '.',
         'run'      : "echo 'This is runcmd in task \"shlib\"'",
-        #'config-actions'  : [
+        #'configure'  : [
         #    dict(do = 'check-headers', names = 'iostream'),
         #],
-        # testing of 'config-actions.select' feature
-        'config-actions.select'  : {
+        # testing of 'configure.select' feature
+        'configure.select'  : {
             'default' : [
                 dict(do = 'check-headers', names = 'iostream'),
             ],
@@ -46,7 +46,7 @@ def somefunc(args):
         'features' : 'cxxstlib',
         'source'   : 'stlib/**/*.cpp',
         'includes' : '.',
-        'config-actions'  : [
+        'configure'  : [
             dict(do = 'check-headers', names = 'cstdio'),
         ],
     },
@@ -93,7 +93,7 @@ def somefunc(args):
             'shell' : False,
         },
         'use'       : 'shlibmain',
-        'config-actions' : [ dict(do = 'find-program', names = 'python'), ],
+        'configure' : [ dict(do = 'find-program', names = 'python'), ],
         'target' : '',
     },
     'altscript' : {
@@ -119,7 +119,7 @@ def somefunc(args):
             'shell' : False,
         },
         'use' : 'complex',
-        'config-actions' : [ dict(do = 'find-program', names = 'python'), ]
+        'configure' : [ dict(do = 'find-program', names = 'python'), ]
     },
     'testcmn' : {
         'features' : 'cxxshlib test',
@@ -139,7 +139,7 @@ def somefunc(args):
             'timeout' : 10, # in seconds, Python 3 only
             'shell'   : False,
         },
-        'config-actions' : [ dict(do = 'check-headers', names = 'vector'), ]
+        'configure' : [ dict(do = 'check-headers', names = 'vector'), ]
     },
     'shlibmain-test' : {
         'features' : 'cxxprogram test',

diff --git a/demos/cpp/11-syslibs/buildconf.py b/demos/cpp/11-syslibs/buildconf.py
@@ -20,7 +20,7 @@
             'windows' : r'C:\local\boost_1_67_0\lib64-msvc-14.1',
         },
         'libs' : 'boost_timer',
-        'config-actions'  : [
+        'configure'  : [
             dict(do = 'check-headers', names = 'cmath iostream'),
             dict(do = 'check-libs'),
         ],

diff --git a/demos/d/02-withlibs/buildconf.py b/demos/d/02-withlibs/buildconf.py
@@ -30,7 +30,7 @@
         'source'   : 'src/main.d',
         'includes' : 'src',
         'use'      : 'staticlib dll',
-        'config-actions'  : [
+        'configure'  : [
             {
                 'do' : 'parallel', 'actions' : [
                     { 'do' : 'check-code', 'text' : fragment1, 'label' : 'fragment1' },

diff --git a/demos/dbus/1-dbus-binding-tool/buildconf.py b/demos/dbus/1-dbus-binding-tool/buildconf.py
@@ -2,7 +2,7 @@
 # Based on demos/dbus from Waf
 tasks = {
     'test' : {
-        'config-actions' : [ dict(do = 'find-program', names = 'dbus-binding-tool', var = 'DBUS_BINDING_TOOL'), ],
+        'configure' : [ dict(do = 'find-program', names = 'dbus-binding-tool', var = 'DBUS_BINDING_TOOL'), ],
         'target' : 'test.h',
         'source' : 'test.xml',
         'run': {

diff --git a/demos/external-deps/1-makefile/project/buildconf.py b/demos/external-deps/1-makefile/project/buildconf.py
@@ -83,7 +83,7 @@ def triggerConfigure(**kwargs):
             'debug'   : 'foo-lib-d:static-lib',
             'release' : 'foo-lib-r:static-lib',
         },
-        'config-actions'  : [
+        'configure'  : [
             { 'do' : 'check-headers', 'names' : 'cstdio iostream' },
         ],
     },

diff --git a/demos/external-deps/2-zenmake/project/buildconf.py b/demos/external-deps/2-zenmake/project/buildconf.py
@@ -16,7 +16,7 @@
         'features' : 'cxxshlib',
         'source'   : 'shlib/**/*.cpp',
         'use' : 'zmdep:calclib zmdep:printlib',
-        'config-actions'  : [
+        'configure'  : [
             { 'do' : 'check-headers', 'names' : 'cstdio iostream' },
         ],
     },

diff --git a/demos/external-deps/2-zenmake/zmdep/buildconf.py b/demos/external-deps/2-zenmake/zmdep/buildconf.py
@@ -8,15 +8,15 @@
     'printlib' : {
         'features' : 'cstlib',
         'source'   : 'printlib/**/*.c',
-        'config-actions' : [
+        'configure' : [
             dict(do = 'check-headers', names = 'stdio.h'),
         ],
     },
     'service' : {
         'features' : 'cprogram',
         'source'   : 'service/**/*.c',
         'use'      : 'calclib printlib',
-        'config-actions' : [
+        'configure' : [
             dict(do = 'check-headers', names = 'stdio.h'),
         ],
     },

diff --git a/demos/external-deps/3-complex/project/buildconf.py b/demos/external-deps/3-complex/project/buildconf.py
@@ -23,7 +23,7 @@
         'includes' : 'libs',
         'use'      : 'engine zmdep-b:service',
         'rpath'    : '.',
-        'config-actions' : [
+        'configure' : [
             dict(do = 'check-headers', names = 'iostream'),
         ],
     },

diff --git a/demos/external-deps/3-complex/zmdep-a/buildconf.py b/demos/external-deps/3-complex/zmdep-a/buildconf.py
@@ -8,7 +8,7 @@
     'printlib' : {
         'features' : 'cstlib',
         'source'   : 'printlib/**/*.c',
-        'config-actions' : [
+        'configure' : [
             dict(do = 'check-headers', names = 'stdio.h'),
         ],
     },

diff --git a/demos/external-deps/3-complex/zmdep-b/buildconf.py b/demos/external-deps/3-complex/zmdep-b/buildconf.py
@@ -17,7 +17,7 @@
         'features' : 'cstlib',
         'source'   : 'print/**/*.c',
         'use' : 'zmdep-a:printlib',
-        'config-actions'  : [
+        'configure'  : [
             # ZenMake tests only: check there is no problem with this conf action
             dict(do = 'check-libs'),
         ],
@@ -26,7 +26,7 @@
         'features' : 'cprogram',
         'source'   : 'service/**/*.c',
         'use'      : 'calc print',
-        'config-actions' : [
+        'configure' : [
             dict(do = 'check-headers', names = 'stdio.h'),
             # ZenMake tests only: check there is no problem with this conf action
             dict(do = 'check-libs'),

diff --git a/demos/fortran/1-sample/buildconf.py b/demos/fortran/1-sample/buildconf.py
@@ -29,7 +29,7 @@
         'source'   : 'src/calculator.f90 src/main.f90',
         'includes' : 'src/inc',
         'use'      : 'staticlib sharedlib',
-        'config-actions'  : [
+        'configure'  : [
             dict( do = 'parallel', actions = [
                 dict(do = 'check-code', text = fragment1, label = 'fragment1'),
                 dict(do = 'check-code', text = fragment2, label = 'fragment2', execute = True)

diff --git a/demos/gtk3/01-hello-world/buildconf.py b/demos/gtk3/01-hello-world/buildconf.py
@@ -3,7 +3,7 @@
     'hello' : {
         'features' : 'cprogram',
         'source'   : 'hello.c',
-        'config-actions'  : [
+        'configure'  : [
             { 'do' : 'pkgconfig', 'packages' : 'gtk+-3.0' },
         ],
     },

diff --git a/demos/gtk3/02-hello-world-test/buildconf.py b/demos/gtk3/02-hello-world-test/buildconf.py
@@ -3,16 +3,16 @@
     'hello' : {
         'features' : 'cprogram',
         'source'   : 'hello.c',
-        'config-actions'  : [
-            { 
-                'do' : 'pkgconfig', 
+        'configure'  : [
+            {
+                'do' : 'pkgconfig',
                 'packages' : 'gtk+-3.0 > 1 pango gtk+-3.0 <= 100 ',
                 'tool-atleast-version' : '0.1',
-                'pkg-version' : True,  
+                'pkg-version' : True,
                 #'defnames' : False,
-                'defnames' : { 
+                'defnames' : {
                     'gtk+-3.0' : { 'have' : 'WE_HAVE_GTK3', 'version': 'GTK3_VER' },
-                    'pango' : { 'version': 'LIBPANGO_VER' }, 
+                    'pango' : { 'version': 'LIBPANGO_VER' },
                 },
                 #'mandatory' : False,
             },

diff --git a/demos/gtk3/03-withlib/buildconf.py b/demos/gtk3/03-withlib/buildconf.py
@@ -13,7 +13,7 @@
         'source'   : 'gui/*.c',
         'use'      : 'builder.ui',
         'ver-num'  : '0.1.2',
-        'config-actions'  : [
+        'configure'  : [
             { 'do' : 'pkgconfig', 'packages' : 'gtk+-3.0' },
         ],
         'export-config-results' : True,

diff --git a/demos/gtk3/04-withlib2/buildconf.py b/demos/gtk3/04-withlib2/buildconf.py
@@ -5,7 +5,7 @@
 
 tasks = {
     'gui-resources' : {
-        'config-actions'  : [
+        'configure'  : [
             # find 'glib-compile-resources' by pkg-config
             {
                 'msg' : 'Looking for glib-compile-resources',
@@ -14,7 +14,8 @@
                 'parse-as' : 'entire',
                 'var' : 'COMPILE_RES',
             },
-            # it's different and more simple way to find tool 'glib-compile-resources':
+            # it's different and more simple way to find tool 'glib-compile-resources'
+            # but it doesn't use pkg-config:
             #{ 'do' : 'find-program', 'names' : 'glib-compile-resources', 'var' : 'COMPILE_RES' },
         ],
         'source' : 'gui/gui.gresource.xml',
@@ -26,7 +27,7 @@
         'source'   : 'gui/*.c generated/resources.c',
         'use'      : 'gui-resources',
         'ver-num'  : '0.1.2',
-        'config-actions'  : [
+        'configure'  : [
             { 'do' : 'pkgconfig', 'packages' : 'gtk+-3.0' },
         ],
         'export-config-results' : True,