src: clean main directory

make things cleaner by putting the whole source code under src/

.gitlab-ci.yml

@@ -1,30 +1,23 @@
-stages:
-  - flatpak
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
 
 variables:
-  BUNDLE: "authenticator-git.flatpak"
-  GIT_SUBMODULE_STRATEGY: normal
-
+    BUNDLE: "authenticator-dev.flatpak"
 
 flatpak:
-    image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
-    stage: flatpak
+    image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master'
     variables:
         MANIFEST_PATH: "build-aux/com.github.bilelmoussaoui.Authenticator.json"
-        RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo"
         FLATPAK_MODULE: "Authenticator"
-    script:
-        - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
-        - flatpak build app meson -Dprofile=development --prefix=/app ${MESON_ARGS} _build
-        - flatpak build app ninja -C _build install
-        - flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH}
-        - flatpak build-export repo app
-        - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} com.github.bilelmoussaoui.AuthenticatorDevel
-    artifacts:
-        paths:
-            - ${BUNDLE}
-            - _build/meson-logs/meson-log.txt
-        expire_in: 30 days
-    cache:
-        paths:
-             - .flatpak-builder/cache
+        RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo"
+        APP_ID: "com.github.bilelmoussaoui.Authenticator"
+    extends: .flatpak
+
+review:
+    stage: deploy
+    dependencies:
+        - 'flatpak'
+    extends: '.review'
+
+stop_review:
+    stage: deploy
+    extends: '.stop_review'

meson.build

@@ -70,64 +70,6 @@ conf.set('PYTHON', python3.path())
 
 subdir('data')
 subdir('po')
-
-
-configure_file(
-  input: 'authenticator.py.in',
-  output: 'authenticator',
-  configuration: conf,
-  install_dir: get_option('bindir')
-)
-
-configure_file(
-  input: 'authenticator-search-provider.py.in',
-  output: 'authenticator-search-provider',
-  configuration: conf,
-  install_dir: get_option('libexecdir')
-)
-
-
-configure_file(
-  input: 'Authenticator/models/settings.py.in',
-  output: 'settings.py',
-  configuration: conf,
-  install_dir: join_paths(python.sysconfig_path('purelib'),
-                            'Authenticator/models')
-)
-
-configure_file(
-  input: 'Authenticator/widgets/window.py.in',
-  output: 'window.py',
-  configuration: conf,
-  install_dir: join_paths(python.sysconfig_path('purelib'),
-                            'Authenticator/widgets')
-)
-
-configure_file(
-  input: 'Authenticator/utils.py.in',
-  output: 'utils.py',
-  configuration: conf,
-  install_dir: join_paths(python.sysconfig_path('purelib'),
-                            'Authenticator')
-)
-
-configure_file(
-  input: 'Authenticator/application.py.in',
-  output: 'application.py',
-  configuration: conf,
-  install_dir: join_paths(python.sysconfig_path('purelib'),
-                            'Authenticator')
-)
-
-install_subdir(
-  'Authenticator',
-  install_dir: python.sysconfig_path('purelib'),
-  exclude_files: [
-    'models/settings.py.in',
-    'widgets/window.py.in',
-    'utils.py.in',
-    'application.py.in'
-  ]
-)
+subdir('src')
 
 meson.add_install_script('build-aux/meson_post_install.py')

src/meson.build

@@ -0,0 +1,59 @@
+
+
+configure_file(
+  input: 'authenticator.py.in',
+  output: 'authenticator',
+  configuration: conf,
+  install_dir: get_option('bindir')
+)
+
+configure_file(
+  input: 'authenticator-search-provider.py.in',
+  output: 'authenticator-search-provider',
+  configuration: conf,
+  install_dir: get_option('libexecdir')
+)
+
+
+configure_file(
+  input: 'Authenticator/models/settings.py.in',
+  output: 'settings.py',
+  configuration: conf,
+  install_dir: join_paths(python.sysconfig_path('purelib'),
+                            'Authenticator/models')
+)
+
+configure_file(
+  input: 'Authenticator/widgets/window.py.in',
+  output: 'window.py',
+  configuration: conf,
+  install_dir: join_paths(python.sysconfig_path('purelib'),
+                            'Authenticator/widgets')
+)
+
+configure_file(
+  input: 'Authenticator/utils.py.in',
+  output: 'utils.py',
+  configuration: conf,
+  install_dir: join_paths(python.sysconfig_path('purelib'),
+                            'Authenticator')
+)
+
+configure_file(
+  input: 'Authenticator/application.py.in',
+  output: 'application.py',
+  configuration: conf,
+  install_dir: join_paths(python.sysconfig_path('purelib'),
+                            'Authenticator')
+)
+
+install_subdir(
+  'Authenticator',
+  install_dir: python.sysconfig_path('purelib'),
+  exclude_files: [
+    'models/settings.py.in',
+    'widgets/window.py.in',
+    'utils.py.in',
+    'application.py.in'
+  ]
+)