From bbdc3de691074ea7758180a33356676ae477d568 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Tue, 6 Oct 2015 21:55:21 -0700 Subject: [PATCH] Use nuget -restore functionality - Download nuget.exe from its official home - Remove beta nuget.exe from monad-ext - Specify dependencies in packages.config and use nuget.exe -restore - Add prepare dependency to package libraries - No more manual prepare step - Update .gitignore --- .gitignore | 5 ++--- scripts/Makefile | 18 +++++++++--------- scripts/packages.config | 6 ++++++ src/monad-ext | 2 +- 4 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 scripts/packages.config diff --git a/.gitignore b/.gitignore index 151c2b5fb3..0a218c43ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,11 @@ .idea .config/ -.nuget\\packages\\/ +.local/ CMakeCache.txt CMakeFiles/ Makefile !scripts/Makefile cmake_install.cmake -externals scripts/xunittests.xml -/scripts/powershell.inc +scripts/powershell.inc .bash_history diff --git a/scripts/Makefile b/scripts/Makefile index 453c9140e1..4a7f47e246 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -76,11 +76,11 @@ dotnetlibs/$(ASSEMBLY_LOAD_CONTEXT_TARGET): $(ASSEMBLY_LOAD_CONTEXT_SRCS) $(CSC) -out:$@ $(CSCOPTS_LIB_PS) $(PRODUCT_BASE_REFS) $(ASSEMBLY_LOAD_CONTEXT_SRCS) # this will copy whatever the first version of the dll in the globber is -buildtemp/System.Reflection.Metadata.dll: buildtemp/System.Reflection.Metadata.*/lib/portable-net45+win8/System.Reflection.Metadata.dll +buildtemp/System.Reflection.Metadata.dll: buildtemp/System.Reflection.Metadata.*/lib/*/System.Reflection.Metadata.dll prepare cp -f $< $@ # this will copy whatever the first version of the dll in the globber is -buildtemp/System.Collections.Immutable.dll: buildtemp/System.Collections.Immutable.*/lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll +buildtemp/System.Collections.Immutable.dll: buildtemp/System.Collections.Immutable.*/lib/*/System.Collections.Immutable.dll prepare cp -f $< $@ # this one is built from stubs @@ -136,14 +136,14 @@ dotnetlibs/api-ms-win-core-registry-l1-1-0.dll: ../src/win-dll/lib-api-ms-win-co # this is the manual step that will install some stuff using nuget and do other things that can't be dependency # tracked that easily -NUGET_INSTALL=cd buildtemp && mono nuget.exe install -Source 'https://api.nuget.org/v3/index.json' -Version +nuget.exe: + wget 'https://nuget.org/nuget.exe' -prepare: cleanall - mkdir -p buildtemp dotnetlibs - cp $(MONAD_EXT)/nuget/nuget.exe buildtemp/nuget.exe - $(NUGET_INSTALL) 1.0.21 System.Reflection.Metadata - $(NUGET_INSTALL) 1.1.36 System.Collections.Immutable - $(NUGET_INSTALL) 1.0.0 Microsoft.Net.Compilers +NUGET_INSTALL=cd buildtemp && mono nuget.exe install + +prepare: nuget.exe + mkdir -p buildtemp + mono nuget.exe restore -PackagesDirectory buildtemp # this is the execution environment from which all managed code is run APP_BASE=exec_env/app_base diff --git a/scripts/packages.config b/scripts/packages.config new file mode 100644 index 0000000000..a675f3a4cc --- /dev/null +++ b/scripts/packages.config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/monad-ext b/src/monad-ext index 90a7b37cd7..dec304a9a8 160000 --- a/src/monad-ext +++ b/src/monad-ext @@ -1 +1 @@ -Subproject commit 90a7b37cd786a27250487d637fe015186960c7be +Subproject commit dec304a9a8704f28176474072e83f439017bac6d