always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,817 Commits 2 Branches 0 Tags
master
Commit Graph

493 Commits

Author SHA1 Message Date
Laurent Perron
6d2267697b remove rcpsp_sat cpp example 2018-09-12 19:50:26 +02:00
Corentin Le Molgat
72a0f3f8ee Update to SCIP 6.0 
Unix:
- Use of make based install of scip
Windows:
- Use of cmake based install/installer of scip
- Need to copy scip.dll in BIN_DIR
 2018-09-06 12:02:21 +02:00
Corentin Le Molgat
60aca4edc4 Makefile: fixup dependencies on phony target third_party_check 
- make cc twice do nothing as expected (and all targets which depends on it)
 2018-09-06 12:02:20 +02:00
Corentin Le Molgat
cd3f8748d1 cc: Fix clean_cc 
- Add samples binaries to `clean_cc` target
 2018-09-06 12:02:20 +02:00
Corentin Le Molgat
8608266f18 Makefile: fix flatzinc rule on windows 2018-09-06 12:02:20 +02:00
Corentin Le Molgat
a1fdabf3b1 Makefile: remove redundant ortoolslibs target 
- prefere to use `cc` phony target or $(OR_TOOLS_LIBS) file
 2018-09-04 10:07:32 +02:00
Corentin Le Molgat
5a18b2be59 cc: don't compile all test in cc target 
- remove dependencies to `ccexe`
- Add `ccexe` to `test_cc` to compile them all
 2018-09-04 10:07:31 +02:00
Corentin Le Molgat
e4bf44b9fb cc: fix make test_cc 2018-09-03 11:28:13 +02:00
Corentin Le Molgat
6837decccc cpp: Makefile cleanup 2018-08-31 18:23:08 +02:00
Corentin Le Molgat
304cec3258 Makefile: Fix redefinition of symbols on windows 2018-08-07 16:18:00 +02:00
Corentin Le Molgat
bc9777418f Makefile: Rework Windows Third Party management 
- Should fix most of the space in the path issue
  - try to use relative path as much as possible
- follow the same layout than unix third party
 2018-08-07 16:17:59 +02:00
Corentin Le Molgat
d6a6f8b5d2 archive: fix typo 2018-07-24 10:55:29 +02:00
Corentin Le Molgat
09b4af2b91 archive: Fix protobuf recursive copy 
need to use "xcopy source destination /E"
 2018-07-24 10:35:21 +02:00
Corentin Le Molgat
ec6c281d94 archive: Fix windows includes xcopy 
- need to specify (and create) the output directory
e.g. to recursively copy directory 'foo' in 'tmp'
unix: cp -r foo tmp
win: md tmp\\foo & xcopy foo tmp\\foo
 2018-07-24 10:17:39 +02:00
Corentin Le Molgat
665b3ddb07 cpp: Fix windows install, copy third party include 2018-07-24 08:39:57 +02:00
Corentin Le Molgat
e737b10a9a archive: Fix Fz archive 2018-07-13 15:23:12 +02:00
Corentin Le Molgat
7f453a0475 archive: unix: Check if protobuf is in lib or lib64 2018-07-13 15:23:11 +02:00
Corentin Le Molgat
5d8c4f0cb1 archive: Add ortools/data/*.h to archive 
- needed by jobshop_sat
 2018-07-13 14:40:18 +02:00
Corentin Le Molgat
9536db9a98 cc: Fix examples/tests/*.cc 
- Add them to test_cc
  except issue173.cc which takes few dozen of seconds
 2018-07-13 08:55:40 +02:00
Corentin Le Molgat
59db6cb2d8 cpp: Cleaning cpp rules 
- Use pattern rules
- Remove dead code (CP_BINARIES and LP_BINARIES doesn't exist anymore)
- Expose fz and test_fz in help_cc
- Relayout makefile.cc.mk
- Move CVRP Problem rule before generic ones (needed for make < 4.0)
 2018-07-13 08:55:40 +02:00
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
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
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
25afec5599 Add test_fz 2018-06-15 13:43:19 +02:00
Laurent Perron
7c8463e76a fix fz compilation on mac 2018-06-15 11:40:37 +02:00
Corentin Le Molgat
c59f4e8a84 Add missing util/*.pb.h to install rules 2018-06-04 17:24:22 +02:00
Corentin Le Molgat
8430b64c61 Add missing flexible_jobshop to cc target 2018-06-01 17:40:55 +02:00
Corentin Le Molgat
efc46ca1bf Add documentation to C++ and Python Package 
For C++ doc:
/usr/share/doc/ortools
ref: https://www.debian.org/doc/manuals/debian-reference/debian-reference.en.txt

For Python doc:
ref: https://www.python.org/dev/peps/pep-0427/#the-data-directory
ref: https://www.python.org/dev/peps/pep-0491/#install-paths
/!\ Please not bdist_wheel command ignore MANIFEST.in and
 there is no 'doc_dir' option in class Distribution cf.
https://github.com/pypa/setuptools/blob/master/setuptools/dist.py
 2018-05-31 15:12:02 +02:00
Laurent Perron
ca579c649f add code samples in C++ for sat 2018-05-30 10:03:49 -07:00
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
6b36617506 Makefile: Fix $S -> / in prerequisite 
$S is for Makefile shell cmd not target or prerequisite syntax.
i.e. always use / in path.
 2018-05-28 08:08:49 +02:00
Corentin Le Molgat
3605506924 Fix help_cc on windows 
- typo tab instead of space
 2018-05-04 08:57:28 +02:00
Corentin Le Molgat
db17e75c48 Rework install_cc recipe 2018-04-26 17:59:03 +02:00
Corentin Le Molgat
88639db551 Makefile: Update detect_cc recipe 2018-04-26 17:59:03 +02:00
Corentin Le Molgat
8b34288ea0 Makefile.cpp: fix .PHONY 2018-04-26 17:59:03 +02:00
Corentin Le Molgat
61507da995 Add dynamic lib to OR_TOOLS_LNK 2018-04-26 17:59:03 +02:00
Corentin Le Molgat
8bba9eb62c Refactor build dirs Makefile management 2018-04-18 14:12:22 +02:00
Corentin Le Molgat
699ee5c088 Remove Flatzink bin/parser_main in clean_cc 2018-03-16 16:13:55 +01:00
Corentin Le Molgat
8f69f0b3aa Remove C++ examples in clean_cc 2018-03-16 16:13:55 +01:00
Corentin Le Molgat
1265d1d5b4 Fix clean_cc 
Still remains example binaries
 2018-03-16 16:13:55 +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
8bfd7fb96e Add DEPENDENCIES_LNK to detect_cc 2018-03-05 09:17:28 +01:00