Add a Linux build menu #1830
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| root=true | ||
|
|
||
| [*] | ||
| insert_final_newline = true | ||
|
|
||
| [*.cs] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,3 +14,6 @@ NHibernate.dll | |
| TestResult.xml | ||
| .vscode | ||
| .DS_Store | ||
|
|
||
| .idea/ | ||
| .vs/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,261 @@ | ||
| #!/bin/sh | ||
|
|
||
| BUILD_TOOL_PATH="./Tools/BuildTool/bin/BuildTool.dll" | ||
| BUILD_TOOL="dotnet $BUILD_TOOL_PATH" | ||
| AVAILABLE_CONFIGURATIONS="available-test-configurations" | ||
| CONFIG_NAME="" | ||
| TEST_PLATFORM="" | ||
| LIB_FILES="" | ||
| LIB_FILES2="" | ||
| CURRENT_CONFIGURATION="./current-test-configuration" | ||
| OPTION=0 | ||
| async_generator_path="" | ||
|
|
||
| if [ ! -f $BUILD_TOOL_PATH ] | ||
| then | ||
| dotnet build ./Tools/BuildTool/BuildTool.sln -c Release -o bin | ||
| fi | ||
|
|
||
| buildDebug(){ | ||
| dotnet build ./src/NHibernate.sln | ||
| echo "." | ||
| echo "Assuming the build succeeded, your results will be in the build folder." | ||
| echo "." | ||
| mainMenu | ||
| } | ||
|
|
||
| buildRelease(){ | ||
| dotnet build ./src/NHibernate.sln -c Release | ||
| echo "." | ||
| echo "Assuming the build succeeded, your results will be in the build folder." | ||
| echo "." | ||
| mainMenu | ||
| } | ||
|
|
||
| testActivate(){ | ||
| FILE_TEMP="folder.tmp" | ||
|
|
||
| $BUILD_TOOL pick-folder $AVAILABLE_CONFIGURATIONS $FILE_TEMP "Which test configuration should be activated?" | ||
|
|
||
| if [ -d $CURRENT_CONFIGURATION ] | ||
| then | ||
| rm -r $CURRENT_CONFIGURATION/ | ||
| fi | ||
|
|
||
| CURRENT_FOLDER=$(pwd) | ||
| INFORMATION=$(cat $CURRENT_FOLDER/$FILE_TEMP) | ||
| cp -r $INFORMATION/ $CURRENT_CONFIGURATION | ||
|
|
||
| rm $FILE_TEMP | ||
|
|
||
| echo "Configuration activated." | ||
|
|
||
| mainMenu | ||
| } | ||
|
|
||
| testSetupGeneric() { | ||
| echo "Enter a name for your test configuration or press enter to use default name:" | ||
| read CFGNAME | ||
| if [ $CFGNAME = ""] | ||
| then | ||
| CFGNAME="$CONFIG_NAME-$TEST_PLATFORM" | ||
| echo $CFGNAME | ||
| fi | ||
|
|
||
| mkdir -p $AVAILABLE_CONFIGURATIONS/$CFGNAME | ||
|
|
||
| if [ ! "$LIB_FILES" ] | ||
| then | ||
| cp $LIB_FILES $AVAILABLE_CONFIGURATIONS/$CFGNAME | ||
|
|
||
| if [ ! "$LIB_FILES2" ] | ||
| then | ||
| cp $LIB_FILES2 $AVAILABLE_CONFIGURATIONS/$CFGNAME | ||
| fi | ||
| fi | ||
|
|
||
| cp "src/NHibernate.Config.Templates/$CONFIG_NAME.cfg.xml" "$AVAILABLE_CONFIGURATIONS/$CFGNAME/hibernate.cfg.xml" | ||
| echo "Done setting up files. Please edit the connection string in file:" | ||
| echo "$AVAILABLE_CONFIGURATIONS/$CFGNAME/hibernate.cfg.xml" | ||
| echo "When you're done, don't forget to activate the configuration through the menu." | ||
| mainMenu | ||
| } | ||
|
|
||
| testSetupSqlServer() { | ||
| CONFIG_NAME="MSSQL" | ||
| TEST_PLATFORM="AnyCPU" | ||
| LIB_FILES="" | ||
| LIB_FILES2="" | ||
| testSetupGeneric | ||
| } | ||
|
|
||
| testSetupFirebird() { | ||
| CONFIG_NAME="FireBird" | ||
| TEST_PLATFORM="AnyCPU" | ||
| LIB_FILES="" | ||
| LIB_FILES2="" | ||
| testSetupGeneric | ||
| } | ||
|
|
||
| testSetupSqlite() { | ||
| CONFIG_NAME="SQLite" | ||
| TEST_PLATFORM="AnyCPU" | ||
| LIB_FILES="" | ||
| LIB_FILES2=""e | ||
| testSetupGeneric | ||
| } | ||
|
|
||
| testSetupPostgresql() { | ||
| CONFIG_NAME="PostgreSQL" | ||
| TEST_PLATFORM="AnyCPU" | ||
| LIB_FILES="" | ||
| LIB_FILES2="" | ||
| testSetupGeneric | ||
| } | ||
|
|
||
| testSetupMysql() { | ||
| CONFIG_NAME="MySql" | ||
| TEST_PLATFORM="AnyCPU" | ||
| LIB_FILES="" | ||
| LIB_FILES2="" | ||
| testSetupGeneric | ||
| } | ||
|
|
||
| testSetupMenu() { | ||
| echo "A. Add a test configuration for SQL Server." | ||
| echo "B. Add a test configuration for Firebird." | ||
| echo "C. Add a test configuration for SQLite." | ||
| echo "D. Add a test configuration for PostgreSQL." | ||
| echo "E. Add a test configuration for MySql." | ||
| echo "." | ||
This comment was marked as resolved.
Sorry, something went wrong. |
||
| echo "X. Exit to main menu." | ||
| echo "." | ||
|
|
||
| $BUILD_TOOL prompt ABCDEX | ||
|
|
||
| OPTION=$? | ||
| if [ $OPTION -eq 5 ] | ||
| then | ||
| echo "Main menu" | ||
| mainMenu | ||
| elif [ $OPTION -eq 4 ] | ||
| then | ||
| echo "MySQL" | ||
| testSetupMysql | ||
| mainMenu | ||
| elif [ $OPTION -eq 3 ] | ||
| then | ||
| echo "PostgreSQL" | ||
| testSetupPostgresql | ||
| mainMenu | ||
| elif [ $OPTION -eq 2 ] | ||
| then | ||
| echo "Sqlite" | ||
| testSetupSqlite | ||
| mainMenu | ||
| elif [ $OPTION -eq 1 ] | ||
| then | ||
| echo "Firebird" | ||
| testSetupFirebird | ||
| mainMenu | ||
| elif [ $OPTION -eq 0 ] | ||
| then | ||
| echo "SQL Server" | ||
| testSetupSqlServer | ||
| mainMenu | ||
| fi | ||
| } | ||
|
|
||
| testRun(){ | ||
| dotnet test ./src/NHibernate.Test/NHibernate.Test.csproj -f netcoreapp2.0 | ||
| dotnet test ./src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj -f netcoreapp2.0 | ||
| mainMenu | ||
| } | ||
|
|
||
| generateAsync(){ | ||
| dotnet msbuild /t:Restore ./src/NHibernate.sln | ||
|
|
||
| getAsyncGeneratorPath | ||
| cd src | ||
| mono ../"$async_generator_path" | ||
| cd .. | ||
|
|
||
| mainMenu | ||
| } | ||
|
|
||
| getAsyncGeneratorPath(){ | ||
| if [ "$async_generator_path" ] | ||
| then | ||
| return | ||
| fi | ||
|
|
||
| cd Tools | ||
|
|
||
| if [ ! -f nuget.exe ] | ||
| then | ||
| wget https://dist.nuget.org/win-x86-commandline/latest/nuget.exe | ||
| fi | ||
|
|
||
| async_generator_path="CSharpAsyncGenerator.CommandLine.$(cat packages.config | grep id=\"CSharpAsyncGenerator.CommandLine | cut -d\" -f4)/tools" | ||
|
There was a problem hiding this comment. Hack for parsing the async generator version out of the packages.config file:
If you know a better way, of course propose it. |
||
|
|
||
| if [ ! -d $async_generator_path ] | ||
| then | ||
| mono nuget.exe install | ||
| fi | ||
|
|
||
| if [ ! -f $async_generator_path/SQLitePCLRaw.core.dll ] | ||
| then | ||
| # This "hidden" dependency causes a failure under some Mono setup, add it explicitly | ||
| mono nuget.exe install SQLitePCLRaw.core -Version 1.0.0 | ||
| cp SQLitePCLRaw.core.1.0.0/lib/net45/SQLitePCLRaw.core.dll $async_generator_path/ | ||
| fi | ||
|
|
||
| async_generator_path="Tools/$async_generator_path/AsyncGenerator.CommandLine.exe" | ||
|
|
||
| cd .. | ||
| } | ||
|
|
||
| mainMenu() { | ||
| echo "========================= NHIBERNATE BUILD MENU ==========================" | ||
| echo "--- TESTING ---" | ||
| echo "A. (Step 1) Set up a new test configuration for a particular database." | ||
| echo "B. (Step 2) Activate a test configuration." | ||
| echo "C. (Step 3) Run tests." | ||
| echo "." | ||
| echo "--- BUILD ---" | ||
| echo "E. Build NHibernate (Debug)" | ||
| echo "F. Build NHibernate (Release)" | ||
| echo "." | ||
| echo "--- Code generation ---" | ||
| echo "H. Generate async code (Generates files in Async sub-folders)" | ||
| echo "." | ||
| echo "--- Exit ---" | ||
| echo "X. Make the beautiful build menu go away." | ||
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
Sorry, something went wrong. |
||
| echo "." | ||
|
|
||
| $BUILD_TOOL prompt ABCEFHX | ||
|
|
||
| OPTION=$? | ||
|
|
||
| if [ $OPTION -eq 5 ] | ||
| then | ||
| generateAsync | ||
| elif [ $OPTION -eq 4 ] | ||
| then | ||
| buildRelease | ||
| elif [ $OPTION -eq 3 ] | ||
| then | ||
| buildDebug | ||
| elif [ $OPTION -eq 2 ] | ||
| then | ||
| testRun | ||
| elif [ $OPTION -eq 1 ] | ||
| then | ||
| testActivate | ||
| elif [ $OPTION -eq 0 ] | ||
| then | ||
| testSetupMenu | ||
| fi | ||
| } | ||
|
|
||
| mainMenu | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,8 @@ | |
| *.user | ||
| *.suo | ||
| .vs/ | ||
| bin/ | ||
| obj/ | ||
| *.vshost.* | ||
| .idea/ | ||
| .vs/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,59 +1,6 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <TargetFramework>netcoreapp2.0</TargetFramework> | ||
This comment was marked as resolved.
Sorry, something went wrong. |
||
| </PropertyGroup> | ||
| </Project> | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Be it under Linux or Windows, I was noticing a lag in the build menu for displaying the letter choices prompt. And there was also a startup lag due to relaunching the build.
There were also some differences in the way the build tool was handled between Linux and Windows, without me seeing why they would need to be differently handled.
So I have changed the logic for building only if the binary is not already there, and for running directly the binary (
dotnet pathOfBinary) instead of running the project from sources (dotnet run pathToSrc).This eliminates the lag in the build menu both under Linux and Windows.
For simplicity, I have redirected the build output directly in the bin folder instead of letting it go into
Release\netcoreapp2.0.