Commit Graph

85 Commits

Author SHA1 Message Date
Corentin Le Molgat
6cd8da56ce [CPP] Rework cc to use dynamic dependencies
libortools:
- Rename LD_FLAGS to LDFLAGS
- Update LDFLAGS
- Add install_name to LDFLAGS on MacOS
- use OR_TOOLS_LIBS as target name

libraries:
- Rename OR_TOOLS_LD_FLAGS to OR_TOOLS_LDFLAGS
- Add OR_TOOLS_LNK and OR_TOOLS_LDFLAGS
- add install_name on MacOS

Misc:
- Rework LINK_FLAGS
- Replace ortools$Sgen by $(GEN_DIR)
- Fix install_cc rules
- Update detect_cc target
2018-05-28 08:08:49 +02:00
Corentin Le Molgat
02877e28f1 [UNIX][DEPS] Build dependencies as dynamic libs
Unix:
- Rename install_directories rule
  this target creates dependencies/install dir not ortools install dir
- replace $(LIB_SUFFIX) by $L to be consistent with $E and $O suffix
- fix rpath, no need anymore patchelf
  -> remove prerequisite $(PATCHELF) in install_cc
- use build_cmake as build directory
  note: MacOS is case insensitive when creating directory
  and bazel file is named BUILD -> `mkdir build` won't work
- Fix CMD_LNK on mac
- Fix MacOS LINK_FLAGS
- MacOS also use LIB_DIR = lib

Win:
- Fix windows lib suffix $L

Protobuf:
- Need to use PROTOC (like MONO) to add LD_LIBRARY_PATH hack
  -> PROTOC = LD_LIBARY_PATH="..." protoc
  -> replace $(PROTOBUF_DIR)/bin/protoc by $(PROTOC)
- Remove uneeded PROTOBUF_DIR defs
- Apply patch to protobuf to use @rpath on MacOS
- Add rpath to protobuf install rules

Coin-OR
- Use coin-or github repos mirror instead of the svn repo (Fix #379)
- Use the splited Cbc (CoinUtils, Osi, Clp, Cgl, Cbc)
note: usually distro use this layout cf https://repology.org/metapackage/coin-or-cbc/badges
- Fix rpath for all coin-or libraries at post-install using patchelf (linux) or otools (osx)
2018-05-28 08:08:49 +02:00
Corentin Le Molgat
b96703d0ce Use JAVA_HOME instead of JDK_DIRECTORY (#614) 2018-03-08 09:52:29 +01:00
Corentin Le Molgat
11a22957a4 Fix echo blankline on windows 2018-03-06 15:03:40 +01:00
Corentin Le Molgat
9b41cae639 Update detect_* targets 2018-03-06 14:34:41 +01:00
Corentin Le Molgat
6eff7e4476 Add newline at end of each help_* targets 2018-03-06 14:23:47 +01:00
Laurent Perron
a4f4c2d5a6 move check_third_party into ortoolslib target; avoid rebuilding C# all the time 2018-03-06 11:42:06 +01:00
Corentin Le Molgat
c53de553d6 Add JNIFLAGS to detect_java 2018-03-05 09:17:28 +01:00
Corentin Le Molgat
51b56430f5 Rework Makefile help 2018-03-05 09:17:28 +01:00
Corentin Le Molgat
2bd7f9d1bb Fix help_XXX target on Windows 2018-02-28 15:20:56 +01:00
Corentin Le Molgat
671cf273b1 Rework Java Makefile 2018-02-28 15:14:48 +01:00
Corentin Le Molgat
707a8789bf rework Makefile 'detect' target 2017-12-01 15:30:47 +01:00
Corentin Le Molgat
d824ed88ce Fix JAVA variables 2017-11-24 15:14:08 +01:00
Laurent Perron
66b8d23079 move src to ortools; simplified python generation; remove some namespaces in the ortools/base helper files 2017-04-26 17:30:25 +02:00
Laurent Perron
c9b8b7b3e6 Fix routing deps 2017-04-09 21:56:47 +02:00
Driss Lahlou
1653ebc168 fix in java dependencies 2017-01-11 19:12:16 +01:00
Driss Lahlou
8b1cc2e407 Refactoring of makefiles 2017-01-10 21:05:56 +01:00
Driss Lahlou
c0589fe8f2 fixes in Makefiles concerning EX and ARGS 2016-10-06 12:08:29 +02:00
Driss Lahlou
ba686e3f2f changes in running examples targets 2016-09-29 18:50:59 +02:00
Driss Lahlou
62f33375ae Makefile for python 2016-09-22 14:55:50 +02:00
Laurent Perron
330d5915d9 update archive supplied readme and makefile: add support for C# and Java compilation 2016-07-22 14:47:23 -07:00
Driss Lahlou
ecf685062f refactoring archives target. New File : makefiles/Makefile.archive.mk 2016-07-01 11:24:17 +02:00
Laurent Perron
0d911276f3 completely revamp dependencies on header and protobuf files. Should be more robust now 2016-06-28 00:18:34 +02:00
Laurent Perron
e7ea660bdd LIBPREFIX -> LIB_PREFIX 2016-06-27 22:32:11 +02:00
Driss Lahlou
f433040b01 Makefiles refactor 2016-06-27 15:30:24 +02:00
Laurent Perron
2fc3704da7 change installation directory 2016-06-21 14:39:26 +02:00
Laurent Perron
ba692308f1 revamp archive numbering 2016-06-21 11:41:13 +02:00
Laurent Perron
088dcbafb5 working java with visual studio 2015; fix for protobuf beta3 with java 2016-06-03 05:22:03 -07:00
Laurent Perron
fd1e4d4353 Issue173 in java 2016-04-14 13:23:00 +02:00
Laurent Perron
6fe0922561 adapt to data being moved to examples 2016-04-12 18:04:18 +02:00
Laurent Perron
6127049df6 fix issue #105, add --no-same-owner to tar on unix 2016-03-08 14:20:50 -08:00
Laurent Perron
1789760306 fix java 2016-02-03 16:07:11 +01:00
Laurent Perron
bb6e091027 Switch parameters to proto3, propagate to all code, offer support in all languages 2016-02-03 15:15:58 +01:00
Laurent Perron
eaaf4efbc3 clean java makefile 2015-08-06 13:54:09 +02:00
Olivier Ratier
f4787f2d67 Merge remote-tracking branch 'github/master' into cbc_thread_fix_github 2015-06-23 17:25:21 +02:00
Vincent Furnon
34dadaba04 Clean overall Java support . 2015-06-18 17:51:34 +02:00
Olivier Ratier
8f5e42c1de Exhibiting multi thread issue with Java + Coin-Cbc for both Unix and Windows 2015-06-18 14:26:33 +02:00
Vincent Furnon
7182abb864 Renamed the linear solver protocol buffer and removed the new_proto namespace. 2015-06-16 10:08:44 +02:00
Laurent Perron
94469b92ca replace svnversion 2015-03-03 15:19:24 +01:00
lperron@google.com
d75d220663 use SVNVERSION_SIMPLE when creating archives 2015-02-04 12:17:07 +00:00
lperron@google.com
97a42ce9fe more thorough cleaning 2014-12-28 10:49:49 +00:00
lperron@google.com
5cf9eb33c2 fix 2014-08-15 22:22:26 +00:00
lperron@google.com
04e7539989 big bang on java swig 2014-06-11 22:28:04 +00:00
lperron@google.com
4aeb000b84 fix make rjava 2014-03-20 14:38:12 +00:00
lperron@google.com
d4b27bf435 bump cbc to 2.8.9; bump mono to 3.2.6; automatically pull libtool,automake,autoconf on mac, pull bison 3.0.2 and flex 2.5.37 on unix to build the new prototype flatzinc interpreter 2014-02-09 21:38:17 +00:00
lperron@google.com
5a8d7a15ea unique java library 2014-01-16 01:23:35 +00:00
lperron@google.com
dea0ed7c7b fix java graph after swig shake up 2014-01-16 00:09:48 +00:00
laurent.perron@gmail.com
629a2369e9 cvrptw in C# 2014-01-03 18:38:52 +00:00
lperron@google.com
5aaea1d858 remove obsolete linear_solver.proto; speed up sat solver 2013-12-20 10:44:30 +00:00
lperron@google.com
07481aeaab fix java archive 2013-10-30 09:51:01 +00:00