Commit Graph

1177 Commits

Author SHA1 Message Date
Corentin Le Molgat
ef5a2a2775 Archive: Rework cc/java/dotnet (Fix #723)
- Rename [Makefile|Readme].cc.java.dotnet
- Add missing dynamic lib on unix archive (Fix #723)
- Add rpah to lib64 for centos
- Use CXX, CXXFLAGS and LDFLAGS
  src: https://www.gnu.org/software/make/manual/make.html#Catalogue-of-Rules
- Add which.exe to archive on windows
- Add test_archive to .PHONY
- Add detect_archive
2018-07-10 15:45:04 +02:00
Corentin Le Molgat
22124f6acf dotnet: rework gen path 2018-07-10 11:16:21 +02:00
Corentin Le Molgat
13a566bed4 Move java examples 2018-07-10 11:16:20 +02:00
Corentin Le Molgat
6485017458 cc: Fix missing port/*.h in install_cc 2018-07-10 11:16:20 +02:00
Corentin Le Molgat
ca6e697788 cc: use MKDIR_P to create the install_cc root dir 2018-07-10 11:16:20 +02:00
Corentin Le Molgat
3085fcbf81 cpp: add FLATZINC_PATH 2018-07-10 11:16:20 +02:00
Corentin Le Molgat
4f24443b17 Move windows tools to tools/win 2018-07-10 11:16:20 +02:00
Corentin Le Molgat
f5f176d496 cpp: Add library path variable 2018-07-05 14:56:04 +02:00
Corentin Le Molgat
89ff4225d1 dotnet: move import lib to bin dir 2018-07-05 14:55:35 +02:00
Corentin Le Molgat
710e753009 Fix python on centos
- LD_LIBRARY_PATH must look into lib64 folder too
2018-07-05 14:53:26 +02:00
Corentin Le Molgat
0eabf6cea6 Split SWIG_LIB_SUFFIX for Python and .NET (Fix #742) 2018-07-04 12:17:29 +02:00
Corentin Le Molgat
ddf7995827 Make generate_deps.sh output identical everywhere
- By default MacOS and gLinux don't behave the same concerning '_' & '-' when sorting
2018-07-04 09:13:32 +02:00
Corentin Le Molgat
a225cf63c8 Update generate_deps.h
- Create empty rules for all source file
  - Add Empty recipe for ALL ortools/*/*.h
  - Add Empty recipe for ALL ortools/*/*.cc
  - Add Empty recipe for ALL ortools/*/*.proto
- Compute .$O prerequisite using .cc AND .h
- Add all pb.h for each associated *_DEPS
- Add all pb.h as prerequisite to associated .$O object
- Generate_deps on MacOS
- Add missing "-e" to echo
- Cleaning comments
- Remove uneeded space before *.cc prerequisite
2018-07-03 22:37:09 +02:00
Corentin Le Molgat
b32dafacc6 Makefile: cc java python dotnet become idempotent
- Remove implicit rules
- Fix python obj/swig deps
- Keep intermediate file and dir
- remove MISSING_BUILD_DIRECTORIES
- Use GEN_DIR and GEN_PATH
- Remove GMake SUFFIXES
2018-07-03 22:27:35 +02:00
Corentin Le Molgat
d1403ea504 Fix csharp_linear_solver deps
- need to depends on GLOP_DEPS
2018-07-03 22:10:19 +02:00
Corentin Le Molgat
a636eafb50 Fix protobuf dynamic dir on MacOS 2018-07-03 22:07:11 +02:00
Corentin Le Molgat
77c2aff0a6 dotnet: Remove temp_dotnet when cleaning 2018-07-03 22:07:11 +02:00
Laurent Perron
05d9faf4d7 cleanup; move parallel code from fz to sat 2018-07-03 13:01:37 +02:00
Corentin Le Molgat
ef37139ca9 dotnet: rework testing 2018-06-29 11:01:40 +02:00
Corentin Le Molgat
61c7e062cc Rework target dependencies 2018-06-29 11:01:40 +02:00
Corentin Le Molgat
3ac92d8c57 CLR_ORTOOLS_FSHARP_DLL_NAME depends on OR_TOOLS_LIBS
just to be consistent with CLR_ORTOOLS_DLL_NAME
2018-06-29 11:01:40 +02:00
Corentin Le Molgat
0ef0e66158 dotnet: split PROTOC Commands 2018-06-29 11:01:40 +02:00
Corentin Le Molgat
a3af1d6d92 dotnet: use immediate expansion for variables 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
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