From d553dee079cbb82385df2bfaf546e6209755f94d Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Mon, 7 Sep 2020 18:07:06 +0100 Subject: [PATCH] update debian build --- debian/meson.build | 41 +++++++++++++++++++++++++++++++++++++--- debian/rules.in | 9 +++++---- meson.build | 7 +++---- scripts/make_carla.sh.in | 5 ++++- windows-msys/meson.build | 35 +++++++++++++++++----------------- 5 files changed, 68 insertions(+), 29 deletions(-) diff --git a/debian/meson.build b/debian/meson.build index 5086435..25e3f12 100644 --- a/debian/meson.build +++ b/debian/meson.build @@ -14,22 +14,57 @@ # # You should have received a copy of the GNU Affero General Public License # along with Zrythm. If not, see . +debian_conf = configuration_data () +debian_conf.set ( + 'MESON_BIN', meson_bin) +debian_conf.set ( + 'BASH', bash.full_path ()) +debian_conf.set ( + 'DASH_TRIAL', dash_trial) +debian_conf.set ( + 'ZPLUGINS_VER', zplugins_ver) +debian_conf.set ( + 'ZRYTHM_PKG_VERSION', zrythm_pkg_ver) +debian_conf.set ( + 'TRIAL_TRUE_FALSE', trial_true_false) +debian_conf.set ( + 'ZRYTHM_INNER_DIR_NAME', zrythm_inner_dir_name) +debian_conf.set ( + 'ZRYTHM_SOURCE_TARBALL_FILENAME', + zrythm_src_tarball_filename) +debian_conf.set ( + 'CARLA_DESTDIR', + carla_installation.full_path ()) +debian_conf.set ( + 'CARLA_PKG_CONFIG_PATH', + carla_installation.full_path () + carla_prefix / 'lib/pkgconfig') +debian_conf.set ( + 'CARLA_PREFIX', carla_prefix) +debian_conf.set ( + 'CARLA_FULL_BINS_PATH', carla_installation.full_path () + carla_prefix / 'lib/carla') +debian_conf.set ( + 'BUILT_ZPLUGINS_DIR', + zplugins_installation.full_path ()) +debian_conf.set ('LIBDIR', libdir) +debian_conf.set ( + 'LIBRARY_PKG_CONFIG_PATH', + library_pkgconfig_path) # configure files debian_changelog = configure_file ( output: 'changelog', input: 'changelog.in', - configuration: global_conf, + configuration: debian_conf, ) debian_control = configure_file ( output: 'control', input: 'control.in', - configuration: global_conf, + configuration: debian_conf, ) debian_rules = configure_file ( output: 'rules', input: 'rules.in', - configuration: global_conf, + configuration: debian_conf, ) # sources diff --git a/debian/rules.in b/debian/rules.in index 53d59df..fdfd173 100644 --- a/debian/rules.in +++ b/debian/rules.in @@ -9,14 +9,15 @@ override_dh_auto_configure: cd debian/build && \ PATH=$$PATH:/home/build/.local/bin \ @MESON_BIN@ --prefix=/usr ../.. \ - -Dpkg_config_path=@TEMP_LIBRARY_PKG_CONFIG_PATH@:@TEMP_CARLA_PKG_CONFIG_PATH@ \ + -Dpkg_config_path=@LIBRARY_PKG_CONFIG_PATH@:@CARLA_PKG_CONFIG_PATH@ \ -Dtests=true -Ddseg_font=false -Dmanpage=true \ -Dbuildtype=debugoptimized -Dlsp_dsp=enabled \ -Dstatic_lsp_dsp=true -Dsdl=enabled \ -Dfallback_version=@ZRYTHM_PKG_VERSION@ \ -Drtaudio=auto -Drtmidi=auto -Dguile=enabled \ -Dcarla=enabled -Dgraphviz=enabled \ - -Dtrial_ver=@TRIAL_TRUE_FALSE@ + -Dtrial_ver=@TRIAL_TRUE_FALSE@ \ + -Dcarla_binaries_dir=@CARLA_FULL_BINS_PATH@ override_dh_auto_build: cd debian/build && ninja -v @@ -28,8 +29,8 @@ override_dh_auto_install: cd debian/build && \ DESTDIR=${CURDIR}/debian/zrythm@DASH_TRIAL@ ninja install mkdir -p ${CURDIR}/debian/zrythm@DASH_TRIAL@/usr/lib/zrythm/lib/lv2 - cp -RLv @TEMP_CARLA_PREFIX@/@LIBDIR@/carla \ + cp -RLv @CARLA_FULL_BINS_PATH@ \ ${CURDIR}/debian/zrythm@DASH_TRIAL@/usr/lib/zrythm/lib/ cp -RLv @BUILT_ZPLUGINS_DIR@/* \ ${CURDIR}/debian/zrythm@DASH_TRIAL@/usr/lib/zrythm/lib/lv2/ - if [ ! -f ${CURDIR}/debian/zrythm@DASH_TRIAL@/usr/lib/zrythm/lib/carla/libcarla_native-plugin.so ] ; then exit 1 ; fi + if [ ! -f ${CURDIR}/debian/zrythm@DASH_TRIAL@/usr/lib/zrythm/lib/carla/libcarla-host-plugin.so ] ; then exit 1 ; fi diff --git a/meson.build b/meson.build index 3a59ff4..002173e 100644 --- a/meson.build +++ b/meson.build @@ -108,7 +108,8 @@ global_conf.set ( global_conf.set ( 'LIBRARY_PREFIX', library_prefix) global_conf.set ( - 'LIBRARY_PKG_CONFIG_PATH', library_pkgconfig_path) + 'LIBRARY_PKG_CONFIG_PATH', + library_pkgconfig_path) global_conf.set ( 'CARLA_PREFIX', carla_prefix) global_conf.set ('DASH_TRIAL', dash_trial) @@ -143,9 +144,6 @@ global_conf.set ( global_conf.set ( 'GET_PKG_FILENAME_SH_PATH', meson.build_root () / 'scripts/get_pkg_filename.sh') -global_conf.set ( - 'BUILT_ZPLUGINS_DIR', - meson.current_build_dir () / 'built_zplugins') subdir ('scripts') subdir ('sources') @@ -233,6 +231,7 @@ summary ({ 'Git version': get_option ('zrythm-git-ver'), 'Package version': get_option ('zrythm-pkg-ver'), 'Build trial': get_option ('build-trial').to_string (), + 'Carla version': get_option ('carla-git-ver'), 'ZPlugins version': get_option ('zplugins-ver'), 'Locales': ' '.join (get_option ('locales')), 'Distro': get_option ('distro'), diff --git a/scripts/make_carla.sh.in b/scripts/make_carla.sh.in index 209ac03..1140203 100755 --- a/scripts/make_carla.sh.in +++ b/scripts/make_carla.sh.in @@ -2,7 +2,7 @@ set -ex -out_dir="$1" +out_dir="`pwd`/$1" carla_source_zip="$2" private_dir="$3" prefix="$4" @@ -24,3 +24,6 @@ cd "$private_dir/Carla-$carla_git_ver" make features make -j4 make install DESTDIR="$out_dir" PREFIX="$prefix" LIBDIR=$prefix/lib +sudo cp -Rv "$out_dir/$prefix"/* "$prefix"/ + +ls -l "$out_dir" diff --git a/windows-msys/meson.build b/windows-msys/meson.build index 2a945dd..0e107d9 100644 --- a/windows-msys/meson.build +++ b/windows-msys/meson.build @@ -141,23 +141,6 @@ rcedit_x64_exe = custom_target ( ) # install dependencies -independent_dep_names = [ - 'jack2', 'lsp-dsp-lib' - ] -independent_deps = [] -foreach dep_name : independent_dep_names - independent_deps += custom_target ( - 'mingw-' + dep_name, - output: dep_name + '.pkg.tar.zst', - input: [ - make_mingw_pkg, - 'PKGBUILD-' + dep_name + '-mingw', - ], - command: make_mingw_pkg_cmd, - console: true, - install: false, - ) -endforeach carla_packages = [] foreach arch : [ '64' ] carla_packages += custom_target ( @@ -180,6 +163,24 @@ carla_packages += custom_target ( install: false, ) endforeach +independent_dep_names = [ + 'jack2', 'lsp-dsp-lib' + ] +independent_deps = [] +foreach dep_name : independent_dep_names + independent_deps += custom_target ( + 'mingw-' + dep_name, + output: dep_name + '.pkg.tar.zst', + input: [ + make_mingw_pkg, + 'PKGBUILD-' + dep_name + '-mingw', + ], + command: make_mingw_pkg_cmd, + depends: carla_packages[0], + console: true, + install: false, + ) +endforeach lv2_pkg = custom_target ( 'mingw-lv2', output: 'lv2.pkg.tar.zst',