moved nuget to its own project.

This commit is contained in:
LePresidente
2018-10-10 07:04:03 +02:00
parent 4297077b60
commit f880c6b0a2
3 changed files with 39 additions and 11 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ from config import config
from string import Formatter
from unibuild import Project
from unibuild.modules import build, cmake, git, github, urldownload, msbuild
from unibuild.projects import boost, googletest, lootapi, lz4, nasm, ncc, openssl, sevenzip, sip, usvfs, python, pyqt5, qt5, WixToolkit, zlib
from unibuild.projects import boost, googletest, lootapi, lz4, nasm, ncc, openssl, sevenzip, sip, usvfs, python, pyqt5, qt5, WixToolkit, zlib, nuget
from unibuild.utility import FormatDict
from unibuild.utility.config_utility import cmake_parameters, qt_inst_path
+10 -10
View File
@@ -21,9 +21,9 @@ from buildtools import log
from buildtools.buildsystem.visualstudio import ProjectType, VisualStudio2015Solution, VS2015Project
from config import config
from unibuild import Project
from unibuild.projects import nuget
from unibuild.modules import build, msbuild, github, urldownload
from unibuild.utility import lazy
nuget_version = config['nuget_version']
build_path = config['paths']['build']
download_path = config['paths']['download']
@@ -69,16 +69,16 @@ def prepare_nmm(context):
# until this is fixed we lock NMM to the latest nexus release.
Project("ncc") \
.depend(build.Run(r"publish.bat".format("-debug" if config['build_type'] == "Debug" else "-release",
os.path.join(config["paths"]["install"], "bin")),
os.path.join(config["paths"]["install"], "bin")),
working_directory=lazy.Evaluate(lambda: os.path.join(build_path, "NexusClientCli")))
.depend(msbuild.MSBuild(os.path.join(build_path, "Nexus-Mod-Manager", 'NexusClientCli.sln'),
working_directory=lazy.Evaluate(lambda: os.path.join(build_path, "Nexus-Mod-Manager")),
project_platform="Any CPU")
.depend(build.Run(r"nuget.exe restore {}".format(os.path.join(build_path, "Nexus-Mod-Manager", 'NexusClientCli.sln')),
environment=ncc_environment(),
working_directory=lazy.Evaluate(lambda: os.path.join(build_path, "Nexus-Mod-Manager")))
.depend(build.Execute(prepare_nmm, name="append NexusClientCli project to NMM")
.depend(github.Source("Nexus-Mods", "Nexus-Mod-Manager", config["nmm_version"], None, False))
.depend(github.Source(config['Main_Author'], "modorganizer-NCC", config["Main_Branch"])
.set_destination("NexusClientCli")).depend(urldownload.URLDownload("https://dist.nuget.org/win-x86-commandline/v{}/nuget.exe"
.format(nuget_version)))))))
.depend(build.Run(r"nuget.exe restore {}".format(os.path.join(build_path, "Nexus-Mod-Manager", 'NexusClientCli.sln')),
environment=ncc_environment(),
working_directory=lazy.Evaluate(lambda: os.path.join(build_path, "Nexus-Mod-Manager")))
.depend(build.Execute(prepare_nmm, name="append NexusClientCli project to NMM")
.depend(github.Source("Nexus-Mods", "Nexus-Mod-Manager", config["nmm_version"], None, False))
.depend(github.Source(config['Main_Author'], "modorganizer-NCC", config["Main_Branch"])
.set_destination("NexusClientCli")))))) \
.depend("nuget")
+28
View File
@@ -0,0 +1,28 @@
# Copyright (C) 2015 Sebastian Herbord. All rights reserved.
# Copyright (C) 2016 - 2018 Mod Organizer contributors.
#
# This file is part of Mod Organizer.
#
# Mod Organizer is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Mod Organizer is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
import os
from config import config
from unibuild import Project
from unibuild.modules import cmake, urldownload
nuget_version = config['nuget_version']
Project("nuget").depend(urldownload.URLDownload("https://dist.nuget.org/win-x86-commandline/v{}/nuget.exe"
.format(nuget_version))
.set_destination("NuGet"))