diff --git a/meson.build b/meson.build index 528ea0d..fe4fe8f 100644 --- a/meson.build +++ b/meson.build @@ -148,8 +148,6 @@ global_conf.set ( 'PACKAGES_DIR', get_option ('packages-dir')) global_conf.set ( 'PDF_DIR', get_option ('pdf-dir')) -global_conf.set ( - 'MANUALS_ZIP_FILE', get_option ('manuals-zip-file')) global_conf.set ( 'GET_PKG_FILENAME_SH_PATH', meson.build_root () / 'scripts/get_pkg_filename.sh') diff --git a/meson_options.txt b/meson_options.txt index c49f4cf..69d392f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -122,8 +122,3 @@ option ( 'pdf-dir', type: 'string', value: '/tmp/pdf', description: 'Dir holding each manual PDF (for GNU/Linux zip)') - -option ( - 'manuals-zip-file', type: 'string', - value: '/tmp/manuals.zip', - description: 'Zip file containing manuals (for Windows and MacOS installers)') diff --git a/osx-brew/make_pkg.sh.in b/osx-brew/make_pkg.sh.in index d3809da..e0b528f 100755 --- a/osx-brew/make_pkg.sh.in +++ b/osx-brew/make_pkg.sh.in @@ -33,7 +33,6 @@ uninstall_sh="${11}" info_plist="${12}" dash_trial="@DASH_TRIAL@" -manuals_zip="@MANUALS_ZIP_FILE@" breeze_dark="@BREEZE_DARK@" zrythm_pkg_ver="@ZRYTHM_PKG_VERSION@" zrythm_product_ver="@ZRYTHM_PRODUCT_VERSION@" @@ -215,14 +214,6 @@ work_dir=`mktemp -d` mkdir $work_dir/$inner_dir_name cp $inner_dir/macOS-x64/target/pkg/Zrythm-macos-installer-x64-$zrythm_product_ver.pkg $work_dir/$inner_dir_name -if [ "$dash_trial" != "-trial" ] && [ "$is_tag" = "true" ]; then - echo "adding user manuals" ; - if [ -f "$manuals_zip" ]; then - unzip -o $manuals_zip -d $work_dir/$inner_dir_name/ ; - else - echo "no user manuals found, skipping..." - fi -fi pushd $work_dir zip -r $inner_dir_name.zip $inner_dir_name popd diff --git a/scripts/make_arch_pkg.sh.in b/scripts/make_arch_pkg.sh.in index dccd058..40b14e8 100755 --- a/scripts/make_arch_pkg.sh.in +++ b/scripts/make_arch_pkg.sh.in @@ -32,7 +32,7 @@ mkdir -p $private_dir cp $pkgbuild $private_dir/ cp $zrythm_src_tarball $private_dir/ -# build manuals +# build pushd $private_dir makepkg -f popd diff --git a/scripts/make_nixos_pkg.sh.in b/scripts/make_nixos_pkg.sh.in index d94ad9b..eae6de0 100755 --- a/scripts/make_nixos_pkg.sh.in +++ b/scripts/make_nixos_pkg.sh.in @@ -30,7 +30,7 @@ tempdir=`mktemp -d` cp $pkgbuild $tempdir/ cp $zrythm_src_tarball $tempdir/ -# build manuals +# build pushd $tempdir makepkg -f popd $tempdir diff --git a/tools/gen_osx_installer.sh b/tools/gen_osx_installer.sh index 07e5009..9ae9fda 100755 --- a/tools/gen_osx_installer.sh +++ b/tools/gen_osx_installer.sh @@ -265,12 +265,6 @@ cp $zrythm_src_dir/README.md $Doc/ cp $zrythm_src_dir/COPYING* $Doc/ brew list --versions -1 -v > $Doc/THIRDPARTY_INFO.txt -# add user manuals if not trial -if ! [[ "$app_name_w_spaces" == *"rial"* ]]; then - echo "packaging user manuals from $manual_zip_path" ; - unzip -o $manual_zip_path -d $Doc/ ; -fi - # remove unnecessary files rm -f $Lib/$GDK_PIXBUF_DIR/loaders/*.a rm $Lib/$GDK_PIXBUF_DIR/loaders.cache-e diff --git a/windows-msys/make_dist_dir.sh.in b/windows-msys/make_dist_dir.sh.in index 60f9015..3c8edfb 100755 --- a/windows-msys/make_dist_dir.sh.in +++ b/windows-msys/make_dist_dir.sh.in @@ -26,8 +26,7 @@ private_dir="$4" copy_dll_deps_sh="$5" rcedit_x64_exe="$6" dll_dir="$7" -manuals_zip="$8" -breeze_dark_path="$9" +breeze_dark_path="$8" dash_trial="@DASH_TRIAL@" zrythm_pkg_ver="@ZRYTHM_PKG_VERSION@" @@ -110,14 +109,6 @@ EOL # ****************************** - # ****************************** - if [ "$dash_trial" != "-trial" ] && [ "$is_tag" = "true" ]; then - echo "packaging user manuals" ; - unzip -o $manuals_zip -d $dist_dir/ ; - fi - - # ****************************** - # ****************************** cp -R $chroot_mingw_prefix/etc/fonts $dist_etcdir diff --git a/windows-msys/meson.build b/windows-msys/meson.build index ff5eded..d824072 100644 --- a/windows-msys/meson.build +++ b/windows-msys/meson.build @@ -409,11 +409,11 @@ installer_dist_dir = custom_target ( ], command: [ bash, '-c', - '@INPUT0@ "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"', + '@INPUT0@ "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8"', '_ignored', '@OUTPUT@', '@INPUT1@', chroot_dir, '@PRIVATE_DIR@', '@INPUT2@', '@INPUT3@', - '@INPUT4@', get_option ('manuals-zip-file'), '@INPUT5@', + '@INPUT4@', '@INPUT5@', ], console: true, install: false,