view scripts/pkg/module.mk @ 21615:9ccd64201b4d

pkg: remove excessive number of private function files. pkg() makes use of many subfunctions, themselves with several subfunctions. They used to all be in a single file which became difficult to hack so it was split into one file per function (even though they all remained private). This change merges some of those functions back together so that only the functions used by pkg itself, as well as subfunctions used by more than one of those, remain as separate files. * copy_built_files.m, copy_files.m, create_pkgadddel.m, extract_pkg.m, finish_installation.m, generate_lookfor_cache.m, prepare_installation.m, verify_directory.m: merged this functions into install.m since they are only used by it. * fix_depends.m, fix_version.m: merged this functions into get_description.m since they are only used by it. * getarchprefix.m: merged into create_pkgadddel.m which then got merged into install.m. * is_architecture_dependent.m: merged into copy_built_files.m which then got merged into install.m. * load_package_dirs.m: merged into load_packages_and_dependencies.m * packinfo_copy_file.m, write_index.m: merged into copy_files.m which then then got merged into install.m. * parse_pkg_idx, print_package_description.m: merged into describe.m * shell.m: merged into configure_make.m * pkg/module.mk: update with removed files.
author Carnë Draug <carandraug@octave.org>
date Tue, 12 Apr 2016 17:46:20 +0100
parents 2ee20a290d61
children 8308417aff1c
line wrap: on
line source

FCN_FILE_DIRS += \
  scripts/pkg \
  scripts/pkg/private

scripts_pkg_PRIVATE_FCN_FILES = \
  scripts/pkg/private/build.m \
  scripts/pkg/private/configure_make.m \
  scripts/pkg/private/default_prefix.m \
  scripts/pkg/private/describe.m \
  scripts/pkg/private/dirempty.m \
  scripts/pkg/private/get_description.m \
  scripts/pkg/private/get_forge_download.m \
  scripts/pkg/private/get_forge_pkg.m \
  scripts/pkg/private/getarch.m \
  scripts/pkg/private/getarchdir.m \
  scripts/pkg/private/get_unsatisfied_deps.m \
  scripts/pkg/private/install.m \
  scripts/pkg/private/installed_packages.m \
  scripts/pkg/private/list_forge_packages.m \
  scripts/pkg/private/load_packages.m \
  scripts/pkg/private/load_packages_and_dependencies.m \
  scripts/pkg/private/rebuild.m \
  scripts/pkg/private/save_order.m \
  scripts/pkg/private/uninstall.m \
  scripts/pkg/private/unload_packages.m

scripts_pkg_FCN_FILES = scripts/pkg/pkg.m

scripts_pkgdir = $(fcnfiledir)/pkg

scripts_pkg_DATA = $(scripts_pkg_FCN_FILES)

scripts_pkg_privatedir = $(fcnfiledir)/pkg/private

scripts_pkg_private_DATA = $(scripts_pkg_PRIVATE_FCN_FILES)

FCN_FILES += \
  $(scripts_pkg_FCN_FILES) \
  $(scripts_pkg_PRIVATE_FCN_FILES)

PKG_ADD_FILES += scripts/pkg/PKG_ADD

DIRSTAMP_FILES += scripts/pkg/$(octave_dirstamp)