always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move windows tools to tools/win

Browse Source
This commit is contained in:
Corentin Le Molgat
2018-07-05 16:08:54 +02:00
parent e809e085e8
commit 4f24443b17
32 changed files with 151 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.appveyor.yml
View File

@@ -35,26 +35,26 @@ before_build:
- if "%VS%"=="2017" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
- if "%VS%"=="2015" call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
- if "%VS%"=="2015" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
- tools\which csc.exe
- tools\which fsc.exe
- tools\which dotnet.exe
- tools\win\which.exe csc.exe
- tools\win\which.exe fsc.exe
- tools\win\which.exe dotnet.exe
- cmake --version
- set PATH=C:\Python36-x64;%PATH%
- tools\which python.exe
- tools\win\which.exe python.exe
- python -V
- python -m pip install virtualenv wheel six
# - set PATH="C:\Program Files\Java\jdk1.8.0\bin";%PATH%
- if "%BUILDER%"=="cmake" cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release -G "%CMAKE_GENERATOR%"
- if "%BUILDER%"=="make" del "C:\Program Files\Git\usr\bin\sh.exe"
- if "%BUILDER%"=="make" tools\make detect
- if "%BUILDER%"=="make" tools\make.exe detect
build_script:
- if "%BUILDER%"=="cmake" cmake --build build --config Release --target ALL_BUILD -- %MSBUILD_FLAGS%
- if "%BUILDER%"=="make" tools\make third_party
- if "%BUILDER%"=="make" tools\make help_%LANGUAGE%
- if "%BUILDER%"=="make" tools\make %LANGUAGE%
- if "%BUILDER%"=="make" tools\make test_%LANGUAGE%
- if "%LANGUAGE%"=="all" tools\make test_fz
- if "%BUILDER%"=="make" tools\make.exe third_party
- if "%BUILDER%"=="make" tools\make.exe help_%LANGUAGE%
- if "%BUILDER%"=="make" tools\make.exe %LANGUAGE%
- if "%BUILDER%"=="make" tools\make.exe test_%LANGUAGE%
- if "%LANGUAGE%"=="all" tools\make.exe test_fz
test_script:
- if "%BUILDER%"=="cmake" cmake --build build --config Release --target RUN_TESTS

4
makefiles/Makefile.cpp.mk
View File

@@ -3,10 +3,10 @@
help_cc:
@echo Use one of the following C++ targets:
ifeq ($(SYSTEM),win)
@tools\grep.exe "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.cpp.mk | tools\sed.exe "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/"
@$(GREP) "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.cpp.mk | $(SED) "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/"
@echo off & echo(
else
@grep "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.cpp.mk | sed "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" | expand -t20
@$(GREP) "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.cpp.mk | $(SED) "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" | expand -t20
@echo
endif

4
makefiles/Makefile.csharp.mk
View File

@@ -3,10 +3,10 @@
help_csharp:
@echo Use one of the following C# targets:
ifeq ($(SYSTEM),win)
@tools\grep.exe "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.csharp.mk | tools\sed.exe "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/"
@$(GREP) "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.csharp.mk | $(SED) "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/"
@echo off & echo(
else
@grep "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.csharp.mk | sed "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" | expand -t20
@$(GREP) "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.csharp.mk | $(SED) "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" | expand -t20
@echo
endif

4
makefiles/Makefile.dotnet.mk
View File

@@ -3,10 +3,10 @@
help_dotnet:
@echo Use one of the following dotnet targets:
ifeq ($(SYSTEM),win)
@tools\grep.exe "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.dotnet.mk | tools\sed.exe "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/"
@$(GREP) "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.dotnet.mk | $(SED) "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/"
@echo off & echo(
else
@grep "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.dotnet.mk | sed "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" | expand -t20
@$(GREP) "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.dotnet.mk | $(SED) "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" | expand -t20
@echo
endif

4
makefiles/Makefile.fsharp.mk
View File

@@ -3,10 +3,10 @@
help_fsharp:
@echo Use one of the following F# targets:
ifeq ($(SYSTEM),win)
@tools\grep.exe "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.fsharp.mk | tools\sed.exe "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/"
@$(GREP) "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.fsharp.mk | $(SED) "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/"
@echo off & echo(
else
@grep "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.fsharp.mk | sed "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" | expand -t20
@$(GREP) "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.fsharp.mk | $(SED) "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" | expand -t20
@echo
endif

12
makefiles/Makefile.install.mk
View File

@@ -4,15 +4,9 @@ install_deps_dirs:
-$(MKDIR_P) "$(prefix)$Sinclude$Sgoogle"
install_full_cc: install_cc install_deps_dirs
ifeq ($(SYSTEM),win)
tools\tar.exe -cf - -C dependencies$Sinstall$Sinclude gflags | tools\tar.exe -xpf - -C "$(prefix)$Sinclude"
tools\tar.exe -cf - -C dependencies$Sinstall$Sinclude glog | tools\tar.exe -xpf - -C "$(prefix)$Sinclude"
tools\tar.exe -cf - -C dependencies$Sinstall$Sinclude google | tools\tar.exe -xpf - -C "$(prefix)$Sinclude"
else
tar -cf - -C dependencies$Sinstall$Sinclude gflags | tar -xpf - -C "$(prefix)$Sinclude"
tar -cf - -C dependencies$Sinstall$Sinclude glog | tar -xpf - -C "$(prefix)$Sinclude"
tar -cf - -C dependencies$Sinstall$Sinclude google | tar -xpf - -C "$(prefix)$Sinclude"
endif
$(TAR) -cf - -C dependencies$Sinstall$Sinclude gflags | $(TAR) -xpf - -C "$(prefix)$Sinclude"
$(TAR) -cf - -C dependencies$Sinstall$Sinclude glog | $(TAR) -xpf - -C "$(prefix)$Sinclude"
$(TAR) -cf - -C dependencies$Sinstall$Sinclude google | $(TAR) -xpf - -C "$(prefix)$Sinclude"
$(COPY) LICENSE-2.0.txt "$(prefix)"
ifeq ($(PLATFORM),MACOSX)
$(COPY) tools/install_libortools_mac.sh "$(prefix)"

4
makefiles/Makefile.java.mk
View File

@@ -3,10 +3,10 @@
help_java:
@echo Use one of the following Java targets:
ifeq ($(SYSTEM),win)
@tools\grep.exe "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.java.mk | tools\sed.exe "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/"
@$(GREP) "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.java.mk | $(SED) "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/"
@echo off & echo(
else
@grep "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.java.mk | sed "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" | expand -t24
@$(GREP) "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.java.mk | $(SED) "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" | expand -t24
@echo
endif

6
makefiles/Makefile.port.mk
View File

@@ -160,7 +160,7 @@ ifeq ($(SYSTEM),win)
# OS Specific
OS = Windows
OR_TOOLS_TOP_AUX = $(shell cd)
OR_TOOLS_TOP = $(shell echo $(OR_TOOLS_TOP_AUX) | tools\\sed.exe -e "s/\\/\\\\/g" | tools\\sed.exe -e "s/ //g")
OR_TOOLS_TOP = $(shell echo $(OR_TOOLS_TOP_AUX) | tools\\win\\sed.exe -e "s/\\/\\\\/g" | tools\\win\\sed.exe -e "s/ //g")
CODEPORT = OpSys-Windows
# Compiler specific
@@ -202,7 +202,7 @@ ifeq ($(SYSTEM),win)
#Detect csc
ifeq ($(PATH_TO_CSHARP_COMPILER),)
DETECTED_CSC_BINARY := $(shell tools\\which.exe csc 2>nul)
DETECTED_CSC_BINARY := $(shell tools\\win\\which.exe csc 2>nul)
ifeq ($(DETECTED_CSC_BINARY),)
SELECTED_CSC_BINARY = PATH_TO_CSHARP_COMPILER =\# csc was not found. Set this variable to the path of csc to build the csharp files. (ex: PATH_TO_CSHARP_COMPILER = C:\Program Files (x86)\MSBuild\14.0\Bin\amd64\csc.exe)
else
@@ -214,7 +214,7 @@ ifeq ($(SYSTEM),win)
#Detect dotnet
ifeq ($(PATH_TO_DOTNET_COMPILER),)
DETECTED_DOTNET_BINARY := $(shell tools\\which.exe dotnet 2>nul)
DETECTED_DOTNET_BINARY := $(shell tools\\win\\which.exe dotnet 2>nul)
ifeq ($(DETECTED_DOTNET_BINARY),)
SELECTED_DOTNET_BINARY = PATH_TO_DOTNET_COMPILER =\# dotnet was not found. Set this variable to the path of dotnet to build the fsharp files. (ex: PATH_TO_DOTNET_COMPILER = C:\Program Files\dotnet\dotnet.exe)
else

8
makefiles/Makefile.python.mk
View File

@@ -3,10 +3,10 @@
help_python:
@echo Use one of the following Python targets:
ifeq ($(SYSTEM),win)
@tools\grep.exe "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.python.mk | tools\sed.exe "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/"
@$(GREP) "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.python.mk | $(SED) "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/"
@echo off & echo(
else
@grep "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.python.mk | sed "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" | expand -t24
@$(GREP) "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.python.mk | $(SED) "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" | expand -t24
@echo
endif
@@ -524,8 +524,8 @@ python_examples_archive:
$(COPY) tools$SREADME.examples.python temp$Sortools_examples$SREADME.txt
$(COPY) LICENSE-2.0.txt temp$Sortools_examples
ifeq ($(SYSTEM),win)
cd temp\ortools_examples && ..\..\tools\tar.exe -C ..\.. -c -v --exclude *svn* --exclude *roadef* --exclude *vector_packing* examples\data | ..\..\tools\tar.exe xvm
cd temp && ..\tools\zip.exe -r ..\or-tools_python_examples_v$(OR_TOOLS_VERSION).zip ortools_examples
cd temp\ortools_examples && ..\..\$(TAR) -C ..\.. -c -v --exclude *svn* --exclude *roadef* --exclude *vector_packing* examples\data | ..\..\$(TAR) xvm
cd temp && ..\$(ZIP) -r ..\or-tools_python_examples_v$(OR_TOOLS_VERSION).zip ortools_examples
else
cd temp/ortools_examples && tar -C ../.. -c -v --exclude *svn* --exclude *roadef* --exclude *vector_packing* examples/data | tar xvm
cd temp && tar -c -v -z --no-same-owner -f ../or-tools_python_examples$(PYPI_OS)_v$(OR_TOOLS_VERSION).tar.gz ortools_examples

52
makefiles/Makefile.third_party.win.mk
View File

@@ -1,7 +1,7 @@
.PHONY: help_third_party # Generate list of Prerequisite targets with descriptions.
help_third_party:
@echo Use one of the following Prerequisite targets:
@tools\grep.exe "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.third_party.win.mk | tools\sed.exe "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/"
@$(GREP) "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.third_party.win.mk | $(SED) "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/"
@echo off & echo(
# Checks if the user has overwritten default libraries and binaries.
@@ -135,11 +135,11 @@ dependencies/install/lib/zlib.lib: dependencies/sources/zlib-$(ZLIB_TAG)/zlib.h
$(COPY) dependencies$Ssources$Szlib-$(ZLIB_TAG)$Szlib.lib dependencies$Sinstall$Slib
dependencies/sources/zlib-$(ZLIB_TAG)/zlib.h: dependencies/archives/zlib$(ZLIB_ARCHIVE_TAG).zip
tools\unzip -q -d dependencies$Ssources dependencies$Sarchives$Szlib$(ZLIB_ARCHIVE_TAG).zip
$(UNZIP) -q -d dependencies$Ssources dependencies$Sarchives$Szlib$(ZLIB_ARCHIVE_TAG).zip
-$(TOUCH) dependencies$Ssources$Szlib-$(ZLIB_TAG)$Szlib.h
dependencies/archives/zlib$(ZLIB_ARCHIVE_TAG).zip:
tools\wget --quiet -P dependencies$Sarchives http://zlib.net/zlib$(ZLIB_ARCHIVE_TAG).zip
$(WGET) --quiet -P dependencies$Sarchives http://zlib.net/zlib$(ZLIB_ARCHIVE_TAG).zip
install_gflags: dependencies/install/lib/gflags.lib
@@ -155,11 +155,11 @@ dependencies/install/lib/gflags.lib: dependencies/sources/gflags-$(GFLAGS_TAG)/I
$(TOUCH) dependencies/install/lib/gflags_static.lib
dependencies/sources/gflags-$(GFLAGS_TAG)/INSTALL.md: dependencies/archives/gflags-$(GFLAGS_TAG).zip
tools\unzip -q -d dependencies/sources dependencies\archives\gflags-$(GFLAGS_TAG).zip
$(UNZIP) -q -d dependencies/sources dependencies\archives\gflags-$(GFLAGS_TAG).zip
-$(TOUCH) dependencies\sources\gflags-$(GFLAGS_TAG)\INSTALL.md
dependencies/archives/gflags-$(GFLAGS_TAG).zip:
tools\wget --quiet -P dependencies\archives --no-check-certificate https://github.com/gflags/gflags/archive/v$(GFLAGS_TAG).zip
$(WGET) --quiet -P dependencies\archives --no-check-certificate https://github.com/gflags/gflags/archive/v$(GFLAGS_TAG).zip
cd dependencies/archives && rename v$(GFLAGS_TAG).zip gflags-$(GFLAGS_TAG).zip
@@ -174,14 +174,14 @@ dependencies\sources\protobuf-$(PROTOBUF_TAG)\cmake\build\Release\protoc.exe: de
cd dependencies\sources\protobuf-$(PROTOBUF_TAG)\cmake\build && msbuild protobuf.sln /t:Build /p:Configuration=Release;LinkIncremental=false
dependencies\install\include\google\protobuf\message.h: dependencies\sources\protobuf-$(PROTOBUF_TAG)\cmake\build\include.tar
cd dependencies\install && ..\..\tools\tar.exe xvmf ..\sources\protobuf-$(PROTOBUF_TAG)\cmake\build\include.tar
cd dependencies\install && ..\..\$(TAR) xvmf ..\sources\protobuf-$(PROTOBUF_TAG)\cmake\build\include.tar
# copy dependencies\sources\protobuf-$(PROTOBUF_TAG)\src\google\protobuf-$(PROTOBUF_TAG)\stubs\stl_util.h dependencies\install\include\google\protobuf-$(PROTOBUF_TAG)\stubs
dependencies\sources\protobuf-$(PROTOBUF_TAG)\cmake\build\include.tar: dependencies\sources\protobuf-$(PROTOBUF_TAG)\cmake\build\protobuf.sln
cd dependencies\sources\protobuf-$(PROTOBUF_TAG)\cmake\build && extract_includes.bat
# workaround waiting for https://github.com/google/protobuf/pull/4538
$(COPY) dependencies\sources\protobuf-$(PROTOBUF_TAG)\src\google\protobuf\*.proto dependencies\sources\protobuf-$(PROTOBUF_TAG)\cmake\build\include\google\protobuf
cd dependencies\sources\protobuf-$(PROTOBUF_TAG)\cmake\build && ..\..\..\..\..\tools\tar.exe cf include.tar include
cd dependencies\sources\protobuf-$(PROTOBUF_TAG)\cmake\build && ..\..\..\..\..\$(TAR) cf include.tar include
dependencies\sources\protobuf-$(PROTOBUF_TAG)\cmake\build\protobuf.sln: dependencies\sources\protobuf-$(PROTOBUF_TAG)\cmake\CMakeLists.txt
-${MKDIR} dependencies\sources\protobuf-$(PROTOBUF_TAG)\cmake\build
@@ -189,8 +189,8 @@ dependencies\sources\protobuf-$(PROTOBUF_TAG)\cmake\build\protobuf.sln: dependen
cd dependencies\sources\protobuf-$(PROTOBUF_TAG)\cmake\build && "$(CMAKE)" -G $(CMAKE_PLATFORM) -Dprotobuf_BUILD_TESTS=OFF ..
dependencies\sources\protobuf-$(PROTOBUF_TAG)\cmake\CMakeLists.txt:
tools\wget --quiet -P dependencies\archives --no-check-certificate https://github.com/google/protobuf/archive/v$(PROTOBUF_TAG).zip
tools\unzip -q -d dependencies\sources dependencies\archives\v$(PROTOBUF_TAG).zip
$(WGET) --quiet -P dependencies\archives --no-check-certificate https://github.com/google/protobuf/archive/v$(PROTOBUF_TAG).zip
$(UNZIP) -q -d dependencies\sources dependencies\archives\v$(PROTOBUF_TAG).zip
install_glog: dependencies/install/include/glog/logging.h
@@ -206,11 +206,11 @@ dependencies/install/include/glog/logging.h: dependencies/sources/glog-$(GLOG_TA
$(TOUCH) dependencies/install/lib/glog_static.lib
dependencies/sources/glog-$(GLOG_TAG)/CMakeLists.txt: dependencies/archives/glog-$(GLOG_TAG).zip
tools\unzip -q -d dependencies/sources dependencies\archives\glog-$(GLOG_TAG).zip
$(UNZIP) -q -d dependencies/sources dependencies\archives\glog-$(GLOG_TAG).zip
-$(TOUCH) dependencies\sources\glog-$(GLOG_TAG)\CMakeLists.txt
dependencies/archives/glog-$(GLOG_TAG).zip:
tools\wget --quiet -P dependencies\archives --no-check-certificate https://github.com/google/glog/archive/v$(GLOG_TAG).zip
$(WGET) --quiet -P dependencies\archives --no-check-certificate https://github.com/google/glog/archive/v$(GLOG_TAG).zip
cd dependencies/archives && rename v$(GLOG_TAG).zip glog-$(GLOG_TAG).zip
# Install Coin CBC.
@@ -232,23 +232,23 @@ dependencies\install\bin\cbc.exe: dependencies\sources\Cbc-$(CBC_TAG)\Cbc\MSVisu
copy dependencies\sources\Cbc-$(CBC_TAG)\Cbc\MSVisualStudio\v10\$(CBC_PLATFORM)\cbc.exe dependencies\install\bin
dependencies\sources\Cbc-$(CBC_TAG)\Cbc\MSVisualStudio\v10\$(CBC_PLATFORM)\cbc.exe: dependencies\sources\Cbc-$(CBC_TAG)\configure
tools\upgrade_vs_project.cmd dependencies\\sources\\Cbc-$(CBC_TAG)\\Clp\\MSVisualStudio\\v10\\libOsiClp\\libOsiClp.vcxproj $(VS_RELEASE)
tools\upgrade_vs_project.cmd dependencies\\sources\\Cbc-$(CBC_TAG)\\Clp\\MSVisualStudio\\v10\\libClp\\libClp.vcxproj $(VS_RELEASE)
tools\upgrade_vs_project.cmd dependencies\\sources\\Cbc-$(CBC_TAG)\\Cbc\\MSVisualStudio\\v10\\libOsiCbc\\libOsiCbc.vcxproj $(VS_RELEASE)
tools\upgrade_vs_project.cmd dependencies\\sources\\Cbc-$(CBC_TAG)\\Cbc\\MSVisualStudio\\v10\\libCbc\\libCbc.vcxproj $(VS_RELEASE)
tools\upgrade_vs_project.cmd dependencies\\sources\\Cbc-$(CBC_TAG)\\Cbc\\MSVisualStudio\\v10\\cbc\\cbc.vcxproj $(VS_RELEASE)
tools\upgrade_vs_project.cmd dependencies\\sources\\Cbc-$(CBC_TAG)\\Cbc\\MSVisualStudio\\v10\\libCbcSolver\\libCbcSolver.vcxproj $(VS_RELEASE)
tools\upgrade_vs_project.cmd dependencies\\sources\\Cbc-$(CBC_TAG)\\Osi\\MSVisualStudio\\v10\\libOsi\\libOsi.vcxproj $(VS_RELEASE)
tools\upgrade_vs_project.cmd dependencies\\sources\\Cbc-$(CBC_TAG)\\CoinUtils\\MSVisualStudio\\v10\\libCoinUtils\\libCoinUtils.vcxproj $(VS_RELEASE)
tools\upgrade_vs_project.cmd dependencies\\sources\\Cbc-$(CBC_TAG)\\Cgl\\MSVisualStudio\\v10\\libCgl\\libCgl.vcxproj $(VS_RELEASE)
tools\sed -i 's/CBC_BUILD;/CBC_BUILD;CBC_THREAD_SAFE;CBC_NO_INTERRUPT;/g' dependencies\\sources\\Cbc-$(CBC_TAG)\\Cbc\\MSVisualStudio\\v10\\libCbcSolver\\libCbcSolver.vcxproj
tools\win\upgrade_vs_project.cmd dependencies\\sources\\Cbc-$(CBC_TAG)\\Clp\\MSVisualStudio\\v10\\libOsiClp\\libOsiClp.vcxproj $(VS_RELEASE)
tools\win\upgrade_vs_project.cmd dependencies\\sources\\Cbc-$(CBC_TAG)\\Clp\\MSVisualStudio\\v10\\libClp\\libClp.vcxproj $(VS_RELEASE)
tools\win\upgrade_vs_project.cmd dependencies\\sources\\Cbc-$(CBC_TAG)\\Cbc\\MSVisualStudio\\v10\\libOsiCbc\\libOsiCbc.vcxproj $(VS_RELEASE)
tools\win\upgrade_vs_project.cmd dependencies\\sources\\Cbc-$(CBC_TAG)\\Cbc\\MSVisualStudio\\v10\\libCbc\\libCbc.vcxproj $(VS_RELEASE)
tools\win\upgrade_vs_project.cmd dependencies\\sources\\Cbc-$(CBC_TAG)\\Cbc\\MSVisualStudio\\v10\\cbc\\cbc.vcxproj $(VS_RELEASE)
tools\win\upgrade_vs_project.cmd dependencies\\sources\\Cbc-$(CBC_TAG)\\Cbc\\MSVisualStudio\\v10\\libCbcSolver\\libCbcSolver.vcxproj $(VS_RELEASE)
tools\win\upgrade_vs_project.cmd dependencies\\sources\\Cbc-$(CBC_TAG)\\Osi\\MSVisualStudio\\v10\\libOsi\\libOsi.vcxproj $(VS_RELEASE)
tools\win\upgrade_vs_project.cmd dependencies\\sources\\Cbc-$(CBC_TAG)\\CoinUtils\\MSVisualStudio\\v10\\libCoinUtils\\libCoinUtils.vcxproj $(VS_RELEASE)
tools\win\upgrade_vs_project.cmd dependencies\\sources\\Cbc-$(CBC_TAG)\\Cgl\\MSVisualStudio\\v10\\libCgl\\libCgl.vcxproj $(VS_RELEASE)
$(SED) -i 's/CBC_BUILD;/CBC_BUILD;CBC_THREAD_SAFE;CBC_NO_INTERRUPT;/g' dependencies\\sources\\Cbc-$(CBC_TAG)\\Cbc\\MSVisualStudio\\v10\\libCbcSolver\\libCbcSolver.vcxproj
cd dependencies\sources\Cbc-$(CBC_TAG)\Cbc\MSVisualStudio\v10 && msbuild Cbc.sln /t:cbc /p:Configuration=Release;BuildCmd=ReBuild
CBC_ARCHIVE:=https://www.coin-or.org/download/source/Cbc/Cbc-${CBC_TAG}.zip
dependencies\sources\Cbc-$(CBC_TAG)\configure:
tools\wget --quiet --continue -P dependencies\archives --no-check-certificate ${CBC_ARCHIVE} || (@echo wget failed to dowload $(CBC_ARCHIVE), try running 'tools\wget -P dependencies\archives --no-check-certificate $(CBC_ARCHIVE)' then rerun 'make third_party' && exit 1)
tools\unzip -q -d dependencies\sources dependencies\archives\Cbc-$(CBC_TAG).zip
$(WGET) --quiet --continue -P dependencies\archives --no-check-certificate ${CBC_ARCHIVE} || (@echo wget failed to dowload $(CBC_ARCHIVE), try running '$(WGET) -P dependencies\archives --no-check-certificate $(CBC_ARCHIVE)' then rerun 'make third_party' && exit 1)
$(UNZIP) -q -d dependencies\sources dependencies\archives\Cbc-$(CBC_TAG).zip
# This is needed to find Coin LP include files and libraries.
ifdef WINDOWS_CLP_DIR
@@ -269,13 +269,13 @@ endif
install_swig: dependencies/install/swigwin-$(SWIG_TAG)/swig.exe
dependencies/install/swigwin-$(SWIG_TAG)/swig.exe: dependencies/archives/swigwin-$(SWIG_TAG).zip
tools$Sunzip -q -d dependencies$Sinstall dependencies$Sarchives$Sswigwin-$(SWIG_TAG).zip
tools$Stouch dependencies$Sinstall$Sswigwin-$(SWIG_TAG)$Sswig.exe
$(UNZIP) -q -d dependencies$Sinstall dependencies$Sarchives$Sswigwin-$(SWIG_TAG).zip
$(TOUCH) dependencies$Sinstall$Sswigwin-$(SWIG_TAG)$Sswig.exe
SWIG_ARCHIVE:=https://superb-dca2.dl.sourceforge.net/project/swig/swigwin/swigwin-$(SWIG_TAG)/swigwin-$(SWIG_TAG).zip
dependencies/archives/swigwin-$(SWIG_TAG).zip:
tools$Swget --quiet -P dependencies$Sarchives --no-check-certificate $(SWIG_ARCHIVE)
$(WGET) --quiet -P dependencies$Sarchives --no-check-certificate $(SWIG_ARCHIVE)
# Install Java protobuf
dependencies/install/lib/protobuf.jar: dependencies/install/bin/protoc.exe

1
makefiles/Makefile.unix.mk
View File

@@ -41,6 +41,7 @@ MKDIR = mkdir
MKDIR_P = mkdir -p
RENAME = mv
SED = sed
TAR = tar
TOUCH = touch
WHICH = which

16
makefiles/Makefile.win.mk
View File

@@ -44,14 +44,18 @@ CPSEP=;
COPY = copy
COPYREC = xcopy
DEL = del
DELREC = tools\rm.exe -rf
GREP = tools\grep.exe
DELREC = tools\win\rm.exe -rf
GREP = tools\win\grep.exe
MKDIR = md
MKDIR_P = tools\mkdir.exe -p
MKDIR_P = tools\win\mkdir.exe -p
RENAME = rename
SED = tools\sed.exe
TOUCH = tools\touch.exe
WHICH = tools\which.exe
SED = tools\win\sed.exe
TAR = tools\win\tar.exe
TOUCH = tools\win\touch.exe
UNZIP = tools\win\unzip.exe
ZIP = tools\win\zip.exe
WGET = tools\win\wget.exe
WHICH = tools\win\which.exe
# We Can't force SHELL to cmd.exe if sh.exe is in the PATH
# cf https://www.gnu.org/software/make/manual/html_node/Choosing-the-Shell.html

151
tools/release/build_delivery_win.cmd
View File

@@ -1,106 +1,107 @@
@echo off
REM /!\ THIS SCRIPT SUPPOSE A FIXED PATH FOR PYTHON /!\
REM Each blocks could be triggered independently (i.e. commenting others)
REM run it as: cmd /c tools\build_delivery_win.cmd
REM run it as: cmd /c tools\release\build_delivery_win.cmd
REM Check all prerequisite
REM cc
tools\which cmake || exit 1
tools\which cmake | tools\tee build.log
set PATH=%PATH%;tools;tools\win
which.exe cmake || exit 1
which.exe cmake | tee.exe build.log
REM python
tools\which C:\python27-64\python.exe || exit 1
tools\which C:\python27-64\python.exe | tools\tee -a build.log
tools\which C:\python35-64\python.exe || exit 1
tools\which C:\python35-64\python.exe | tools\tee -a build.log
tools\which C:\python36-64\python.exe || exit 1
tools\which C:\python36-64\python.exe | tools\tee -a build.log
which.exe C:\python27-64\python.exe || exit 1
which.exe C:\python27-64\python.exe | tee.exe -a build.log
which.exe C:\python35-64\python.exe || exit 1
which.exe C:\python35-64\python.exe | tee.exe -a build.log
which.exe C:\python36-64\python.exe || exit 1
which.exe C:\python36-64\python.exe | tee.exe -a build.log
REM java
tools\which java || exit 1
tools\which java | tools\tee -a build.log
which.exe java || exit 1
which.exe java | tee.exe -a build.log
REM C#
tools\which nuget || exit 1
tools\which nuget | tools\tee -a build.log
tools\which csc || exit 1
tools\which csc | tools\tee -a build.log
tools\which dotnet || exit 1
tools\which dotnet | tools\tee -a build.log
which.exe nuget || exit 1
which.exe nuget | tee.exe -a build.log
which.exe csc || exit 1
which.exe csc | tee.exe -a build.log
which.exe dotnet || exit 1
which.exe dotnet | tee.exe -a build.log
REM F#
tools\which fsc || exit 1
tools\which fsc | tools\tee -a build.log
which.exe fsc || exit 1
which.exe fsc | tee.exe -a build.log
REM Build Third Party
tools\make clean_third_party || exit 1
tools\make third_party WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make third_party: DONE | tools\tee -a build.log
make.exe clean_third_party || exit 1
make.exe third_party WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make third_party: DONE | tee.exe -a build.log
REM Building OR-Tools
tools\make clean || exit 1
tools\make cc WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make cc: DONE | tools\tee -a build.log
tools\make test_cc WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make test_cc: DONE | tools\tee -a build.log
make.exe clean || exit 1
make.exe cc WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make cc: DONE | tee.exe -a build.log
make.exe test_cc WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make test_cc: DONE | tee.exe -a build.log
tools\make python WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make python2.7: DONE | tools\tee -a build.log
tools\make test_python WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make test_python2.7: DONE | tools\tee -a build.log
make.exe python WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make python2.7: DONE | tee.exe -a build.log
make.exe test_python WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make test_python2.7: DONE | tee.exe -a build.log
tools\make java WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make java: DONE | tools\tee -a build.log
tools\make test_java WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make test_java: DONE | tools\tee -a build.log
make.exe java WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make java: DONE | tee.exe -a build.log
make.exe test_java WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make test_java: DONE | tee.exe -a build.log
tools\make csharp WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make csharp: DONE | tools\tee -a build.log
tools\make test_csharp WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make test_csharp: DONE | tools\tee -a build.log
make.exe csharp WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make csharp: DONE | tee.exe -a build.log
make.exe test_csharp WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make test_csharp: DONE | tee.exe -a build.log
tools\make fsharp WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make fsharp: DONE | tools\tee -a build.log
tools\make test_fsharp WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make test_fsharp: DONE | tools\tee -a build.log
make.exe fsharp WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make fsharp: DONE | tee.exe -a build.log
make.exe test_fsharp WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make test_fsharp: DONE | tee.exe -a build.log
tools\make fz WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make fz: DONE | tools\tee -a build.log
make.exe fz WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make fz: DONE | tee.exe -a build.log
REM Create Archive
tools\rm -rf temp *.zip || exit 1
tools\make archive WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make archive: DONE | tools\tee -a build.log
tools\make fz_archive WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make fz_archive: DONE | tools\tee -a build.log
tools\make python_examples_archive WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make python_examples_archive: DONE | tools\tee -a build.log
rm.exe -rf temp *.zip || exit 1
make.exe archive WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make archive: DONE | tee.exe -a build.log
make.exe fz_archive WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make fz_archive: DONE | tee.exe -a build.log
make.exe python_examples_archive WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make python_examples_archive: DONE | tee.exe -a build.log
REM Rebuilding for Python 2.7...
tools\make clean_python WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
tools\make python WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make python2.7: DONE | tools\tee -a build.log
tools\make test_python WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make test_python2.7: DONE | tools\tee -a build.log
tools\make pypi_archive WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make pypi_archive2.7: DONE | tools\tee -a build.log
make.exe clean_python WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
make.exe python WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make python2.7: DONE | tee.exe -a build.log
make.exe test_python WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make test_python2.7: DONE | tee.exe -a build.log
make.exe pypi_archive WINDOWS_PATH_TO_PYTHON=c:\python27-64 || exit 1
echo make pypi_archive2.7: DONE | tee.exe -a build.log
REM Rebuilding for Python 3.5...
tools\make clean_python WINDOWS_PATH_TO_PYTHON=c:\python35-64 || exit 1
tools\make python WINDOWS_PATH_TO_PYTHON=c:\python35-64 || exit 1
echo make python3.5: DONE | tools\tee -a build.log
tools\make test_python WINDOWS_PATH_TO_PYTHON=c:\python35-64 || exit 1
echo make test_python3.5: DONE | tools\tee -a build.log
tools\make pypi_archive WINDOWS_PATH_TO_PYTHON=c:\python35-64 || exit 1
echo make pypi_archive3.5: DONE | tools\tee -a build.log
make.exe clean_python WINDOWS_PATH_TO_PYTHON=c:\python35-64 || exit 1
make.exe python WINDOWS_PATH_TO_PYTHON=c:\python35-64 || exit 1
echo make python3.5: DONE | tee.exe -a build.log
make.exe test_python WINDOWS_PATH_TO_PYTHON=c:\python35-64 || exit 1
echo make test_python3.5: DONE | tee.exe -a build.log
make.exe pypi_archive WINDOWS_PATH_TO_PYTHON=c:\python35-64 || exit 1
echo make pypi_archive3.5: DONE | tee.exe -a build.log
REM Rebuilding for Python 3.6...
tools\make clean_python WINDOWS_PATH_TO_PYTHON=c:\python36-64 || exit 1
tools\make python WINDOWS_PATH_TO_PYTHON=c:\python36-64 || exit 1
echo make python3.6: DONE | tools\tee -a build.log
tools\make test_python WINDOWS_PATH_TO_PYTHON=c:\python36-64 || exit 1
echo make test_python3.6: DONE | tools\tee -a build.log
tools\make pypi_archive WINDOWS_PATH_TO_PYTHON=c:\python36-64 || exit 1
echo make pypi_archive3.6: DONE | tools\tee -a build.log
make.exe clean_python WINDOWS_PATH_TO_PYTHON=c:\python36-64 || exit 1
make.exe python WINDOWS_PATH_TO_PYTHON=c:\python36-64 || exit 1
echo make python3.6: DONE | tee.exe -a build.log
make.exe test_python WINDOWS_PATH_TO_PYTHON=c:\python36-64 || exit 1
echo make test_python3.6: DONE | tee.exe -a build.log
make.exe pypi_archive WINDOWS_PATH_TO_PYTHON=c:\python36-64 || exit 1
echo make pypi_archive3.6: DONE | tee.exe -a build.log
REM Creating .NET artifacts
tools\make nuget_archive WINDOWS_PATH_TO_PYTHON=c:\python36-64 || exit 1
echo make nuget_archive: DONE | tools\tee -a build.log
make.exe nuget_archive WINDOWS_PATH_TO_PYTHON=c:\python36-64 || exit 1
echo make nuget_archive: DONE | tee.exe -a build.log

9
tools/release/publish_delivery_win.cmd
View File

@@ -1,13 +1,14 @@
REM /!\ THIS SCRIPT SUPPOSE A FIXED PATH FOR PYTHON /!\
REM Each blocks could be triggered independently (i.e. commenting others)
REM (e.g. want to upload only python35 artifacts)
set PATH=%PATH%;tools
echo Uploading all Python artifacts...
tools\make pypi_upload WINDOWS_PATH_TO_PYTHON=c:\python27-64
tools\make pypi_upload WINDOWS_PATH_TO_PYTHON=c:\python35-64
tools\make pypi_upload WINDOWS_PATH_TO_PYTHON=c:\python36-64
make.exe pypi_upload WINDOWS_PATH_TO_PYTHON=c:\python27-64
make.exe pypi_upload WINDOWS_PATH_TO_PYTHON=c:\python35-64
make.exe pypi_upload WINDOWS_PATH_TO_PYTHON=c:\python36-64
echo Uploading all Python artifacts...DONE
echo Uploading .NET artifacts...
tools\make nuget_upload WINDOWS_PATH_TO_PYTHON=c:\python27-64
make.exe nuget_upload WINDOWS_PATH_TO_PYTHON=c:\python27-64
echo Uploading .NET artifacts...DONE

3
tools/upgrade_vs_project.cmd
View File

@@ -1,3 +0,0 @@
tools\sed.exe -i -e "/<PlatformToolset>/d" %1
tools\sed.exe -i -e "/^\ \ \ \ <ConfigurationType>StaticLibrary<\/ConfigurationType>/a\ \ \ \ <PlatformToolset>%2<\/PlatformToolset>" %1
tools\sed.exe -i -e "/^\ \ \ \ <ConfigurationType>Application<\/ConfigurationType>/a\ \ \ \ <PlatformToolset>%2<\/PlatformToolset>" %1

0
tools/grep.exe → tools/win/grep.exe
View File

0
tools/gzip.exe → tools/win/gzip.exe
View File

0
tools/libiconv2.dll → tools/win/libiconv2.dll
View File

0
tools/libintl3.dll → tools/win/libintl3.dll
View File

0
tools/mkdir.exe → tools/win/mkdir.exe
View File

0
tools/pcre3.dll → tools/win/pcre3.dll
View File

0
tools/regex2.dll → tools/win/regex2.dll
View File

0
tools/rm.exe → tools/win/rm.exe
View File

0
tools/sed.exe → tools/win/sed.exe
View File

0
tools/tar.exe → tools/win/tar.exe
View File

0
tools/tee.exe → tools/win/tee.exe
View File

0
tools/touch.exe → tools/win/touch.exe
View File

0
tools/unzip.exe → tools/win/unzip.exe
View File

3
tools/win/upgrade_vs_project.cmd Normal file
View File

@@ -0,0 +1,3 @@
tools\win\sed.exe -i -e "/<PlatformToolset>/d" %1
tools\win\sed.exe -i -e "/^\ \ \ \ <ConfigurationType>StaticLibrary<\/ConfigurationType>/a\ \ \ \ <PlatformToolset>%2<\/PlatformToolset>" %1
tools\win\sed.exe -i -e "/^\ \ \ \ <ConfigurationType>Application<\/ConfigurationType>/a\ \ \ \ <PlatformToolset>%2<\/PlatformToolset>" %1

0
tools/wget.exe → tools/win/wget.exe
View File

0
tools/which.exe → tools/win/which.exe
View File

0
tools/zip.exe → tools/win/zip.exe
View File