From bb62e8c14fb4404bad99b7c64c96752c674465ab Mon Sep 17 00:00:00 2001
From: Kouji Matsui <k@kekyo.net>
Date: Tue, 17 Sep 2019 21:49:00 +0900
Subject: [PATCH] Adjusted pack scripts.  #82

---
 il2c.pack.sln | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++
 pack.bat      | 32 +++++++++++++++++++++++++++++-
 version.json  | 11 -----------
 3 files changed, 85 insertions(+), 12 deletions(-)
 create mode 100644 il2c.pack.sln
 delete mode 100644 version.json

diff --git a/il2c.pack.sln b/il2c.pack.sln
new file mode 100644
index 00000000..e7698440
--- /dev/null
+++ b/il2c.pack.sln
@@ -0,0 +1,54 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29306.81
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C", "IL2C\IL2C.csproj", "{2CBC90EC-5581-452F-8231-086E4553D20E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D105E6CD-626A-4C04-8AF6-0AA34A4E9CF4}"
+	ProjectSection(SolutionItems) = preProject
+		LICENSE = LICENSE
+		NuGet.config = NuGet.config
+		pack.bat = pack.bat
+		pack.sh = pack.sh
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Core", "IL2C.Core\IL2C.Core.csproj", "{678EFB0E-BC0A-4749-AD48-079F98D9468D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Tasks", "IL2C.Tasks\IL2C.Tasks.csproj", "{A1D40B7C-2F51-43E3-9201-EA8DFFE3B214}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IL2C.Runtime", "IL2C.Runtime\IL2C.Runtime.vcxproj", "{182A62A4-47AC-4290-8EA5-250AE8131613}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Interop", "IL2C.Interop\IL2C.Interop.csproj", "{854E1ABE-0873-4BDC-8ABF-7F9506DD66DB}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2CBC90EC-5581-452F-8231-086E4553D20E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CBC90EC-5581-452F-8231-086E4553D20E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CBC90EC-5581-452F-8231-086E4553D20E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CBC90EC-5581-452F-8231-086E4553D20E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{678EFB0E-BC0A-4749-AD48-079F98D9468D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{678EFB0E-BC0A-4749-AD48-079F98D9468D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{678EFB0E-BC0A-4749-AD48-079F98D9468D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{678EFB0E-BC0A-4749-AD48-079F98D9468D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1D40B7C-2F51-43E3-9201-EA8DFFE3B214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1D40B7C-2F51-43E3-9201-EA8DFFE3B214}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1D40B7C-2F51-43E3-9201-EA8DFFE3B214}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1D40B7C-2F51-43E3-9201-EA8DFFE3B214}.Release|Any CPU.Build.0 = Release|Any CPU
+		{182A62A4-47AC-4290-8EA5-250AE8131613}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{182A62A4-47AC-4290-8EA5-250AE8131613}.Release|Any CPU.ActiveCfg = Release|x64
+		{854E1ABE-0873-4BDC-8ABF-7F9506DD66DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{854E1ABE-0873-4BDC-8ABF-7F9506DD66DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{854E1ABE-0873-4BDC-8ABF-7F9506DD66DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{854E1ABE-0873-4BDC-8ABF-7F9506DD66DB}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D4628360-6C13-42D4-9011-6E43A3A0777C}
+	EndGlobalSection
+EndGlobal
diff --git a/pack.bat b/pack.bat
index 9a6fad04..2227c5f4 100644
--- a/pack.bat
+++ b/pack.bat
@@ -1,16 +1,46 @@
 @echo off
 setlocal enabledelayedexpansion
 
+set TOOLCHAINPATH=%~dp0toolchain\gcc4
+set CMAKE_ROOT=%TOOLCHAINPATH%\share\cmake-3.12
+
+if not exist %TOOLCHAINPATH% (
+    echo Native toolchain not found.
+    echo Execute "init-tools.bat" if build runtime at first time.
+    exit /b 1
+)
+
 rem if not exist ArtifactCollector\ArtifactCollector.exe (
 rem     echo ArtifactCollector not found.
 rem     echo Build il2c.sln first.
 rem     exit /b 1
 rem )
 
-dotnet build --configuration Release il2c.sln
+rem =========================================
+
+call build-runtime.bat Debug
+call build-runtime.bat Release
+
+rem =========================================
+
+echo.
+echo ///////////////////////////////////////////////
+echo // Build entire IL2C.pack.sln
+echo.
+
+dotnet build --configuration Release il2c.pack.sln
+
+rem =========================================
+
+echo.
+echo ///////////////////////////////////////////////
+echo // Collects artifacts.
+echo.
 
 ArtifactCollector\ArtifactCollector.exe . .\artifacts IL2C.Interop IL2C.Core IL2C.Tasks IL2C.Runtime
 
+rem =========================================
+
 rem .nuget\nuget.exe push -Source "IL2C" -ApiKey AzureDevOps .\artifacts\*.nupkg
 
 echo.
diff --git a/version.json b/version.json
deleted file mode 100644
index 69d60b4a..00000000
--- a/version.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.4.70",
-    "publicReleaseRefSpec": [
-        "^refs/heads/master$",
-        "^refs/heads/\\d+(?:\\.\\d.\\d+)?$"
-    ],
-    "nugetPackageVersion": {
-        "semVer": 2
-    }
-}