Skip to content

Commit d5bd7e9

Browse files
committed
Bundle DLLs required by OR Tools
OR Tools can no longer be built statically linked, so we have to bundle the DLLs
1 parent f43182a commit d5bd7e9

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ package:linux:
216216
- mv vendor/chuffed/bin/fzn-chuffed $PACKAGE/bin/
217217
- cp -r vendor/chuffed/share/minizinc/* $PACKAGE/share/minizinc/
218218
- mv vendor/or-tools/bin/fzn-cp-sat $PACKAGE/bin/
219+
- cp vendor/or-tools/lib64/*.so $PACKAGE/lib/
219220
- cp -r vendor/or-tools/share/minizinc/* $PACKAGE/share/minizinc/
220221
- cp vendor/highs/lib64/libhighs.so $PACKAGE/lib/
221222
### Package Globalizer
@@ -262,6 +263,7 @@ package:osx:
262263
- mv vendor/chuffed/bin/fzn-chuffed $DIR/bin/
263264
- cp -r vendor/chuffed/share/minizinc/* $MZNDIR/
264265
- mv vendor/or-tools/bin/fzn-cp-sat $DIR/bin/
266+
- cp vendor/or-tools/lib/*.dylib $DIR/lib/
265267
- cp -r vendor/or-tools/share/minizinc/* $MZNDIR/
266268
- cp vendor/highs/lib/libhighs.dylib $DIR/lib/
267269
### Package Globalizer
@@ -387,6 +389,7 @@ package:appimage:
387389
- cp -r vendor/chuffed/share/minizinc/* $PACKAGE/usr/share/minizinc/
388390
- mv vendor/or-tools/bin/fzn-cp-sat $PACKAGE/usr/bin/
389391
- cp -r vendor/or-tools/share/minizinc/* $PACKAGE/usr/share/minizinc/
392+
- cp vendor/or-tools/lib64/*.so $PACKAGE/usr/lib/
390393
- cp vendor/highs/lib64/libhighs.so $PACKAGE/usr/lib/
391394
### Package Globalizer
392395
- mv globalizer/bin/minizinc-globalizer $PACKAGE/usr/bin/
@@ -480,6 +483,7 @@ minizinc:linux:nogui:
480483
- mv vendor/chuffed/bin/fzn-chuffed $PACKAGE/bin/
481484
- cp -r vendor/chuffed/share/minizinc/* $PACKAGE/share/minizinc/
482485
- mv vendor/or-tools/bin/fzn-cp-sat $PACKAGE/bin/
486+
- cp vendor/or-tools/lib64/*.so $PACKAGE/lib/
483487
- cp -r vendor/or-tools/share/minizinc/* $PACKAGE/share/minizinc/
484488
- cp vendor/highs/lib64/libhighs.so $PACKAGE/lib/
485489
### Strip included binaries

resources/pkg_config/minizinc-bundle.iss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ Source: "{#MyAppDirectory}\vendor\chuffed\bin\fzn-chuffed.exe"; DestDir:"{app}\b
5858
Source: "{#MyAppDirectory}\vendor\chuffed\share\minizinc\*"; DestDir: "{app}\share\minizinc\"; Flags: ignoreversion recursesubdirs createallsubdirs
5959

6060
Source: "{#MyAppDirectory}\vendor\or-tools\bin\fzn-cp-sat.exe"; DestDir:"{app}\bin"; Flags: ignoreversion
61+
Source: "{#MyAppDirectory}\vendor\or-tools\bin\*.dll"; DestDir:"{app}\bin"; Flags: ignoreversion
6162
Source: "{#MyAppDirectory}\vendor\or-tools\share\minizinc\*"; DestDir: "{app}\share\minizinc\"; Flags: ignoreversion recursesubdirs createallsubdirs
6263

6364
Source: "{#MyAppDirectory}\vendor\highs\bin\highs.dll"; DestDir:"{app}\bin"; Flags: ignoreversion

resources/pkg_config/snapcraft.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ parts:
7373
chuffed/share/minizinc/solvers/*: share/minizinc/solvers/
7474
chuffed/share/minizinc/chuffed: share/minizinc/chuffed
7575
or-tools/bin/fzn-cp-sat: bin/
76+
or-tools/lib64/*.so*: lib/
7677
or-tools/share/minizinc/solvers/*: share/minizinc/solvers/
7778
or-tools/share/minizinc/cp-sat: share/minizinc/cp-sat
7879
highs/lib64/libhighs.so*: lib/

0 commit comments

Comments
 (0)