aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authornicole mazzuca <mazzucan@outlook.com>2020-08-02 10:08:07 -0700
committerGitHub <noreply@github.com>2020-08-02 10:08:07 -0700
commit1c2af994151fb3e177df54f89223b056ecddbcec (patch)
tree263cdf1db448c2a0610191922c7c6036c4a4b366 /ports
parentc0f23c6c31ea7af5a751ea48a043dc64a872f4a0 (diff)
downloadvcpkg-1c2af994151fb3e177df54f89223b056ecddbcec.tar.gz
vcpkg-1c2af994151fb3e177df54f89223b056ecddbcec.zip
[vcpkg format-manifest] Add convert-control flag (#12471)
* [vcpkg format-manifest] initial convert-control attempt TODO: manifest comments! we should keep $directives * Finalize x-format-manifest First, fix Json::parse -- "\c", for any c, was incorrectly parsed. It would emit the escaped character, and then parse the character, so that `\b` would give you { '\b', 'b' }. Second, canonicalize source paragraphs as we're parsing them. This found an error in qt5 -- The `declarative` feature was listed twice, and we now catch it, so I removed the second paragraph. Add PlatformExpression::complexity to allow ordering platform expressions in a somewhat reasonable way. Notes: - We allow `all_modules` as a feature name for back-compat with paraview - In order to actually convert CONTROL to vcpkg.json, we'd need to rename the qt5 `default` feature. - We need to add support for $directives in x-format-manifest * fix qt5 port * format * fix compile * fix tests for canonicalization * Clean up code * add error message for nothing to format * add extra_info field * add `const X&` overloads for `Object::insert[_or_replace]` * fix compile * simple CRs * add tests * format * Fix mosquitto port file also unmerge a line * fail the tests on malformed manifest * fix format_all * fix coroutine port-version * format manifests
Diffstat (limited to 'ports')
-rw-r--r--ports/3fd/vcpkg.json4
-rw-r--r--ports/abseil/vcpkg.json2
-rw-r--r--ports/argparse/vcpkg.json4
-rw-r--r--ports/avisynthplus/vcpkg.json2
-rw-r--r--ports/blend2d/vcpkg.json15
-rw-r--r--ports/coroutine/vcpkg.json6
-rw-r--r--ports/geographiclib/vcpkg.json2
-rw-r--r--ports/mosquitto/vcpkg.json2
-rw-r--r--ports/ogre/vcpkg.json18
-rw-r--r--ports/qt5/CONTROL75
10 files changed, 61 insertions, 69 deletions
diff --git a/ports/3fd/vcpkg.json b/ports/3fd/vcpkg.json
index f183916e6..92c53d327 100644
--- a/ports/3fd/vcpkg.json
+++ b/ports/3fd/vcpkg.json
@@ -16,7 +16,7 @@
"name": "poco",
"platform": "windows"
},
- "sqlite3",
- "rapidxml"
+ "rapidxml",
+ "sqlite3"
]
}
diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json
index cfc1022ea..4d4db866b 100644
--- a/ports/abseil/vcpkg.json
+++ b/ports/abseil/vcpkg.json
@@ -2,13 +2,13 @@
"name": "abseil",
"version-string": "2020-03-03",
"port-version": 7,
- "homepage": "https://github.com/abseil/abseil-cpp",
"description": [
"an open-source collection designed to augment the C++ standard library.",
"Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.",
"In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.",
"Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole."
],
+ "homepage": "https://github.com/abseil/abseil-cpp",
"features": [
{
"name": "cxx17",
diff --git a/ports/argparse/vcpkg.json b/ports/argparse/vcpkg.json
index 9137c655f..438522292 100644
--- a/ports/argparse/vcpkg.json
+++ b/ports/argparse/vcpkg.json
@@ -2,6 +2,6 @@
"name": "argparse",
"version-string": "2.1",
"description": "Argument parser for modern C++",
- "license": "MIT",
- "homepage": "https://github.com/p-ranav/argparse"
+ "homepage": "https://github.com/p-ranav/argparse",
+ "license": "MIT"
}
diff --git a/ports/avisynthplus/vcpkg.json b/ports/avisynthplus/vcpkg.json
index 1af0142ea..c8a8d77b0 100644
--- a/ports/avisynthplus/vcpkg.json
+++ b/ports/avisynthplus/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "avisynthplus",
"version-string": "3.6.0",
- "homepage": "http://avs-plus.net/",
"description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness",
+ "homepage": "http://avs-plus.net/",
"supports": "!(uwp | arm | static)"
}
diff --git a/ports/blend2d/vcpkg.json b/ports/blend2d/vcpkg.json
index e8940a0ee..0b9a3e48e 100644
--- a/ports/blend2d/vcpkg.json
+++ b/ports/blend2d/vcpkg.json
@@ -1,10 +1,15 @@
{
"name": "blend2d",
"version-string": "beta_2020-07-09",
- "port-version": 0,
"description": "Beta 2D Vector Graphics Powered by a JIT Compiler",
"homepage": "https://github.com/blend2d/blend2d",
"documentation": "https://blend2d.com/doc/index.html",
+ "supports": "!(arm | uwp)",
+ "default-features": [
+ "jit",
+ "logging",
+ "tls"
+ ],
"features": [
{
"name": "jit",
@@ -18,11 +23,5 @@
"name": "tls",
"description": "Default feature. Enables use of thread_local feature. Disable for platforms where thread local storage is expensive or not supported."
}
- ],
- "default-features": [
- "jit",
- "logging",
- "tls"
- ],
- "supports": "!(arm|uwp)"
+ ]
}
diff --git a/ports/coroutine/vcpkg.json b/ports/coroutine/vcpkg.json
index a391c0931..4e7134128 100644
--- a/ports/coroutine/vcpkg.json
+++ b/ports/coroutine/vcpkg.json
@@ -1,11 +1,11 @@
{
"name": "coroutine",
"version-string": "1.5.0",
- "port-version": "1",
+ "port-version": 1,
"description": "C++ 20 Coroutines helper/example library",
"homepage": "https://github.com/luncliff/coroutine",
+ "supports": "!uwp",
"dependencies": [
"ms-gsl"
- ],
- "supports": "!uwp"
+ ]
}
diff --git a/ports/geographiclib/vcpkg.json b/ports/geographiclib/vcpkg.json
index a60a5e7db..8ec469c90 100644
--- a/ports/geographiclib/vcpkg.json
+++ b/ports/geographiclib/vcpkg.json
@@ -1,8 +1,8 @@
{
"name": "geographiclib",
"version-string": "1.50.1",
- "homepage": "https://geographiclib.sourceforge.io",
"description": "GeographicLib, a C++ library for performing geographic conversions",
+ "homepage": "https://geographiclib.sourceforge.io",
"features": [
{
"name": "tools",
diff --git a/ports/mosquitto/vcpkg.json b/ports/mosquitto/vcpkg.json
index c53470491..2e3654754 100644
--- a/ports/mosquitto/vcpkg.json
+++ b/ports/mosquitto/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "mosquitto",
"version-string": "1.6.8",
- "port-version": "2",
+ "port-version": 2,
"description": "Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1, MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model, This makes it suitable for machine to machine messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino",
"homepage": "https://mosquitto.org/download/",
"dependencies": [
diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json
index d7f0fa276..133fb3cfb 100644
--- a/ports/ogre/vcpkg.json
+++ b/ports/ogre/vcpkg.json
@@ -6,27 +6,27 @@
"dependencies": [
"freeimage",
"freetype",
- "zlib",
- "zziplib",
- "sdl2",
- "pugixml",
{
"name": "imgui",
"features": [
"freetype"
]
- }
+ },
+ "pugixml",
+ "sdl2",
+ "zlib",
+ "zziplib"
],
"features": [
{
- "name": "d3d9",
- "description": "Build Direct3D9 RenderSystem"
- },
- {
"name": "csharp",
"description": "Build csharp bindings"
},
{
+ "name": "d3d9",
+ "description": "Build Direct3D9 RenderSystem"
+ },
+ {
"name": "java",
"description": "Build Java (JNI) bindings"
},
diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL
index 0f5121a28..2b06636e7 100644
--- a/ports/qt5/CONTROL
+++ b/ports/qt5/CONTROL
@@ -1,9 +1,10 @@
Source: qt5
Version: 5.15.0
+Port-Version: 1
Homepage: https://www.qt.io/
Description: Qt5 Application Framework
Build-Depends: qt5-base[core]
-Default-Features: essentials, default
+Default-Features: essentials
Feature: essentials
Build-Depends: qt5[core, tools, networkauth, quickcontrols2, multimedia, imageformats, declarative, svg, activeqt]
@@ -13,29 +14,25 @@ Feature: latest
Build-Depends: qt5-base[core, latest]
Description: Build latest qt version (5.14.2) instead of LTS
-Feature: default
-Build-Depends: qt5[core, 3d, webchannel, websockets, extras, sensors, serialport, speech, virtualkeyboard, purchasing, scxml, charts, datavis3d, gamepad, graphicaleffects, location, webglplugin, webview, translations, remoteobjects, connectivity]
-Description: Build the essential qt modules
-
Feature: all
Build-Depends: qt5[3d, webchannel, websockets, extras, xmlpatterns, sensors, serialport, speech, svg, tools, virtualkeyboard, networkauth, purchasing, quickcontrols, quickcontrols2, script, scxml, activeqt, charts, datavis3d, declarative, gamepad, graphicaleffects, imageformats, location, multimedia, mqtt, webglplugin, webview, serialbus, translations, doc, remoteobjects, connectivity], qt5[core,webengine] (!static), qt5[core,wayland] (!windows)
Description: Install all Qt5 submodules (Warning: Could take a long time and fail...)
Feature: extras
Build-Depends: qt5-winextras (windows), qt5-macextras (osx), qt5-x11extras (linux), qt5-androidextras (android)
-Description:
+Description:
Feature: 3d
Build-Depends: qt5-3d
-Description:
+Description:
Feature: webchannel
Build-Depends: qt5-webchannel
-Description:
+Description:
Feature: websockets
Build-Depends: qt5-websockets
-Description:
+Description:
Feature: xmlpatterns
Build-Depends: qt5-xmlpatterns
@@ -43,35 +40,35 @@ Description: (deprecated)
Feature: sensors
Build-Depends: qt5-sensors
-Description:
+Description:
Feature: serialport
Build-Depends: qt5-serialport
-Description:
+Description:
Feature: speech
Build-Depends: qt5-speech
-Description:
+Description:
Feature: svg
Build-Depends: qt5-svg
-Description:
+Description:
Feature: tools
Build-Depends: qt5-tools
-Description:
+Description:
Feature: virtualkeyboard
Build-Depends: qt5-virtualkeyboard
-Description:
+Description:
Feature: networkauth
Build-Depends: qt5-networkauth
-Description:
+Description:
Feature: purchasing
Build-Depends: qt5-purchasing
-Description:
+Description:
Feature: quickcontrols
Build-Depends: qt5-quickcontrols
@@ -79,7 +76,7 @@ Description: (deprecated)
Feature: quickcontrols2
Build-Depends: qt5-quickcontrols2
-Description:
+Description:
Feature: script
Build-Depends: qt5-script
@@ -87,7 +84,7 @@ Description: (deprecated)
Feature: scxml
Build-Depends: qt5-scxml
-Description:
+Description:
Feature: activeqt
Build-Depends: qt5-activeqt (windows)
@@ -95,76 +92,72 @@ Description: Windows Only
Feature: charts
Build-Depends: qt5-charts
-Description:
+Description:
Feature: datavis3d
Build-Depends: qt5-datavis3d
-Description:
+Description:
Feature: declarative
Build-Depends: qt5-declarative
-Description:
+Description:
Feature: gamepad
Build-Depends: qt5-gamepad
-Description:
+Description:
Feature: graphicaleffects
Build-Depends: qt5-graphicaleffects
-Description:
-
-Feature: declarative
-Build-Depends: qt5-declarative
-Description:
+Description:
Feature: imageformats
Build-Depends: qt5-imageformats
-Description:
+Description:
Feature: location
Build-Depends: qt5-location
-Description:
+Description:
Feature: multimedia
Build-Depends: qt5-multimedia
-Description:
+Description:
Feature: mqtt
Build-Depends: qt5-mqtt
-Description:
+Description:
Feature: webglplugin
Build-Depends: qt5-webglplugin
-Description:
+Description:
Feature: webview
Build-Depends: qt5-webview
-Description:
+Description:
Feature: wayland
Build-Depends: qt5-wayland
-Description:
+Description:
Feature: webengine
Build-Depends: qt5-webengine
-Description:
+Description:
Feature: serialbus
Build-Depends: qt5-serialbus
-Description:
+Description:
Feature: translations
Build-Depends: qt5-translations
-Description:
+Description:
Feature: doc
Build-Depends: qt5-doc
-Description:
+Description:
Feature: remoteobjects
Build-Depends: qt5-remoteobjects
-Description:
+Description:
Feature: connectivity
Build-Depends: qt5-connectivity
-Description:
+Description: