aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/commands_export.cpp
diff options
context:
space:
mode:
authorKonstantin Podsvirov <konstantin@podsvirov.pro>2017-08-28 13:54:19 +0300
committerKonstantin Podsvirov <konstantin@podsvirov.pro>2017-09-28 00:21:25 +0300
commitba0cc3f1d7edb7e2fee271761b2f37d0c740604f (patch)
treea09d75794d07bac01d6fbb832330188cb2654dc0 /toolsrc/src/commands_export.cpp
parentf160164219ab0c8422fdcefde3a3def89e5a59de (diff)
downloadvcpkg-ba0cc3f1d7edb7e2fee271761b2f37d0c740604f.tar.gz
vcpkg-ba0cc3f1d7edb7e2fee271761b2f37d0c740604f.zip
WIP: Export IFW
Add export to binary crossplatform repository/installer with GUI based on QtIFW: http://doc.qt.io/qtinstallerframework/ifw-overview.html For correct operation of these changes, you must use the corrected QtIFW: https://codereview.qt-project.org/#/c/203958
Diffstat (limited to 'toolsrc/src/commands_export.cpp')
-rw-r--r--toolsrc/src/commands_export.cpp57
1 files changed, 50 insertions, 7 deletions
diff --git a/toolsrc/src/commands_export.cpp b/toolsrc/src/commands_export.cpp
index b416a6f3c..139f19026 100644
--- a/toolsrc/src/commands_export.cpp
+++ b/toolsrc/src/commands_export.cpp
@@ -2,6 +2,7 @@
#include "Paragraphs.h"
#include "vcpkg_Commands.h"
+#include "vcpkg_Commands_Export_IFW.h"
#include "vcpkg_Dependencies.h"
#include "vcpkg_Input.h"
#include "vcpkg_System.h"
@@ -215,10 +216,12 @@ namespace vcpkg::Commands::Export
static const std::string OPTION_DRY_RUN = "--dry-run";
static const std::string OPTION_RAW = "--raw";
static const std::string OPTION_NUGET = "--nuget";
+ static const std::string OPTION_IFW = "--ifw";
static const std::string OPTION_ZIP = "--zip";
static const std::string OPTION_SEVEN_ZIP = "--7zip";
static const std::string OPTION_NUGET_ID = "--nuget-id";
static const std::string OPTION_NUGET_VERSION = "--nuget-version";
+ static const std::string OPTION_IFW_REPOSITORY_URL = "--ifw-repository-url";
// input sanitization
static const std::string EXAMPLE =
@@ -236,22 +239,25 @@ namespace vcpkg::Commands::Export
OPTION_DRY_RUN,
OPTION_RAW,
OPTION_NUGET,
+ OPTION_IFW,
OPTION_ZIP,
OPTION_SEVEN_ZIP,
},
{
OPTION_NUGET_ID,
OPTION_NUGET_VERSION,
+ OPTION_IFW_REPOSITORY_URL,
});
const bool dry_run = options.switches.find(OPTION_DRY_RUN) != options.switches.cend();
const bool raw = options.switches.find(OPTION_RAW) != options.switches.cend();
const bool nuget = options.switches.find(OPTION_NUGET) != options.switches.cend();
+ const bool ifw = options.switches.find(OPTION_IFW) != options.switches.cend();
const bool zip = options.switches.find(OPTION_ZIP) != options.switches.cend();
const bool seven_zip = options.switches.find(OPTION_SEVEN_ZIP) != options.switches.cend();
- if (!raw && !nuget && !zip && !seven_zip && !dry_run)
+ if (!raw && !nuget && !ifw && !zip && !seven_zip && !dry_run)
{
- System::println(System::Color::error, "Must provide at least one export type: --raw --nuget --zip --7zip");
+ System::println(System::Color::error, "Must provide at least one export type: --raw --nuget --ifw --zip --7zip");
System::print(EXAMPLE);
Checks::exit_fail(VCPKG_LINE_INFO);
}
@@ -263,6 +269,10 @@ namespace vcpkg::Commands::Export
Checks::check_exit(
VCPKG_LINE_INFO, !maybe_nuget_version || nuget, "--nuget-version is only valid with --nuget");
+ auto maybe_ifw_repository_url = maybe_lookup(options.settings, OPTION_IFW_REPOSITORY_URL);
+
+ Checks::check_exit(VCPKG_LINE_INFO, !maybe_ifw_repository_url || ifw, "--ifw-repository-url is only valid with --ifw");
+
// create the plan
const StatusParagraphs status_db = database_load_check(paths);
std::vector<ExportPlanAction> export_plan = Dependencies::create_export_plan(paths, specs, status_db);
@@ -305,7 +315,11 @@ namespace vcpkg::Commands::Export
Checks::exit_success(VCPKG_LINE_INFO);
}
- const std::string export_id = create_export_id();
+ std::string export_id = create_export_id();
+ if (ifw)
+ {
+ export_id = "vcpkg-export"; // TODO: Remove after debugging
+ }
Files::Filesystem& fs = paths.get_filesystem();
const fs::path export_to_path = paths.root;
@@ -315,6 +329,8 @@ namespace vcpkg::Commands::Export
fs.create_directory(raw_exported_dir_path, ec);
// execute the plan
+ std::map<std::string, const ExportPlanAction*> unique_packages;
+ std::set<std::string> unique_triplets;
for (const ExportPlanAction& action : export_plan)
{
if (action.plan_type != ExportPlanType::ALREADY_BUILT)
@@ -327,10 +343,21 @@ namespace vcpkg::Commands::Export
const BinaryParagraph& binary_paragraph =
action.any_paragraph.binary_control_file.value_or_exit(VCPKG_LINE_INFO).core_paragraph;
+
+ unique_packages[action.spec.name()] = &action;
+ unique_triplets.insert(action.spec.triplet().canonical_name());
+
+ fs::path spec_exported_dir_path = raw_exported_dir_path / "installed";
+ if (ifw)
+ {
+ // Export real package and return data dir for installation
+ spec_exported_dir_path = IFW::export_real_package(raw_exported_dir_path, action, fs);
+ }
+
const InstallDir dirs = InstallDir::from_destination_root(
- raw_exported_dir_path / "installed",
+ spec_exported_dir_path,
action.spec.triplet().to_string(),
- raw_exported_dir_path / "installed" / "vcpkg" / "info" / (binary_paragraph.fullstem() + ".list"));
+ spec_exported_dir_path / "vcpkg" / "info" / (binary_paragraph.fullstem() + ".list"));
Install::install_files_and_write_listfile(paths.get_filesystem(), paths.package_dir(action.spec), dirs);
System::println(System::Color::success, "Exporting package %s... done", display_name);
@@ -351,13 +378,29 @@ namespace vcpkg::Commands::Export
for (const fs::path& file : integration_files_relative_to_root)
{
const fs::path source = paths.root / file;
- const fs::path destination = raw_exported_dir_path / file;
+ fs::path destination = raw_exported_dir_path / file;
+ if (ifw)
+ {
+ destination = raw_exported_dir_path / "integration" / "data" / file;
+ }
fs.create_directories(destination.parent_path(), ec);
Checks::check_exit(VCPKG_LINE_INFO, !ec);
fs.copy_file(source, destination, fs::copy_options::overwrite_existing, ec);
Checks::check_exit(VCPKG_LINE_INFO, !ec);
}
+ if (ifw)
+ {
+ // Unigue packages
+ IFW::export_unique_packages(raw_exported_dir_path, unique_packages, fs);
+ // Unigue triplets
+ IFW::export_unique_triplets(raw_exported_dir_path, unique_triplets, fs);
+ // Integration
+ IFW::export_integration(raw_exported_dir_path, fs);
+ // Configuration
+ IFW::export_config(raw_exported_dir_path, maybe_ifw_repository_url.value_or(""), fs);
+ }
+
const auto print_next_step_info = [](const fs::path& prefix) {
const fs::path cmake_toolchain = prefix / "scripts" / "buildsystems" / "vcpkg.cmake";
const CMakeVariable cmake_variable =
@@ -417,7 +460,7 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console
print_next_step_info("[...]");
}
- if (!raw)
+ if (!raw && !ifw)
{
fs.remove_all(raw_exported_dir_path, ec);
}