Meson: Use profiles

data/icons/meson.build

@@ -3,8 +3,8 @@
 #
 
 # Override only default 
-if development_build and variant == 'default'
-    variant = 'devel'
+if profile == 'development' and icon_variant == 'default'
+    icon_variant = 'devel'
 endif
 
 #========================
@@ -14,21 +14,21 @@ icon_sizes = ['16', '24', '32', '48', '64', '128']
 
 foreach i : icon_sizes
     install_data(
-        variant / 'hicolor' / i + '.png',
+        icon_variant / 'hicolor' / i + '.png',
         install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i / 'apps',
         rename: app_id + '.png'
     )
 
     install_data(
-        variant / 'hicolor@2' / i + '@2.png',
+        icon_variant / 'hicolor@2' / i + '@2.png',
         install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i + '@2' / 'apps',
         rename: app_id + '.png'
     )
 
 endforeach
 
 install_data(
-    variant / 'scalable.svg',
+    icon_variant / 'scalable.svg',
     install_dir: get_option('datadir') / 'icons' / 'scalable' / 'apps',
     rename: app_id + '.svg'
 )

io.github.ellie_commons.jorts.flathub.yml

@@ -28,8 +28,8 @@ modules:
   - name: jorts
     buildsystem: meson
     config-opts:
-      - -Dvariant=default
-      - -Dlegacy-rdnn=true
+      - -Dprofile=legacy-rdnn
+      - -Dicon-variant=default
     sources:
       - type: dir
         path: .

io.github.elly_code.jorts.devel.yml

@@ -23,8 +23,8 @@ modules:
   - name: jorts
     buildsystem: meson
     config-opts:
-      - -Dvariant=default
-      - -Ddevelopment=true
+      - -Dprofile=development
+      - -Dicon-variant=default
     sources:
       - type: dir
         path: .

io.github.elly_code.jorts.yml

@@ -21,7 +21,7 @@ modules:
   - name: jorts
     buildsystem: meson
     config-opts:
-      - -Dvariant=default
+      - -Dicon-variant=default
     sources:
       - type: dir
         path: .

meson.build

@@ -16,8 +16,9 @@ legacy_app_path = '/io/github/ellie_commons/' + app_name
 
 
 vala_flags = []
+profile = get_option('profile')
 
-if get_option('legacy-rdnn')
+if profile == 'legacy-rdnn'
     app_id = legacy_app_id
     alternate_app_id = correct_app_id
     app_path = legacy_app_path
@@ -30,20 +31,19 @@ else
     app_path = correct_app_path
 endif
 
-development_build = get_option('development')
-if development_build
+if profile == 'development'
   app_id +=  '.devel'
   vala_flags += ['--define', 'DEVEL']
   vala_flags += ['--define', 'LATTE']
 endif
 
 #================================
 # Cool icon variants
-variant = get_option('variant')
+icon_variant = get_option('icon-variant')
 
-if variant == 'pride'
+if icon_variant == 'pride'
     vala_flags += ['--define', 'PRIDE']
-elif variant == 'halloween'
+elif icon_variant == 'halloween'
     vala_flags += ['--define', 'HALLOWEEN']
 else
     vala_flags += ['--define', 'DEFAULT']

meson_options.txt

@@ -1,9 +1,13 @@
-option('variant',
+option('profile',
+    type : 'combo',
+    choices : ['release', 'development', 'legacy-rdnn'],
+    value : 'release',
+    description : 'Which profile to use for the app'
+)
+option('icon-variant',
     type : 'combo',
     choices : ['default', 'classic', 'pride', 'halloween', 'devel'],
     value : 'default',
     description : 'The name of the seasonal icon and style to use'
 )
-option('development', type: 'boolean', value: false, description: 'If this is a development build')
-option('legacy-rdnn', type: 'boolean', value: false, description: 'If this uses the legacy RDNN')
 option('windows_build', type: 'boolean', value: false, description: 'If this is a windows build. Switched on automatically on windows machines')