Updating build tools.

milos-simic · Jul 9, 2017 · b863bc9 · b863bc9
1 parent 4f2158d
commit b863bc9
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 20 deletions.
diff --git a/Sources/Accord.NET.sln b/Sources/Accord.NET.sln
@@ -5,6 +5,7 @@ VisualStudioVersion = 15.0.26621.2
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unit Tests", "Unit Tests", "{D059B679-8B38-44FE-BEC6-8DFF9271CE59}"
 	ProjectSection(SolutionItems) = preProject
+		Accord.NET.testrunconfig = Accord.NET.testrunconfig
 		..\Unit Tests\Accord.Tests.targets = ..\Unit Tests\Accord.Tests.targets
 	EndProjectSection
 EndProject
@@ -16,9 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Accord.NET.psess = Accord.NET.psess
 		Accord.NET.ruleset = Accord.NET.ruleset
 		Accord.NET.targets = Accord.NET.targets
-		Accord.NET.testrunconfig = Accord.NET.testrunconfig
 		Accord.NET.vsmdi = Accord.NET.vsmdi
-		..\Unit Tests\Accord.Tests.targets = ..\Unit Tests\Accord.Tests.targets
 		Building.txt = Building.txt
 		..\Contributors.txt = ..\Contributors.txt
 		..\Copyright.txt = ..\Copyright.txt
@@ -2120,6 +2119,7 @@ Global
 		{FF31DD24-127D-4EB1-929C-F5738147E886}.net35|Any CPU.ActiveCfg = net35|Win32
 		{FF31DD24-127D-4EB1-929C-F5738147E886}.net35|Any CPU.Build.0 = net35|Win32
 		{FF31DD24-127D-4EB1-929C-F5738147E886}.net35|Win32.ActiveCfg = net35|Win32
+		{FF31DD24-127D-4EB1-929C-F5738147E886}.net35|Win32.Build.0 = net35|Win32
 		{FF31DD24-127D-4EB1-929C-F5738147E886}.net35|x64.ActiveCfg = net35|x64
 		{FF31DD24-127D-4EB1-929C-F5738147E886}.net40|Any CPU.ActiveCfg = net40|Win32
 		{FF31DD24-127D-4EB1-929C-F5738147E886}.net40|Any CPU.Build.0 = net40|Win32
@@ -2338,6 +2338,7 @@ Global
 		{E688E7EB-64B0-41DA-A1A0-924B75727A4B}.net35|Any CPU.ActiveCfg = net35|Win32
 		{E688E7EB-64B0-41DA-A1A0-924B75727A4B}.net35|Any CPU.Build.0 = net35|Win32
 		{E688E7EB-64B0-41DA-A1A0-924B75727A4B}.net35|Win32.ActiveCfg = net35|Win32
+		{E688E7EB-64B0-41DA-A1A0-924B75727A4B}.net35|Win32.Build.0 = net35|Win32
 		{E688E7EB-64B0-41DA-A1A0-924B75727A4B}.net35|x64.ActiveCfg = net35|x64
 		{E688E7EB-64B0-41DA-A1A0-924B75727A4B}.net40|Any CPU.ActiveCfg = net40|Win32
 		{E688E7EB-64B0-41DA-A1A0-924B75727A4B}.net40|Any CPU.Build.0 = net40|Win32

diff --git a/Tools/open-test-csprojs.bat b/Tools/open-test-csprojs.bat
@@ -0,0 +1,27 @@
+@echo off
+
+set sources=C:\Projects\Accord.NET\framework\Sources
+set unittest_extras=C:\Projects\Accord.NET\framework\Sources\Extras
+set unitest=C:\Projects\Accord.NET\framework\Unit Tests
+set notepad="C:\Program Files (x86)\Notepad++\notepad++.exe"
+echo.
+
+%notepad% "%unitest%\Accord.Tests.targets"
+
+echo "%unitest%"
+for /r "%unitest%" %%F in (Accord.Tests.*.csproj) do (
+  echo %%F
+  %notepad% %%F
+)
+
+echo "%unittest_extras%"
+for /r "%unittest_extras%" %%F in (Accord.Tests.*.csproj) do (
+  echo %%F
+  %notepad% %%F
+)
+
+echo "%unitest%"
+for /r "%unitest%" %%F in (Accord.Tests.*.vcxproj) do (
+  echo %%F
+  %notepad% %%F
+)
diff --git a/build-all.cmd b/build-all.cmd
@@ -30,37 +30,48 @@ echo.
 del /q "Setup\bin\*.log"
 
 echo.
-call:BUILD "Sources\Accord.NET.sln","Debug","x64"
-call:BUILD "Sources\Accord.NET.sln","Debug","Any CPU"
-call:BUILD "Sources\Accord.NET.sln","Mono","Any CPU"
-call:BUILD "Sources\Accord.NET.sln","NET35","x64"
-call:BUILD "Sources\Accord.NET.sln","NET35","Any CPU"
-call:BUILD "Sources\Accord.NET.sln","NET40","x64"
-call:BUILD "Sources\Accord.NET.sln","NET40","Any CPU"
-call:BUILD "Sources\Accord.NET.sln","NET45","x64"
-call:BUILD "Sources\Accord.NET.sln","NET45","Any CPU"
-call:BUILD "Sources\Accord.NET.sln","NET46","x64"
-call:BUILD "Sources\Accord.NET.sln","NET46","Any CPU"
-call:BUILD "Sources\Accord.NET.sln","NET462","x64"
-call:BUILD "Sources\Accord.NET.sln","NET462","Any CPU"
-call:BUILD "Sources\Accord.NET (NETStandard).sln","netstandard2.0","Any CPU"
-call:BUILD "Samples\Samples.sln","Release","x86"
+call:MSBUILD "Sources\Accord.NET.sln", "Debug",   "x64",     "Rebuild"
+call:MSBUILD "Sources\Accord.NET.sln", "Debug",   "Any CPU", "Build"
+call:MSBUILD "Sources\Accord.NET.sln", "mono",    "Any CPU", "Rebuild"
+call:MSBUILD "Sources\Accord.NET.sln", "net35",   "x64",     "Rebuild"
+call:MSBUILD "Sources\Accord.NET.sln", "net35",   "Any CPU", "Build"
+call:MSBUILD "Sources\Accord.NET.sln", "net40",   "x64",     "Rebuild"
+call:MSBUILD "Sources\Accord.NET.sln", "net40",   "Any CPU", "Build"
+call:MSBUILD "Sources\Accord.NET.sln", "net45",   "x64",     "Rebuild"
+call:MSBUILD "Sources\Accord.NET.sln", "net45",   "Any CPU", "Build"
+call:MSBUILD "Sources\Accord.NET.sln", "net46",   "x64",     "Rebuild"
+call:MSBUILD "Sources\Accord.NET.sln", "net46",   "Any CPU", "Build"
+call:MSBUILD "Sources\Accord.NET.sln", "net462",  "x64",     "Rebuild"
+call:MSBUILD "Sources\Accord.NET.sln", "net462",  "Any CPU", "Build"
+call:MSBUILD "Samples\Samples.sln",    "Release", "x86",     "Rebuild"
+
+::: Building netstandard2.0 packages from the command line still doesn't work very well:
+::call:DNBUILD "Sources\Accord.NET (NETStandard).sln","netstandard2.0"
+::call:MSBUILD "Sources\Accord.NET (NETStandard).sln","netstandard2.0","Any CPU",Rebuild
 
 exit /b %ERROR_CODE%
 goto:eof
 
 
+:DNBUILD
+set SOLUTION=%~1
+set CONFIGURATION=%~2
+dotnet build %SOLUTION% --configuration %CONFIGURATION% --no-incremental
+goto:eof
 
-:BUILD
+
+:MSBUILD
 set SOLUTION=%~1
 set CONFIGURATION=%~2
 set PLATFORM=%~3
+set TASK=%~4
 echo.
 echo  - Building %SOLUTION% in %CONFIGURATION% / %PLATFORM% configuration...
-%MSBUILD% /m "%SOLUTION%" /t:Rebuild /p:Configuration=%CONFIGURATION% /p:Platform="%PLATFORM%" /fl /flp:logfile="Setup\bin\Build.%CONFIGURATION%.%PLATFORM%.log";verbosity=normal /consoleloggerparameters:ErrorsOnly;Summary /verbosity:minimal /nologo
+%MSBUILD% /m "%SOLUTION%" /t:%TASK% /property:Prefer32bit=false /p:Configuration=%CONFIGURATION% /p:Platform="%PLATFORM%" /fl /flp:logfile="Setup\bin\Build.%CONFIGURATION%.%PLATFORM%.log";verbosity=normal /consoleloggerparameters:ErrorsOnly;Summary /verbosity:minimal /nologo
 set ERROR_CODE=%errorlevel%
 if %ERROR_CODE% neq 0 (
 	echo Exiting with %ERROR_CODE%
 	exit /b %ERROR_CODE%
 )
-goto:eof
+goto:eof
+