Commit Graph

360 Commits

Author SHA1 Message Date
Corentin Le Molgat
078756abee Update Makefile.cc.java.dotnet 2018-10-09 15:15:27 +02:00
Laurent Perron
c57297bc4f fix gen_all_deps for windows 2018-10-05 11:24:53 +02:00
Laurent Perron
bc6af29eec Merge branch 'master' of https://github.com/google/or-tools 2018-10-02 10:36:01 +02:00
Corentin Le Molgat
c907c57305 Fix auditwheel in manylinux docker
force wheel==0.31.1 since API is broken in 0.32
2018-10-02 10:08:34 +02:00
Corentin Le Molgat
2c030d0e38 Fixup publish_delivery_win.cmd 2018-10-02 08:21:33 +02:00
Corentin Le Molgat
49247b4898 Rework Python temp directory
- Make temp dir consistent using underscore
- Fixup TEMP_DIR in build_delivery_* scripts
2018-10-02 08:21:10 +02:00
Corentin Le Molgat
c934a8e296 Upload publish script 2018-10-01 08:32:01 +02:00
Corentin Le Molgat
0d25944755 rework publish script 2018-09-28 17:48:55 +02:00
Laurent Perron
4568ef1a5b revamp gen_dependencies and Makefile.gen.mk 2018-09-28 11:46:52 +02:00
Corentin Le Molgat
0241e6d74e Makefile: Force pb.h files to be build first ! 2018-09-26 17:12:36 +02:00
Corentin Le Molgat
e3c46b4429 Revert "Update generator"
This reverts commit 3495deebaa.
2018-09-26 17:08:51 +02:00
Corentin Le Molgat
3495deebaa Update generator 2018-09-26 14:23:09 +02:00
Corentin Le Molgat
fab7d5e154 Update docker script to run test on archive 2018-09-24 17:37:50 +02:00
Corentin Le Molgat
4742928ce7 Update release script 2018-09-24 17:37:50 +02:00
Corentin Le Molgat
30e88e45c1 Update docker files 2018-09-24 13:05:54 +02:00
Corentin Le Molgat
cb514e5a3b Update manylinux script (#855) 2018-09-21 18:18:32 +02:00
Corentin Le Molgat
c4d0a310e3 release: on windows copy all wheel packages in root dir 2018-09-21 18:18:31 +02:00
Corentin Le Molgat
fe4b33aae5 Rework test_delivery_* scripts (#855)
Verify python wheel packages are working
2018-09-21 18:18:31 +02:00
Corentin Le Molgat
1438b67696 Fix publish_delivery_win
- Nuget package are published by hand,
 since I need the three `runtime.<rid>` on one machine first...
2018-09-20 11:31:40 +02:00
Corentin Le Molgat
ef8c3952c2 Fix docker delivery target 2018-09-19 09:22:24 +02:00
Corentin Le Molgat
5d220f0e98 Update Archive README.md 2018-09-19 09:05:43 +02:00
Corentin Le Molgat
6bbf49935b dotnet: Add examples/tests 2018-09-18 09:16:51 +02:00
Corentin Le Molgat
eb5409ec8c release: fix build_release_win cmd
nuget packages are generated during `make dotnet`
2018-09-17 17:34:10 +02:00
Corentin Le Molgat
0a357d7a48 Update Makefile.cc.java.dotnet 2018-09-17 12:00:59 +02:00
Corentin Le Molgat
16cbba9944 rlease: Add version to build.log 2018-09-17 09:18:27 +02:00
Corentin Le Molgat
490360f443 archive: fix test_dotnet 2018-09-14 18:35:57 +02:00
Corentin Le Molgat
d96123c4be archive: fix typo in rdotnet_% rule 2018-09-14 17:37:47 +02:00
Corentin Le Molgat
158938685a archive: Fix make dotnet 2018-09-14 16:44:58 +02:00
Corentin Le Molgat
1937b3cf24 Remove rcpsp_sat.cpp from archive Makefile 2018-09-14 15:13:16 +02:00
Corentin Le Molgat
5da668b0a7 dotnet: EnableDefaultCompileItems -> EnableDefaultItems in .proj 2018-09-14 11:19:38 +02:00
Corentin Le Molgat
1b15ee2762 Remove unused files 2018-09-11 17:24:46 +02:00
Corentin Le Molgat
f7fde3bd25 dotnet: Move CreateSigningKey to ortools/dotnet (Fix #824) 2018-09-11 15:05:03 +02:00
Corentin Le Molgat
67730bb415 Rework Makefile shipped with the archive
- add rjava_% rdotnet_% and rcc_% commands
2018-09-10 14:24:53 +02:00
Corentin Le Molgat
d840081ca6 Update release script 2018-09-10 12:48:14 +02:00
Corentin Le Molgat
2b1d70acde generate dotnet examples proj update 2018-09-07 17:22:19 +02:00
Corentin Le Molgat
0ba343e0cd Fixup F# examples 2018-09-07 16:59:47 +02:00
Corentin Le Molgat
5a55bb655a Update FSharp examples so all use .NetCoreApp2.1 2018-09-07 12:58:26 +02:00
Laurent Perron
c0eac159c2 update notebooks to remove main() method 2018-09-05 14:27:48 +02:00
Corentin Le Molgat
de311a3466 dotnet: Add sat samples to test_dotnet
- Add .csproj for each sat/samples.cs
  - Update generate_dotnet_csproj.sh
- Fix some samples
- Update clean_dotnet to remove generated files in ortools/sat/samples
2018-08-30 14:35:52 +02:00
Corentin Le Molgat
42d7c276ab dotnet: rework example layout
- Fix examples using MPConstraint::Activity instead of MPSolver
- Move all examples to exmaples/dotnet
- remove netfx sub-directories
- Add all examples to target test_dotnet
  - still few disabled since they are too long
- Add tools/generate_examples_csproj.sh to generate .*proj files
2018-08-30 11:58:47 +02:00
Corentin Le Molgat
62cbe9a228 dotnet: Full Rework
- Create native project runtime.{rid}.Google.OrTools
  - follow the microsoft convention e.g.:
  https://www.nuget.org/packages/Microsoft.NETCore.App/
  https://www.nuget.org/packages/runtime.linux-x64.Microsoft.NETCore.App/
- Target `make_dotnet` targets local nupkg instead of dll.
- Use 4096 RSA key for or-tools.snk
- Clean nuget cache in `clean_dotnet` recipe

Refactor:
- Move cs files to ortools/*/csharp
- Move dotnet project to ortools/dotnet/Google.OrTools
- Move example generation to temp_dotnet
  - Avoid to mess the `BIN_DIR`
- Rework Google.OrTools.FSharp

Cleanup:
- Remove deps to netfx.props since we only support:
  netstandard2.0 TFM and netcoreapp2.1 Runtime TFM
- Remove OrTools.nuspec.in
  -> use newly added properties to .csproj format
- Remove of ortools/dotnet/OrTools project
  - replaced by ortools/dotnet/Google.OrTools
- Remove provided protobuf.dll.
  - Automatically retrieved from nuget.org

Misc:
- Add **/*.csproj to gitignore
- Add **/runtime.json to gitignore

- dotnet: Makefile windows fix
  - make.exe doesn't support `else ifeq`
2018-08-30 11:58:47 +02:00
Laurent Perron
460bbf9bf1 add python3.7 to setup.py 2018-08-03 13:02:33 -07:00
Kevin Mader
e91c16c214 Update export_to_ipynb.py
fixing script to handle xkcd.py as well
2018-08-03 10:26:25 +02:00
Kevin Mader
1f604408e6 updating code to handle script conversion better
the code basically leaves out the 
```
if __name__=='__main__':
``` 
block and unwraps any function called main
2018-08-03 10:13:16 +02:00
Laurent Perron
e5d6a70b0e bump minizinc challenge release up 2018-07-26 13:03:33 -07:00
Corentin Le Molgat
92169c7f7b archive: ignore error if class/% already exist 2018-07-24 13:01:45 +02:00
Corentin Le Molgat
fce004c394 delivery: Add test_archive and test_fz_archive cmd 2018-07-24 08:39:57 +02:00
Corentin Le Molgat
c55af6dfd1 Archive: Fix "which" usage
- Must be define before VAR := usage
2018-07-24 08:39:57 +02:00
Laurent Perron
0bc42c105e improve minizinc challenge docker entry 2018-07-23 13:23:51 -07:00
Corentin Le Molgat
c65b137630 docker: fix apt command for debian-9 2018-07-23 12:52:01 +02:00