zrythm
/
zrythm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

meson: add release_ver flag

export_samplerate
Alexandros Theodotou 3 years ago
parent
0220304a6e
commit
cf8af49ba8
Signed by: alex
GPG Key ID: 022EAE42313D70F3
10 changed files with 77 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      data/meson.build
  2. 3
      doc/dev/meson.build
  3. 4
      ext/midilib/meson.build
  4. 2
      inc/utils/io.h
  5. 93
      meson.build
  6. 8
      meson_options.txt
  7. 3
      src/guile/meson.build
  8. 4
      src/utils/io.c
  9. 2
      src/utils/localization.c
  10. 18
      src/zrythm.c

11
data/meson.build
Unescape View File

@ -28,7 +28,7 @@ gschema = configure_file ( @@ -28,7 +28,7 @@ gschema = configure_file (
# install fonts if needed
if get_option('dseg_font')
install_subdir (
join_paths ('fonts', 'DSEG14-Classic-MINI'),
'fonts/DSEG14-Classic-MINI',
install_dir: fontsdir)
endif
@ -67,10 +67,8 @@ if os_gnu or os_freebsd @@ -67,10 +67,8 @@ if os_gnu or os_freebsd
type: 'desktop',
po_dir: '../po',
install: true,
install_dir: join_paths (
datadir,
'applications'),
)
install_dir: datadir / 'applications',
)
desktop_utils = find_program (
'desktop-file-validate', required: false)
if desktop_utils.found()
@ -90,8 +88,7 @@ install_data ( @@ -90,8 +88,7 @@ install_data (
if not os_windows
install_data (
'zrythm-completion.bash',
install_dir: join_paths (
sysconfdir, 'bash_completion.d'),
install_dir: sysconfdir / 'bash_completion.d',
install_mode: 'r--r--r--',
rename: prog_name_lowercase)
endif

3
doc/dev/meson.build
Unescape View File

@ -34,8 +34,7 @@ if dot_bin.found() @@ -34,8 +34,7 @@ if dot_bin.found()
doxyfile,
doxyfile_mcss,
zrythm_srcs,
join_paths (meson.source_root(),
'CONTRIBUTING.md'),
meson.source_root() / 'CONTRIBUTING.md',
'mainpage.h',
'cyaml_schemas.h',
'gtk_tips.md',

4
ext/midilib/meson.build vendored
Unescape View File

@ -24,8 +24,8 @@ endif @@ -24,8 +24,8 @@ endif
midilib = static_library (
'midilib',
join_paths ('src', 'midifile.c'),
join_paths ('src', 'midiutil.c'),
'src/midifile.c',
'src/midiutil.c',
c_args: [
endianess_flag,
],

2
inc/utils/io.h
Unescape View File

@ -165,7 +165,7 @@ io_get_registry_string_val ( @@ -165,7 +165,7 @@ io_get_registry_string_val (
const char * path);
#endif
#ifdef MAC_RELEASE
#if defined (__APPLE__) && defined (INSTALLER_VER)
/**
* Gets the bundle path on MacOS.
*

93
meson.build
Unescape View File

@ -37,14 +37,14 @@ cmake_opts = cmake.subproject_options () @@ -37,14 +37,14 @@ cmake_opts = cmake.subproject_options ()
cmake_opts.add_cmake_defines ({'CMAKE_POSITION_INDEPENDENT_CODE': 'ON'})
prefix = get_option ('prefix')
bindir = join_paths (prefix, get_option('bindir'))
libdir = join_paths (prefix, get_option ('libdir'))
libexecdir = join_paths (prefix, get_option ('libexecdir'))
includedir = join_paths (prefix, get_option('includedir'))
datadir = join_paths (prefix, get_option('datadir'))
sysconfdir = join_paths (prefix, get_option('sysconfdir'))
mandir = join_paths (datadir, 'man', 'man1')
schemasdir = join_paths (datadir, 'glib-2.0/schemas')
bindir = prefix / get_option ('bindir')
libdir = prefix / get_option ('libdir')
libexecdir = prefix / get_option ('libexecdir')
includedir = prefix / get_option ('includedir')
datadir = prefix / get_option ('datadir')
sysconfdir = prefix / get_option ('sysconfdir')
mandir = datadir / 'man' / 'man1'
schemasdir = datadir / 'glib-2.0/schemas'
fontsdir = datadir / 'fonts' / prog_name_lowercase
zrythmdatadir = datadir / prog_name_lowercase
themesdir = zrythmdatadir / 'themes'
@ -107,7 +107,8 @@ cdata.set_quoted ('CONFIGURE_DATADIR', datadir) @@ -107,7 +107,8 @@ cdata.set_quoted ('CONFIGURE_DATADIR', datadir)
cdata.set_quoted (
'CONFIGURE_SOURCEVIEW_STYLES_DIR',
sourceviewstylesdir)
cdata.set_quoted ('CONFIGURE_THEMES_DIR', themesdir)
cdata.set_quoted (
'CONFIGURE_THEMES_DIR', themesdir)
cdata.set_quoted (
'LIBDIR_NAME', get_option ('libdir'))
cdata.set_quoted ('CONFIGURE_LIBDIR', libdir)
@ -117,15 +118,15 @@ cdata.set_quoted ('BIN_SUFFIX', bin_suffix) @@ -117,15 +118,15 @@ cdata.set_quoted ('BIN_SUFFIX', bin_suffix)
cdata.set_quoted ('GSCHEMAS_DIR', schemasdir)
cdata.set_quoted (
'BUILD_TYPE', get_option ('buildtype'))
cdata.set_quoted (
'INSTALLER_VERSION_STR',
get_option ('buildtype'))
if get_option ('trial_ver')
cdata.set ('TRIAL_VER', 1)
cdata.set ('TRIAL_LIMIT_MINS', 30)
endif
if get_option ('windows_release')
cdata.set ('WINDOWS_RELEASE', 1)
endif
if get_option ('mac_release')
cdata.set ('MAC_RELEASE', 1)
if get_option ('installer_ver')
cdata.set ('INSTALLER_VER', 1)
endif
cdata.set (
'MESON_SOURCE_ROOT',
@ -152,16 +153,11 @@ endif @@ -152,16 +153,11 @@ endif
root_inc = include_directories ('.')
inc_inc = include_directories ('inc')
ext_inc = include_directories ('ext')
midilib_inc = include_directories (
join_paths ('ext', 'midilib'))
whereami_inc = include_directories (
join_paths ('ext', 'whereami'))
zix_inc = include_directories (
join_paths ('ext', 'zix'))
weakjack_inc = include_directories (
join_paths ('ext', 'weakjack'))
suil_inc = include_directories (
join_paths ('inc', 'plugins', 'lv2'))
midilib_inc = include_directories ('ext/midilib')
whereami_inc = include_directories ('ext/whereami')
zix_inc = include_directories ('ext/zix')
weakjack_inc = include_directories ('ext/weakjack')
suil_inc = include_directories ('inc/plugins/lv2')
all_inc = [
root_inc,
inc_inc,
@ -173,10 +169,8 @@ all_inc = [ @@ -173,10 +169,8 @@ all_inc = [
suil_inc,
]
resources_dir = join_paths (
meson.source_root (), 'resources')
data_dir = join_paths (
meson.source_root (), 'data')
resources_dir = meson.source_root () / 'resources'
data_dir = meson.source_root () / 'data'
cc = meson.get_compiler ('c')
@ -190,15 +184,32 @@ dot_bin = find_program ('dot', required: false) @@ -190,15 +184,32 @@ dot_bin = find_program ('dot', required: false)
# find plugins for testing
ext_lv2_plugins = {
'ams_lfo': ['AMS LFO', 'http://github.com/blablack/ams-lv2/lfo'],
'helm': ['Helm', 'http://tytel.org/helm'],
'sherlock_atom_inspector': ['Sherlock Atom Inspector', 'http://open-music-kontrollers.ch/lv2/sherlock#atom_inspector'],
'lsp_compressor': ['LSP Compressor', 'http://lsp-plug.in/plugins/lv2/compressor_stereo'],
'lsp_multisampler_24_do': ['LSP MultiSampler x24 Direct Out', 'http://lsp-plug.in/plugins/lv2/multisampler_x24_do'],
'carla_rack': ['Carla Rack', 'http://kxstudio.sf.net/carla/plugins/carlarack'],
'no_delay_line': ['No Delay Line', 'http://gareus.org/oss/lv2/nodelay'],
'mda_ambience': ['mda Ambience', 'http://drobilla.net/plugins/mda/Ambience'],
'midi_cc_map': ['MIDI CC Map', 'http://gareus.org/oss/lv2/midifilter#mapcc'],
'ams_lfo': [
'AMS LFO',
'http://github.com/blablack/ams-lv2/lfo'],
'helm': [
'Helm', 'http://tytel.org/helm'],
'sherlock_atom_inspector': [
'Sherlock Atom Inspector',
'http://open-music-kontrollers.ch/lv2/sherlock#atom_inspector'],
'lsp_compressor': [
'LSP Compressor',
'http://lsp-plug.in/plugins/lv2/compressor_stereo'],
'lsp_multisampler_24_do': [
'LSP MultiSampler x24 Direct Out',
'http://lsp-plug.in/plugins/lv2/multisampler_x24_do'],
'carla_rack': [
'Carla Rack',
'http://kxstudio.sf.net/carla/plugins/carlarack'],
'no_delay_line': [
'No Delay Line',
'http://gareus.org/oss/lv2/nodelay'],
'mda_ambience': [
'mda Ambience',
'http://drobilla.net/plugins/mda/Ambience'],
'midi_cc_map': [
'MIDI CC Map',
'http://gareus.org/oss/lv2/midifilter#mapcc'],
}
have_ext_lv2_plugins = {}
ext_lv2_plugin_bundles = {}
@ -215,6 +226,7 @@ if get_option ('tests') @@ -215,6 +226,7 @@ if get_option ('tests')
'tools/get_lv2_bundle_uri.sh')
get_vst_path_bin = find_program (
'tools/get_vst_path.sh')
# get lv2 bundle paths
if lv2ls_bin.found () and lv2info_bin.found ()
lv2ls_res = run_command (
lv2ls_bin, check: true).stdout ()
@ -233,6 +245,7 @@ if get_option ('tests') @@ -233,6 +245,7 @@ if get_option ('tests')
endif
endforeach
endif
# get vst plugin paths
if get_vst_path_bin.found ()
foreach name, filename : ext_vst_plugins
have_ext_vst = run_command (
@ -254,8 +267,7 @@ endif @@ -254,8 +267,7 @@ endif
# find command to open a directory
if os_gnu or os_freebsd
open_dir_cmd = 'xdg-open'
find_program (open_dir_cmd)
open_dir_cmd = find_program ('xdg-open').full_path ()
elif os_darwin
open_dir_cmd = 'open'
find_program (open_dir_cmd)
@ -1012,6 +1024,7 @@ summary ({ @@ -1012,6 +1024,7 @@ summary ({
'Install DSEG font': get_option ('dseg_font'),
'Custom logo and splash': get_option ('custom_logo_and_splash'),
'Trial version': get_option ('trial_ver'),
'Installer version': get_option ('installer_ver'),
}, section: 'General')
summary ({
@ -1019,7 +1032,7 @@ summary ({ @@ -1019,7 +1032,7 @@ summary ({
'Carla': have_carla,
'GraphViz': have_graphviz,
'Guile': have_guile,
'Jack': have_jack,
'JACK': have_jack,
'SoundIO': have_libsoundio,
'LSP DSP': have_lsp_dsp,
'PortAudio': portaudio_dep.found (),

8
meson_options.txt
Unescape View File

@ -120,13 +120,7 @@ transport meters. Packagers should turn this off and @@ -120,13 +120,7 @@ transport meters. Packagers should turn this off and
set the font as a dependency instead''')
option (
'windows_release',
type: 'boolean',
value: false,
description: 'This is only used when making the installers')
option (
'mac_release',
'installer_ver',
type: 'boolean',
value: false,
description: 'This is only used when making the installers')

3
src/guile/meson.build
Unescape View File

@ -16,8 +16,7 @@ @@ -16,8 +16,7 @@
# along with Zrythm. If not, see <https://www.gnu.org/licenses/>.
guile_snarfable_srcs = [
join_paths (
meson.current_source_dir(), 'zrythm.c'),
meson.current_source_dir() / 'zrythm.c',
]
subdir ('actions')

4
src/utils/io.c
Unescape View File

@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
#include <glib/gstdio.h>
#include <gtk/gtk.h>
#ifdef MAC_RELEASE
#if defined (__APPLE__) && defined (INSTALLER_VER)
#include "CoreFoundation/CoreFoundation.h"
#include <unistd.h>
#include <libgen.h>
@ -608,7 +608,7 @@ io_get_registry_string_val ( @@ -608,7 +608,7 @@ io_get_registry_string_val (
}
#endif
#ifdef MAC_RELEASE
#if defined (__APPLE__) && defined (INSTALLER_VER)
/**
* Gets the bundle path on MacOS.
*

2
src/utils/localization.c
Unescape View File

@ -289,7 +289,7 @@ localization_init ( @@ -289,7 +289,7 @@ localization_init (
}
/* bind text domain */
#if defined(WINDOWS_RELEASE)
#if defined (_WOE32) && defined (INSTALLER_VER)
bindtextdomain (GETTEXT_PACKAGE, "share/locale");
#else
char * localedir =

18
src/zrythm.c
Unescape View File

@ -202,7 +202,7 @@ zrythm_get_version_with_capabilities ( @@ -202,7 +202,7 @@ zrythm_get_version_with_capabilities (
sprintf (
str,
"%s %s%s (%s)\n"
" built with %s %s for %s\n"
" built with %s %s for %s%s\n"
#ifdef HAVE_CARLA
" +carla\n"
#endif
@ -227,14 +227,18 @@ zrythm_get_version_with_capabilities ( @@ -227,14 +227,18 @@ zrythm_get_version_with_capabilities (
"",
PROGRAM_NAME,
#ifdef TRIAL_VER
/* TRANSLATORS: please keep the space at the
* end */
_("(trial) "),
"(trial) ",
#else
"",
#endif
ver, BUILD_TYPE,
COMPILER, COMPILER_VERSION, HOST_MACHINE_SYSTEM);
COMPILER, COMPILER_VERSION, HOST_MACHINE_SYSTEM,
#ifdef INSTALLER_VER
" (installer)"
#else
""
#endif
);
g_free (ver);
}
@ -252,10 +256,10 @@ zrythm_get_version_with_capabilities ( @@ -252,10 +256,10 @@ zrythm_get_version_with_capabilities (
char *
zrythm_get_prefix (void)
{
#ifdef WINDOWS_RELEASE
#if defined (_WOE32) && defined (INSTALLER_VER)
return
io_get_registry_string_val ("InstallPath");
#elif defined(MAC_RELEASE)
#elif defined (__APPLE__) && defined (INSTALLER_VER)
char bundle_path[PATH_MAX];
int ret = io_get_bundle_path (bundle_path);
g_return_val_if_fail (ret == 0, NULL);

Write Preview
Loading…
Cancel
Save