Merge ~sylvain-pineau/checkbox/+git/checkbox-configure:separate-provider-repo into ~checkbox-dev/checkbox/+git/checkbox-configure:master

[Sylvain Pineau]

Instead of only creating the snap repo in-place the new behavior is to not only create a distinct repo for the snap ready to push but also a provider repo if configure is called w/o --with-provider-included.

[Sylvain Pineau (sylvain-pineau)]

self-approved

review: Approve

diff --git a/configure.ac b/configure.ac
index 5f2e6aa..8a802b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # Process this file with autoconf to generate a configure script.
 #
 ###############################################################################
-# Copyright 2019-2020 Canonical Ltd.
+# Copyright 2019-2021 Canonical Ltd.
 # All rights reserved.
 #
 # Written by:
@@ -26,6 +26,25 @@ if test -z "$user"; then
 fi
 AC_SUBST(user)
 
+AC_ARG_ENABLE(classic,
+    [AS_HELP_STRING([--enable-classic],
+    [Enable classic confinement])],
+    enable_classic="yes")
+
+AC_ARG_WITH(provider-included,
+            [AS_HELP_STRING([--with-provider-included],
+            [Create a bundled checkbox provider (default = no)])],
+            enable_provider="yes")
+
+snap="checkbox-$project"
+if test "$enable_classic" = "yes"; then
+    snap="checkbox-$project-classic"
+fi
+
+rm -rf $snap
+mkdir $snap
+git ls-tree master --name-only | grep -v configure.ac | xargs cp -r -t $snap
+
 AC_ARG_VAR([base], [base name (e.g base=core18)])
 if test -n "$base"; then
     base_digits=${base: -2}
@@ -34,11 +53,11 @@ if test -n "$base"; then
         base_python_version="3.6"
     elif test "$base_digits" = "20"; then
         base_python_version="3.8"
-        mv snap/plugins/checkbox_provider.py.in_v2 snap/plugins/checkbox_provider.py.in
-        mv snap/snapcraft_classic.yaml.in_v2 snap/snapcraft_classic.yaml.in
-        mv snap/snapcraft.yaml.in_v2 snap/snapcraft.yaml.in
-        rm -rf launchers
-        mv launchers_v2 launchers
+        mv $snap/snap/plugins/checkbox_provider.py.in_v2 $snap/snap/plugins/checkbox_provider.py.in
+        mv $snap/snap/snapcraft_classic.yaml.in_v2 $snap/snap/snapcraft_classic.yaml.in
+        mv $snap/snap/snapcraft.yaml.in_v2 $snap/snap/snapcraft.yaml.in
+        rm -rf $snap/launchers
+        mv $snap/launchers_v2 $snap/launchers
     else
         base_python_version="3.5"
     fi
@@ -49,10 +68,6 @@ AC_SUBST(base)
 AC_SUBST(base_digits)
 AC_SUBST(base_python_version)
 
-AC_ARG_WITH(provider-included,
-            [AS_HELP_STRING([--with-provider-included],
-            [Create a bundled checkbox provider (default = no)])],
-            enable_provider="yes")
 if test "$enable_provider" = "yes"; then
     provider_source="./checkbox-provider-$project"
     provider_source_type="local"
@@ -63,49 +78,60 @@ fi
 AC_SUBST(provider_source)
 AC_SUBST(provider_source_type)
 
-AC_ARG_ENABLE(classic,
-    [AS_HELP_STRING([--enable-classic],
-    [Enable classic confinement])],
-    enable_classic="yes")
 if test "$enable_classic" = "yes"; then
-    mv snap/snapcraft_classic.yaml.in snap/snapcraft.yaml.in
-    rm -rf snap/hooks
-    mv snap/hooks_classic snap/hooks
-    mv launchers/checkbox-cli-wrapper_classic launchers/checkbox-cli-wrapper
-    mv launchers/wrapper_local.in_classic launchers/wrapper_local.in
-    mv launchers/configure.in_classic launchers/configure.in
+    mv $snap/snap/snapcraft_classic.yaml.in $snap/snap/snapcraft.yaml.in
+    rm -rf $snap/snap/hooks
+    mv $snap/snap/hooks_classic $snap/snap/hooks
+    mv $snap/launchers/checkbox-cli-wrapper_classic $snap/launchers/checkbox-cli-wrapper
+    mv $snap/launchers/wrapper_local.in_classic $snap/launchers/wrapper_local.in
+    mv $snap/launchers/configure.in_classic $snap/launchers/configure.in
 else
-    rm -rf snap/snapcraft_classic.yaml.in snap/hooks_classic
-    rm -rf launchers/hook-wrapper launchers/checkbox-cli-wrapper_classic
-    rm -rf launchers/wrapper_local.in_classic
-    rm -rf launchers/configure.in_classic
+    rm -rf $snap/snap/snapcraft_classic.yaml.in $snap/snap/hooks_classic
+    rm -rf $snap/launchers/hook-wrapper
+    rm -rf $snap/launchers/checkbox-cli-wrapper_classic
+    rm -rf $snap/launchers/wrapper_local.in_classic
+    rm -rf $snap/launchers/configure.in_classic
 fi
 
 AC_MSG_RESULT([*********** Configuring: checkbox-$project ($year) **********])
-cat > cleanup.sh <<EOF
-#!/bin/bash 
-rm -rf .git
-git init -q
-git add .
-git commit -q -m 'Initial commit'
-git clean -qxdf
-EOF
-chmod +x cleanup.sh
-AC_CONFIG_FILES([snap/snapcraft.yaml])
-AC_CONFIG_FILES([snap/plugins/checkbox_provider.py])
-AC_CONFIG_FILES([snap/hooks/configure], [chmod +x snap/hooks/configure])
-AC_CONFIG_FILES([snap/hooks/install], [chmod +x snap/hooks/install])
-AC_CONFIG_FILES([launchers/configure], [chmod +x launchers/configure])
-AC_CONFIG_FILES([launchers/test-runner], [chmod +x launchers/test-runner])
-AC_CONFIG_FILES([launchers/test-runner-automated], [chmod +x launchers/test-runner-automated])
-AC_CONFIG_FILES([launchers/wrapper_local], [chmod +x launchers/wrapper_local])
+AC_CONFIG_FILES([$snap/snap/snapcraft.yaml])
+AC_CONFIG_FILES([$snap/snap/plugins/checkbox_provider.py])
+AC_CONFIG_FILES([$snap/snap/hooks/configure])
+AC_CONFIG_FILES([$snap/snap/hooks/install])
+AC_CONFIG_FILES([$snap/launchers/configure])
+AC_CONFIG_FILES([$snap/launchers/test-runner])
+AC_CONFIG_FILES([$snap/launchers/test-runner-automated])
+AC_CONFIG_FILES([$snap/launchers/wrapper_local])
 if test "$enable_provider" = "yes"; then
-    mv checkbox-provider-template checkbox-provider-$project
-    AC_CONFIG_FILES([
-        checkbox-provider-$project/manage.py
-        checkbox-provider-$project/units/test-plan.pxu
-    ], [chmod +x checkbox-provider-$project/manage.py])
+    mv $snap/checkbox-provider-template $snap/checkbox-provider-$project
+    AC_CONFIG_FILES([$snap/checkbox-provider-$project/manage.py])
+    AC_CONFIG_FILES([$snap/checkbox-provider-$project/units/test-plan.pxu])
 else
-    rm -rf checkbox-provider-template
+    rm -rf checkbox-provider-$project
+    mv $snap/checkbox-provider-template checkbox-provider-$project
+    AC_CONFIG_FILES([checkbox-provider-$project/manage.py])
+    AC_CONFIG_FILES([checkbox-provider-$project/units/test-plan.pxu])
 fi
 AC_OUTPUT
+
+chmod +x $snap/snap/hooks/configure
+chmod +x $snap/snap/hooks/install
+chmod +x $snap/launchers/configure
+chmod +x $snap/launchers/test-runner
+chmod +x $snap/launchers/test-runner-automated
+chmod +x $snap/launchers/wrapper_local
+if test "$enable_provider" = "yes"; then
+    chmod +x $snap/checkbox-provider-$project/manage.py
+else
+    chmod +x checkbox-provider-$project/manage.py
+    cp .gitignore checkbox-provider-$project
+    git -C checkbox-provider-$project init -q
+    git -C checkbox-provider-$project add .
+    git -C checkbox-provider-$project commit -q -m 'Initial commit'
+    git -C checkbox-provider-$project clean -qxdf
+fi
+
+git -C $snap init -q
+git -C $snap add .
+git -C $snap commit -q -m 'Initial commit'
+git -C $snap clean -qxdf