Commit Graph

5269 Commits

Author SHA1 Message Date
Corentin Le Molgat
29b9aa9245 Fix .gitignore 2018-06-29 11:01:40 +02:00
Corentin Le Molgat
090d2c47c6 Rework clean_dotnet target 2018-06-29 11:01:39 +02:00
Corentin Le Molgat
bd55aad511 clean_dotnet: remove keyfile 2018-06-29 11:01:39 +02:00
Corentin Le Molgat
8f1dd4ff6c archive: fix temp_fz_test_dir directory name 2018-06-29 11:01:39 +02:00
Corentin Le Molgat
f41763869b dotnet: use consistent naming for temp dir
same naming than python / cpp / flatzinc
2018-06-29 11:01:39 +02:00
Corentin Le Molgat
314c2d16bc dotnet: Fix test_dotnet on windows 2018-06-29 11:01:39 +02:00
Corentin Le Molgat
019220dc5b dotnet: restore Google.OrTools.FSharp.Tests project 2018-06-29 11:01:39 +02:00
Corentin Le Molgat
b355529e3d dotnet: Add missing CLR_ORTOOLS variable 2018-06-29 11:01:39 +02:00
Corentin Le Molgat
521b5729a2 dotnet: Update detect_dotnet 2018-06-29 11:01:39 +02:00
Corentin Le Molgat
f3b4624cb1 dotnet: remove BASE_CLR_ORTOOLS_DLL_NAME 2018-06-29 11:01:39 +02:00
Corentin Le Molgat
1ba5a15276 dotnet: rename CLR_ORTOOLS_IMPORT_DLL_NAME
$(LIB_PREFIX)$(CLR_ORTOOLS_DLL_NAME) -> $(CLR_ORTOOLS_DLL_NAME).import
2018-06-29 11:01:39 +02:00
Corentin Le Molgat
6e8e4f3e10 dotnet: cleanup variable naming 2018-06-29 11:01:39 +02:00
Corentin Le Molgat
10805b8dd2 Don't make dotnet dependent on clean_dotnet 2018-06-29 11:01:39 +02:00
Corentin Le Molgat
6e04d73111 dotnet: replace unneeded tab by space 2018-06-29 11:01:39 +02:00
Corentin Le Molgat
d1bc300dba dotnet: limit code width 2018-06-29 11:01:39 +02:00
Corentin Le Molgat
da0ec11951 dotnet: Fix path separator 2018-06-29 11:01:39 +02:00
Corentin Le Molgat
d300ba1d1f dotnet: fix comment on Windows 2018-06-29 11:01:39 +02:00
Corentin Le Molgat
6d6233bf4c dotnet: cleaning $(BIN_DIR)/$(CLR_ORTOOLS_DLL_NAME)$(DLL) 2018-06-29 11:01:38 +02:00
Corentin Le Molgat
8dc57a926c dotnet: Fix PROTOC usage 2018-06-29 11:01:38 +02:00
Corentin Le Molgat
3844b47b1b Makefile: fix command separator on Windows 2018-06-29 11:01:38 +02:00
Corentin Le Molgat
ee846c9377 dotnet: Removing unneeded copies of dependency libs. 2018-06-29 11:01:38 +02:00
Corentin Le Molgat
468dbe0a8e dotnet: fix clean rule 2018-06-29 11:01:38 +02:00
Corentin Le Molgat
63a037639b dotnet: fix OR_TOOLS_LDFLAGS 2018-06-29 11:01:38 +02:00
acco32
8f79b61f1f Fix dependencies for linux 2018-06-29 11:01:38 +02:00
Matthew Moore
c5067e1826 Fix library references for build & tests. Modified examples. 2018-06-29 11:01:38 +02:00
Matthew Moore
ccadca6273 Use correct name for library when importing 2018-06-29 11:01:38 +02:00
Matthew Moore
8d130cdf11 Add net462 target for C# library 2018-06-29 11:01:38 +02:00
Matthew Moore
408fc70416 Correct dotnet compiler path on osx 2018-06-29 11:01:38 +02:00
Matthew Moore
d4d34a4a0e correct output folder for library 2018-06-29 11:01:38 +02:00
Matthew Moore
d8f348bbf2 Use correct protobuf binary 2018-06-29 11:01:38 +02:00
acco32
c3b194045b Get changes from upstream 2018-06-29 11:01:38 +02:00
acco32
c683c2aea0 Use correct folder for test assembly on windows builds 2018-06-29 11:01:38 +02:00
Matthew Moore
8029fcea0f Call test runner once for all test libraries 2018-06-29 11:01:38 +02:00
Matthew Moore
4a9d01a465 Account for paths in Windows 2018-06-29 11:01:37 +02:00
Matthew Moore
2d7705afb4 Adding target for keyfile 2018-06-29 11:01:37 +02:00
Matthew Moore
9aaa87a35a Only build dotnet in CI 2018-06-29 11:01:37 +02:00
Matthew Moore
a8ee3cbbee Add nuget package holding all libraries for development 2018-06-29 11:01:37 +02:00
Matthew Moore
b7a458f321 Add F# with associated makefile targets 2018-06-29 11:01:37 +02:00
Matthew Moore
d43cd0c12d Add test project and example tests 2018-06-29 11:01:37 +02:00
Matthew Moore
d581a3fff8 Build OrTools using netstandard 2018-06-29 11:01:37 +02:00
Matthew Moore
b51e77c27d Initial commit to unify all dotnet under one project 2018-06-29 11:01:37 +02:00
Corentin Le Molgat
8d7eb4774c Sat: use std::this_thread::sleep_for(50ms) instead 2018-06-29 10:18:26 +02:00
Corentin Le Molgat
3043efa437 CMake: Add missing __WIN32__ 2018-06-29 09:31:52 +02:00
Corentin Le Molgat
81ab6f8956 Move include windows.h to bottom 2018-06-28 23:35:35 +02:00
Mizux
94b539b775 Blind Fix Windows 2018-06-28 22:39:58 +02:00
Laurent Perron
d961688ee2 fix sat code 2018-06-28 12:35:25 +02:00
Laurent Perron
b49f23e74d LNS wait for the solution from the other threads 2018-06-27 23:32:56 +02:00
Laurent Perron
835f85a3fc remove comment 2018-06-27 16:44:33 +02:00
Laurent Perron
89af2a6b61 remove completion heuristic from sat/fz, move it to sat directly; clean up // cp-sat + lns code 2018-06-27 15:59:02 +02:00
Laurent Perron
745fab7b06 LNS improvements 2018-06-27 10:08:08 +02:00