Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
rugby
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Joseph Walton-Rivers
rugby
Commits
0fddd186
Verified
Commit
0fddd186
authored
2 years ago
by
Bruce Cowan
Browse files
Options
Downloads
Patches
Plain Diff
Use combo for default-development profile
parent
ef3de424
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
build-aux/uk.me.bcowan.Rugby.yml
+1
-1
1 addition, 1 deletion
build-aux/uk.me.bcowan.Rugby.yml
meson.build
+4
-5
4 additions, 5 deletions
meson.build
meson_options.txt
+7
-1
7 additions, 1 deletion
meson_options.txt
src/main.c
+1
-1
1 addition, 1 deletion
src/main.c
with
13 additions
and
8 deletions
build-aux/uk.me.bcowan.Rugby.yml
+
1
−
1
View file @
0fddd186
...
...
@@ -28,4 +28,4 @@ modules:
-
type
:
git
url
:
https://git.fossgalaxy.com/SuborbitalPigeon/rugby.git
config_opts
:
-
"
-Ddevelopment
=true
"
-
"
-D
profile=
development"
This diff is collapsed.
Click to expand it.
meson.build
+
4
−
5
View file @
0fddd186
...
...
@@ -23,12 +23,11 @@ gtk_dep = dependency('gtk4', version: '>= 4.0')
libadwaita_dep
=
dependency
(
'libadwaita-1'
)
conf
=
configuration_data
()
conf
.
set_quoted
(
'VERSION'
,
'@VCS_TAG@'
)
devel
=
get_option
(
'
development
'
)
conf
.
set
10
(
'DEVELOPMENT'
,
devel
)
profile
=
get_option
(
'
profile
'
)
conf
.
set
_quoted
(
'PROFILE'
,
profile
)
if
devel
if
profile
==
'development'
conf
.
set_quoted
(
'VERSION'
,
'@0@-@VCS_TAG@'
.
format
(
meson
.
project_version
()))
else
conf
.
set_quoted
(
'VERSION'
,
meson
.
project_version
())
...
...
@@ -41,7 +40,7 @@ config_h = vcs_tag(
),
output
:
'config.h'
,
command
:
[
'git'
,
'rev-parse'
,
'--short'
,
'HEAD'
],
fallback
:
devel
?
'devel'
:
''
,
fallback
:
(
profile
==
'development'
)
?
'devel'
:
''
,
)
cflags
=
[
'-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66'
,
...
...
This diff is collapsed.
Click to expand it.
meson_options.txt
+
7
−
1
View file @
0fddd186
...
...
@@ -2,4 +2,10 @@
#
# SPDX-License-Identifier: CC0-1.0
option
(
'development'
,
type
:
'boolean'
,
value
:
true
,
description
:
'Is this a development build?'
)
option
(
'profile'
,
type
:
'combo'
,
choices
:
[
'default'
,
'development'
],
value
:
'default'
,
description
:
'What sort of build is this?'
)
This diff is collapsed.
Click to expand it.
src/main.c
+
1
−
1
View file @
0fddd186
...
...
@@ -17,7 +17,7 @@ on_activate ( GApplication *app,
if
(
!
window
)
window
=
GTK_WIDGET
(
rugby_app_window_new
(
GTK_APPLICATION
(
app
)));
if
(
DEVELOPMENT
)
if
(
g_strcmp0
(
PROFILE
,
"development"
)
==
0
)
gtk_widget_add_css_class
(
GTK_WIDGET
(
window
),
"devel"
);
gtk_window_present
(
GTK_WINDOW
(
window
));
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment