2014-03-01 22:06:47 +00:00
|
|
|
#include <QJsonArray>
|
|
|
|
#include <QJsonDocument>
|
|
|
|
#include <modutils.h>
|
|
|
|
|
|
|
|
#include "logger/QsLog.h"
|
2014-05-08 20:20:10 +01:00
|
|
|
|
|
|
|
#include "logic/minecraft/VersionFile.h"
|
|
|
|
#include "logic/minecraft/OneSixLibrary.h"
|
2014-05-19 01:22:09 +01:00
|
|
|
#include "logic/minecraft/InstanceVersion.h"
|
2014-05-09 16:16:25 +01:00
|
|
|
#include "logic/minecraft/JarMod.h"
|
2014-05-10 00:53:32 +01:00
|
|
|
#include "ParseUtils.h"
|
2014-03-01 22:06:47 +00:00
|
|
|
|
2014-05-09 16:16:25 +01:00
|
|
|
#include "logic/MMCJson.h"
|
2014-03-02 18:12:04 +00:00
|
|
|
using namespace MMCJson;
|
2014-03-01 22:06:47 +00:00
|
|
|
|
2014-05-10 00:53:32 +01:00
|
|
|
#include "VersionBuildError.h"
|
|
|
|
|
2014-03-01 22:06:47 +00:00
|
|
|
#define CURRENT_MINIMUM_LAUNCHER_VERSION 14
|
|
|
|
|
2014-07-19 22:16:02 +01:00
|
|
|
int findLibraryByName(QList<OneSixLibraryPtr> haystack, const GradleSpecifier &needle)
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-05-09 16:16:25 +01:00
|
|
|
int retval = -1;
|
|
|
|
for (int i = 0; i < haystack.size(); ++i)
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-07-19 22:16:02 +01:00
|
|
|
|
2014-07-26 22:00:35 +01:00
|
|
|
if(haystack.at(i)->rawName().matchName(needle))
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-05-09 16:16:25 +01:00
|
|
|
// only one is allowed.
|
2014-05-10 00:53:32 +01:00
|
|
|
if (retval != -1)
|
2014-05-09 16:16:25 +01:00
|
|
|
return -1;
|
|
|
|
retval = i;
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
}
|
2014-05-09 16:16:25 +01:00
|
|
|
return retval;
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
|
2014-03-05 00:50:05 +00:00
|
|
|
VersionFilePtr VersionFile::fromJson(const QJsonDocument &doc, const QString &filename,
|
2014-05-10 00:53:32 +01:00
|
|
|
const bool requireOrder, const bool isFTB)
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-03-05 00:50:05 +00:00
|
|
|
VersionFilePtr out(new VersionFile());
|
2014-03-01 22:06:47 +00:00
|
|
|
if (doc.isEmpty() || doc.isNull())
|
|
|
|
{
|
2014-03-02 18:12:04 +00:00
|
|
|
throw JSONValidationError(filename + " is empty or null");
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
if (!doc.isObject())
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
QJsonObject root = doc.object();
|
|
|
|
|
|
|
|
if (requireOrder)
|
|
|
|
{
|
|
|
|
if (root.contains("order"))
|
|
|
|
{
|
2014-03-05 00:50:05 +00:00
|
|
|
out->order = ensureInteger(root.value("order"));
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2014-03-02 18:12:04 +00:00
|
|
|
// FIXME: evaluate if we don't want to throw exceptions here instead
|
2014-03-01 22:06:47 +00:00
|
|
|
QLOG_ERROR() << filename << "doesn't contain an order field";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-05 00:50:05 +00:00
|
|
|
out->name = root.value("name").toString();
|
|
|
|
out->fileId = root.value("fileId").toString();
|
|
|
|
out->version = root.value("version").toString();
|
|
|
|
out->mcVersion = root.value("mcVersion").toString();
|
|
|
|
out->filename = filename;
|
2014-03-01 22:06:47 +00:00
|
|
|
|
2014-05-10 00:53:32 +01:00
|
|
|
auto readString = [root](const QString & key, QString & variable)
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
|
|
|
if (root.contains(key))
|
|
|
|
{
|
2014-03-02 18:12:04 +00:00
|
|
|
variable = ensureString(root.value(key));
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2014-05-10 00:53:32 +01:00
|
|
|
auto readStringRet = [root](const QString & key)->QString
|
|
|
|
{
|
|
|
|
if (root.contains(key))
|
|
|
|
{
|
|
|
|
return ensureString(root.value(key));
|
|
|
|
}
|
|
|
|
return QString();
|
|
|
|
}
|
|
|
|
;
|
|
|
|
|
2014-03-02 18:12:04 +00:00
|
|
|
// FIXME: This should be ignored when applying.
|
2014-03-01 22:06:47 +00:00
|
|
|
if (!isFTB)
|
|
|
|
{
|
2014-03-05 00:50:05 +00:00
|
|
|
readString("id", out->id);
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
|
2014-03-05 00:50:05 +00:00
|
|
|
readString("mainClass", out->mainClass);
|
2014-05-08 18:05:07 +01:00
|
|
|
readString("appletClass", out->appletClass);
|
2014-03-05 00:50:05 +00:00
|
|
|
readString("processArguments", out->processArguments);
|
|
|
|
readString("minecraftArguments", out->overwriteMinecraftArguments);
|
|
|
|
readString("+minecraftArguments", out->addMinecraftArguments);
|
|
|
|
readString("-minecraftArguments", out->removeMinecraftArguments);
|
|
|
|
readString("type", out->type);
|
2014-05-10 00:53:32 +01:00
|
|
|
|
2014-05-11 11:37:21 +01:00
|
|
|
parse_timestamp(readStringRet("releaseTime"), out->m_releaseTimeString, out->m_releaseTime);
|
|
|
|
parse_timestamp(readStringRet("time"), out->m_updateTimeString, out->m_updateTime);
|
|
|
|
|
2014-03-05 00:50:05 +00:00
|
|
|
readString("assets", out->assets);
|
2014-03-02 18:12:04 +00:00
|
|
|
|
2014-03-01 22:06:47 +00:00
|
|
|
if (root.contains("minimumLauncherVersion"))
|
|
|
|
{
|
2014-03-05 00:50:05 +00:00
|
|
|
out->minimumLauncherVersion = ensureInteger(root.value("minimumLauncherVersion"));
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (root.contains("tweakers"))
|
|
|
|
{
|
2014-03-05 00:50:05 +00:00
|
|
|
out->shouldOverwriteTweakers = true;
|
2014-03-02 18:12:04 +00:00
|
|
|
for (auto tweakerVal : ensureArray(root.value("tweakers")))
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-03-05 00:50:05 +00:00
|
|
|
out->overwriteTweakers.append(ensureString(tweakerVal));
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
}
|
2014-03-02 18:12:04 +00:00
|
|
|
|
2014-03-01 22:06:47 +00:00
|
|
|
if (root.contains("+tweakers"))
|
|
|
|
{
|
2014-03-02 18:12:04 +00:00
|
|
|
for (auto tweakerVal : ensureArray(root.value("+tweakers")))
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-03-05 00:50:05 +00:00
|
|
|
out->addTweakers.append(ensureString(tweakerVal));
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
}
|
2014-03-02 18:12:04 +00:00
|
|
|
|
2014-03-01 22:06:47 +00:00
|
|
|
if (root.contains("-tweakers"))
|
|
|
|
{
|
2014-03-02 18:12:04 +00:00
|
|
|
for (auto tweakerVal : ensureArray(root.value("-tweakers")))
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-03-05 00:50:05 +00:00
|
|
|
out->removeTweakers.append(ensureString(tweakerVal));
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-23 01:27:40 +01:00
|
|
|
if (root.contains("+traits"))
|
|
|
|
{
|
|
|
|
for (auto tweakerVal : ensureArray(root.value("+traits")))
|
|
|
|
{
|
|
|
|
out->traits.insert(ensureString(tweakerVal));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-01 22:06:47 +00:00
|
|
|
if (root.contains("libraries"))
|
|
|
|
{
|
2014-03-02 18:12:04 +00:00
|
|
|
// FIXME: This should be done when applying.
|
2014-03-05 00:50:05 +00:00
|
|
|
out->shouldOverwriteLibs = !isFTB;
|
2014-03-02 18:12:04 +00:00
|
|
|
for (auto libVal : ensureArray(root.value("libraries")))
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-03-02 18:12:04 +00:00
|
|
|
auto libObj = ensureObject(libVal);
|
|
|
|
|
2014-03-05 00:50:05 +00:00
|
|
|
auto lib = RawLibrary::fromJson(libObj, filename);
|
2014-03-02 18:12:04 +00:00
|
|
|
// FIXME: This should be done when applying.
|
2014-03-01 22:06:47 +00:00
|
|
|
if (isFTB)
|
|
|
|
{
|
2014-05-11 11:37:21 +01:00
|
|
|
lib->m_hint = "local";
|
2014-03-05 00:50:05 +00:00
|
|
|
lib->insertType = RawLibrary::Prepend;
|
|
|
|
out->addLibs.prepend(lib);
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2014-03-05 00:50:05 +00:00
|
|
|
out->overwriteLibs.append(lib);
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-03-02 18:12:04 +00:00
|
|
|
|
2014-04-23 01:27:40 +01:00
|
|
|
if (root.contains("+jarMods"))
|
|
|
|
{
|
|
|
|
for (auto libVal : ensureArray(root.value("+jarMods")))
|
|
|
|
{
|
|
|
|
QJsonObject libObj = ensureObject(libVal);
|
|
|
|
// parse the jarmod
|
|
|
|
auto lib = Jarmod::fromJson(libObj, filename);
|
|
|
|
// and add to jar mods
|
|
|
|
out->jarMods.append(lib);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-01 22:06:47 +00:00
|
|
|
if (root.contains("+libraries"))
|
|
|
|
{
|
2014-03-02 18:12:04 +00:00
|
|
|
for (auto libVal : ensureArray(root.value("+libraries")))
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-03-02 18:12:04 +00:00
|
|
|
QJsonObject libObj = ensureObject(libVal);
|
|
|
|
// parse the library
|
2014-05-11 11:37:21 +01:00
|
|
|
auto lib = RawLibrary::fromJsonPlus(libObj, filename);
|
2014-03-05 00:50:05 +00:00
|
|
|
out->addLibs.append(lib);
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
}
|
2014-04-23 01:27:40 +01:00
|
|
|
|
2014-03-01 22:06:47 +00:00
|
|
|
if (root.contains("-libraries"))
|
|
|
|
{
|
2014-03-02 18:12:04 +00:00
|
|
|
for (auto libVal : ensureArray(root.value("-libraries")))
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-03-02 18:12:04 +00:00
|
|
|
auto libObj = ensureObject(libVal);
|
2014-03-05 00:50:05 +00:00
|
|
|
out->removeLibs.append(ensureString(libObj.value("name")));
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return out;
|
|
|
|
}
|
|
|
|
|
2014-05-11 11:37:21 +01:00
|
|
|
QJsonDocument VersionFile::toJson(bool saveOrder)
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-05-11 11:37:21 +01:00
|
|
|
QJsonObject root;
|
|
|
|
if (saveOrder)
|
|
|
|
{
|
|
|
|
root.insert("order", order);
|
|
|
|
}
|
|
|
|
writeString(root, "name", name);
|
|
|
|
writeString(root, "fileId", fileId);
|
|
|
|
writeString(root, "version", version);
|
|
|
|
writeString(root, "mcVersion", mcVersion);
|
|
|
|
writeString(root, "id", id);
|
|
|
|
writeString(root, "mainClass", mainClass);
|
|
|
|
writeString(root, "appletClass", appletClass);
|
|
|
|
writeString(root, "processArguments", processArguments);
|
|
|
|
writeString(root, "minecraftArguments", overwriteMinecraftArguments);
|
|
|
|
writeString(root, "+minecraftArguments", addMinecraftArguments);
|
|
|
|
writeString(root, "-minecraftArguments", removeMinecraftArguments);
|
|
|
|
writeString(root, "type", type);
|
|
|
|
writeString(root, "assets", assets);
|
|
|
|
if (isMinecraftVersion())
|
|
|
|
{
|
|
|
|
writeString(root, "releaseTime", m_releaseTimeString);
|
|
|
|
writeString(root, "time", m_updateTimeString);
|
|
|
|
}
|
|
|
|
if (minimumLauncherVersion != -1)
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-05-11 11:37:21 +01:00
|
|
|
root.insert("minimumLauncherVersion", minimumLauncherVersion);
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
2014-05-11 11:37:21 +01:00
|
|
|
writeStringList(root, "tweakers", overwriteTweakers);
|
|
|
|
writeStringList(root, "+tweakers", addTweakers);
|
|
|
|
writeStringList(root, "-tweakers", removeTweakers);
|
|
|
|
writeStringList(root, "+traits", traits.toList());
|
|
|
|
writeObjectList(root, "libraries", overwriteLibs);
|
|
|
|
writeObjectList(root, "+libraries", addLibs);
|
|
|
|
writeObjectList(root, "+jarMods", jarMods);
|
|
|
|
// FIXME: removed libs are special snowflakes.
|
|
|
|
if (removeLibs.size())
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-05-11 11:37:21 +01:00
|
|
|
QJsonArray array;
|
|
|
|
for (auto lib : removeLibs)
|
|
|
|
{
|
|
|
|
QJsonObject rmlibobj;
|
|
|
|
rmlibobj.insert("name", lib);
|
|
|
|
array.append(rmlibobj);
|
|
|
|
}
|
|
|
|
root.insert("-libraries", array);
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
2014-05-11 11:37:21 +01:00
|
|
|
// write the contents to a json document.
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-05-11 11:37:21 +01:00
|
|
|
QJsonDocument out;
|
|
|
|
out.setObject(root);
|
|
|
|
return out;
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-11 11:37:21 +01:00
|
|
|
bool VersionFile::isMinecraftVersion()
|
2014-04-23 01:27:40 +01:00
|
|
|
{
|
2014-05-11 11:37:21 +01:00
|
|
|
return (fileId == "org.multimc.version.json") || (fileId == "net.minecraft") ||
|
|
|
|
(fileId == "org.multimc.custom.json");
|
2014-04-23 01:27:40 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
bool VersionFile::hasJarMods()
|
|
|
|
{
|
|
|
|
return !jarMods.isEmpty();
|
|
|
|
}
|
|
|
|
|
2014-05-19 01:22:09 +01:00
|
|
|
void VersionFile::applyTo(InstanceVersion *version)
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
|
|
|
if (minimumLauncherVersion != -1)
|
|
|
|
{
|
|
|
|
if (minimumLauncherVersion > CURRENT_MINIMUM_LAUNCHER_VERSION)
|
|
|
|
{
|
2014-05-10 00:53:32 +01:00
|
|
|
throw LauncherVersionError(minimumLauncherVersion,
|
|
|
|
CURRENT_MINIMUM_LAUNCHER_VERSION);
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!version->id.isNull() && !mcVersion.isNull())
|
|
|
|
{
|
|
|
|
if (QRegExp(mcVersion, Qt::CaseInsensitive, QRegExp::Wildcard).indexIn(version->id) ==
|
|
|
|
-1)
|
|
|
|
{
|
2014-03-09 22:42:25 +00:00
|
|
|
throw MinecraftVersionMismatch(fileId, mcVersion, version->id);
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!id.isNull())
|
|
|
|
{
|
|
|
|
version->id = id;
|
|
|
|
}
|
|
|
|
if (!mainClass.isNull())
|
|
|
|
{
|
|
|
|
version->mainClass = mainClass;
|
|
|
|
}
|
2014-05-08 18:05:07 +01:00
|
|
|
if (!appletClass.isNull())
|
|
|
|
{
|
|
|
|
version->appletClass = appletClass;
|
|
|
|
}
|
2014-03-01 22:06:47 +00:00
|
|
|
if (!processArguments.isNull())
|
|
|
|
{
|
2014-05-11 11:37:21 +01:00
|
|
|
if (isMinecraftVersion())
|
2014-04-23 01:27:40 +01:00
|
|
|
{
|
|
|
|
version->vanillaProcessArguments = processArguments;
|
|
|
|
}
|
2014-03-01 22:06:47 +00:00
|
|
|
version->processArguments = processArguments;
|
|
|
|
}
|
2014-05-11 11:37:21 +01:00
|
|
|
if (isMinecraftVersion())
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-05-10 00:53:32 +01:00
|
|
|
if (!type.isNull())
|
|
|
|
{
|
|
|
|
version->type = type;
|
|
|
|
}
|
|
|
|
if (!m_releaseTimeString.isNull())
|
|
|
|
{
|
|
|
|
version->m_releaseTimeString = m_releaseTimeString;
|
|
|
|
version->m_releaseTime = m_releaseTime;
|
|
|
|
}
|
|
|
|
if (!m_updateTimeString.isNull())
|
|
|
|
{
|
|
|
|
version->m_updateTimeString = m_updateTimeString;
|
|
|
|
version->m_updateTime = m_updateTime;
|
|
|
|
}
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
if (!assets.isNull())
|
|
|
|
{
|
|
|
|
version->assets = assets;
|
|
|
|
}
|
|
|
|
if (minimumLauncherVersion >= 0)
|
|
|
|
{
|
2014-05-11 11:37:21 +01:00
|
|
|
if (version->minimumLauncherVersion < minimumLauncherVersion)
|
2014-05-10 00:53:32 +01:00
|
|
|
version->minimumLauncherVersion = minimumLauncherVersion;
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
if (!overwriteMinecraftArguments.isNull())
|
|
|
|
{
|
2014-05-11 11:37:21 +01:00
|
|
|
if (isMinecraftVersion())
|
2014-04-23 01:27:40 +01:00
|
|
|
{
|
|
|
|
version->vanillaMinecraftArguments = overwriteMinecraftArguments;
|
|
|
|
}
|
2014-03-01 22:06:47 +00:00
|
|
|
version->minecraftArguments = overwriteMinecraftArguments;
|
|
|
|
}
|
|
|
|
if (!addMinecraftArguments.isNull())
|
|
|
|
{
|
|
|
|
version->minecraftArguments += addMinecraftArguments;
|
|
|
|
}
|
|
|
|
if (!removeMinecraftArguments.isNull())
|
|
|
|
{
|
|
|
|
version->minecraftArguments.remove(removeMinecraftArguments);
|
|
|
|
}
|
|
|
|
if (shouldOverwriteTweakers)
|
|
|
|
{
|
|
|
|
version->tweakers = overwriteTweakers;
|
|
|
|
}
|
|
|
|
for (auto tweaker : addTweakers)
|
|
|
|
{
|
|
|
|
version->tweakers += tweaker;
|
|
|
|
}
|
|
|
|
for (auto tweaker : removeTweakers)
|
|
|
|
{
|
|
|
|
version->tweakers.removeAll(tweaker);
|
|
|
|
}
|
2014-04-23 01:27:40 +01:00
|
|
|
version->jarMods.append(jarMods);
|
2014-05-04 23:10:59 +01:00
|
|
|
version->traits.unite(traits);
|
2014-03-01 22:06:47 +00:00
|
|
|
if (shouldOverwriteLibs)
|
|
|
|
{
|
2014-04-23 01:27:40 +01:00
|
|
|
QList<OneSixLibraryPtr> libs;
|
2014-03-01 22:06:47 +00:00
|
|
|
for (auto lib : overwriteLibs)
|
|
|
|
{
|
2014-05-11 11:37:21 +01:00
|
|
|
libs.append(OneSixLibrary::fromRawLibrary(lib));
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
2014-05-11 11:37:21 +01:00
|
|
|
if (isMinecraftVersion())
|
|
|
|
{
|
2014-04-23 01:27:40 +01:00
|
|
|
version->vanillaLibraries = libs;
|
2014-05-11 11:37:21 +01:00
|
|
|
}
|
2014-04-23 01:27:40 +01:00
|
|
|
version->libraries = libs;
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
2014-07-26 22:00:35 +01:00
|
|
|
for (auto addedLibrary : addLibs)
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
switch (addedLibrary->insertType)
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-03-03 00:23:10 +00:00
|
|
|
case RawLibrary::Apply:
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-04-01 22:02:40 +01:00
|
|
|
// QLOG_INFO() << "Applying lib " << lib->name;
|
2014-07-26 22:00:35 +01:00
|
|
|
int index = findLibraryByName(version->libraries, addedLibrary->rawName());
|
2014-03-01 22:06:47 +00:00
|
|
|
if (index >= 0)
|
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
auto existingLibrary = version->libraries[index];
|
|
|
|
if (!addedLibrary->m_base_url.isNull())
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
existingLibrary->setBaseUrl(addedLibrary->m_base_url);
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
2014-07-26 22:00:35 +01:00
|
|
|
if (!addedLibrary->m_hint.isNull())
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
existingLibrary->setHint(addedLibrary->m_hint);
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
2014-07-26 22:00:35 +01:00
|
|
|
if (!addedLibrary->m_absolute_url.isNull())
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
existingLibrary->setAbsoluteUrl(addedLibrary->m_absolute_url);
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
2014-07-26 22:00:35 +01:00
|
|
|
if (addedLibrary->applyExcludes)
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
existingLibrary->extract_excludes = addedLibrary->extract_excludes;
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
2014-07-26 22:00:35 +01:00
|
|
|
if (addedLibrary->isNative())
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
existingLibrary->m_native_classifiers = addedLibrary->m_native_classifiers;
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
2014-07-26 22:00:35 +01:00
|
|
|
if (addedLibrary->applyRules)
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
existingLibrary->setRules(addedLibrary->m_rules);
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
QLOG_WARN() << "Couldn't find" << addedLibrary->rawName() << "(skipping)";
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2014-03-03 00:23:10 +00:00
|
|
|
case RawLibrary::Append:
|
|
|
|
case RawLibrary::Prepend:
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
// find the library by name.
|
|
|
|
const int index = findLibraryByName(version->libraries, addedLibrary->rawName());
|
|
|
|
// library not found? just add it.
|
2014-03-01 22:06:47 +00:00
|
|
|
if (index < 0)
|
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
if (addedLibrary->insertType == RawLibrary::Append)
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
version->libraries.append(OneSixLibrary::fromRawLibrary(addedLibrary));
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
version->libraries.prepend(OneSixLibrary::fromRawLibrary(addedLibrary));
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
2014-07-26 22:00:35 +01:00
|
|
|
break;
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
2014-07-26 22:00:35 +01:00
|
|
|
|
|
|
|
// otherwise apply differences, if allowed
|
|
|
|
auto existingLibrary = version->libraries.at(index);
|
|
|
|
const Util::Version addedVersion = addedLibrary->version();
|
|
|
|
const Util::Version existingVersion = existingLibrary->version();
|
|
|
|
// if the existing version is a hard dependency we can either use it or
|
|
|
|
// fail, but we can't change it
|
|
|
|
if (existingLibrary->dependType == OneSixLibrary::Hard)
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
// we need a higher version, or we're hard to and the versions aren't
|
|
|
|
// equal
|
|
|
|
if (addedVersion > existingVersion ||
|
|
|
|
(addedLibrary->dependType == RawLibrary::Hard && addedVersion != existingVersion))
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
throw VersionBuildError(QObject::tr(
|
|
|
|
"Error resolving library dependencies between %1 and %2 in %3.")
|
|
|
|
.arg(existingLibrary->rawName(),
|
|
|
|
addedLibrary->rawName(), filename));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// the library is already existing, so we don't have to do anything
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
2014-07-26 22:00:35 +01:00
|
|
|
}
|
|
|
|
else if (existingLibrary->dependType == OneSixLibrary::Soft)
|
|
|
|
{
|
|
|
|
// if we are higher it means we should update
|
|
|
|
if (addedVersion > existingVersion)
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
auto library = OneSixLibrary::fromRawLibrary(addedLibrary);
|
|
|
|
version->libraries.replace(index, library);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// our version is smaller than the existing version, but we require
|
|
|
|
// it: fail
|
|
|
|
if (addedLibrary->dependType == RawLibrary::Hard)
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
throw VersionBuildError(QObject::tr(
|
|
|
|
"Error resolving library dependencies between %1 and %2 in %3.")
|
|
|
|
.arg(existingLibrary->rawName(),
|
|
|
|
addedLibrary->rawName(), filename));
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2014-03-03 00:23:10 +00:00
|
|
|
case RawLibrary::Replace:
|
2014-03-01 22:06:47 +00:00
|
|
|
{
|
2014-07-19 22:16:02 +01:00
|
|
|
GradleSpecifier toReplace;
|
2014-07-26 22:00:35 +01:00
|
|
|
if (addedLibrary->insertData.isEmpty())
|
2014-04-01 20:58:15 +01:00
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
toReplace = addedLibrary->rawName();
|
2014-04-01 20:58:15 +01:00
|
|
|
}
|
|
|
|
else
|
2014-07-19 22:16:02 +01:00
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
toReplace = addedLibrary->insertData;
|
2014-07-19 22:16:02 +01:00
|
|
|
}
|
2014-04-01 22:02:40 +01:00
|
|
|
// QLOG_INFO() << "Replacing lib " << toReplace << " with " << lib->name;
|
2014-07-19 22:16:02 +01:00
|
|
|
int index = findLibraryByName(version->libraries, toReplace);
|
2014-03-01 22:06:47 +00:00
|
|
|
if (index >= 0)
|
|
|
|
{
|
2014-07-26 22:00:35 +01:00
|
|
|
version->libraries.replace(index, OneSixLibrary::fromRawLibrary(addedLibrary));
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2014-04-01 20:58:15 +01:00
|
|
|
QLOG_WARN() << "Couldn't find" << toReplace << "(skipping)";
|
2014-03-01 22:06:47 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (auto lib : removeLibs)
|
|
|
|
{
|
2014-07-19 22:16:02 +01:00
|
|
|
int index = findLibraryByName(version->libraries, lib);
|
2014-03-01 22:06:47 +00:00
|
|
|
if (index >= 0)
|
|
|
|
{
|
2014-04-01 22:02:40 +01:00
|
|
|
// QLOG_INFO() << "Removing lib " << lib;
|
2014-03-01 22:06:47 +00:00
|
|
|
version->libraries.removeAt(index);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
QLOG_WARN() << "Couldn't find" << lib << "(skipping)";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|