From 249db7db22a9255093facd3b00fa67cb71e971e8 Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Tue, 17 Mar 2020 17:36:12 +0100
Subject: [PATCH] appveyor: add cloning the dependency modules to 'prepare'
 action

---
 .appveyor.yml    |  8 ++++++++
 appveyor-test.py | 14 +++++++-------
 appveyor/do.py   | 29 +++++++++++++++++++++++------
 3 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index b336a73..c9ba9a6 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -29,6 +29,7 @@ skip_commits:
     - '**/*.html'
     - '**/*.md'
 
+
 #---------------------------------#
 #   build matrix configuration    #
 #---------------------------------#
@@ -42,7 +43,14 @@ configuration:
 
 # Environment variables: compiler toolchain
 environment:
+  # common variables
+  SETUP_PATH: .:.ci
+  SET: test01
+
   matrix:
+  - CC: vs2019
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    SET: test00
   - CC: mingw
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
   - CC: vs2019
diff --git a/appveyor-test.py b/appveyor-test.py
index 34d023a..da45485 100644
--- a/appveyor-test.py
+++ b/appveyor-test.py
@@ -2,7 +2,7 @@
 """Module ci-scripts AppVeyor unit tests
 """
 
-# SET=test00 in .appveyor.yml runs the tests in this script
+# SET=test00 in the environment (.appveyor.yml) runs the tests in this script
 # all other jobs are started as compile jobs
 
 from __future__ import print_function
@@ -235,9 +235,9 @@ class TestDefaultModuleURLs(unittest.TestCase):
                              .format(mod, do.setup[mod + '_REPOURL']))
 
 if __name__ == "__main__":
-#    suite = unittest.TestLoader().loadTestsFromTestCase(TestSourceSet)
-#    suite = unittest.TestLoader().loadTestsFromTestCase(TestUpdateReleaseLocal)
-#    suite = unittest.TestLoader().loadTestsFromTestCase(TestAddDependency)
-#    suite = unittest.TestLoader().loadTestsFromTestCase(TestDefaultModuleURLs)
-#    unittest.TextTestRunner(verbosity=2).run(suite)
-    unittest.main()
+    if 'SET' in os.environ and os.environ['SET'] == "test00":
+        unittest.main()
+    else:
+        do.actions['prepare']()
+        do.actions['build']()
+        do.actions['test']()
diff --git a/appveyor/do.py b/appveyor/do.py
index ece2f7b..dfe741d 100644
--- a/appveyor/do.py
+++ b/appveyor/do.py
@@ -253,7 +253,7 @@ def add_dependency(dep, tag):
     update_release_local(setup[dep+"_VARNAME"], place)
     os.chdir(curdir)
 
-def prepare(args):
+def prepare():
     print(sys.version)
     print('PYTHONPATH')
     for dname in sys.path:
@@ -261,19 +261,36 @@ def prepare(args):
     print('platform = ', distutils.util.get_platform())
 
     print('{0}Loading setup files{1}'.format(ANSI_YELLOW, ANSI_RESET))
-    source_set('default')
+    source_set('defaults')
     if 'SET' in os.environ:
         source_set(os.environ['SET'])
 
     # we're working with tags (detached heads) a lot: suppress advice
     call_git(['config', '--global', 'advice.detachedHead', 'false'])
 
-    print('Installing dependencies')
+    print('{0}Checking/cloning dependencies{1}'.format(ANSI_YELLOW, ANSI_RESET))
 
-def build(args):
+    add_modules = ''
+    if 'ADD_MODULES' in os.environ:
+        add_modules = os.environ['ADD_MODULES']
+    modules = ''
+    if 'MODULES' in os.environ:
+        modules = os.environ['MODULES']
+    modlist = 'BASE {0} {1}'.format(add_modules, modules).upper().split()
+    for mod in modlist:
+        if not setup[mod].strip():
+            setup[mod] = 'master'
+        logger.debug('Adding dependency %s with tag %s', mod, setup[mod])
+        add_dependency(mod, setup[mod])
+
+    if os.path.isdir('configure'):
+        release_local = os.path.join(cachedir, 'RELEASE.local')
+        shutil.copy(release_local, 'configure')
+
+def build():
     print('Building the module')
 
-def test(args):
+def test():
     print('Running the tests')
 
 actions = {
@@ -287,4 +304,4 @@ if __name__=='__main__':
     while len(args)>0:
         name = args.pop(0)
         print('IN', name, 'with', args)
-        actions[name](args)
+        actions[name]()