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

revamp archive numbering

Browse Source
This commit is contained in:
Laurent Perron
2016-06-21 11:41:13 +02:00
parent 7ddb7b9538
commit ba692308f1
10 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -7,7 +7,8 @@ help:
@echo " - .NET: csharp test_csharp clean_csharp "
@echo " - all: all test clean"
OR_TOOLS_VERSION = 1.0.0
OR_TOOLS_MAJOR = 4
OR_TOOLS_MINOR = 0
# OR_ROOT is the minimal prefix to define the root of or-tools, if we
# are compiling in the or-tools root, it is empty. Otherwise, it is

8
makefiles/Makefile.cpp.mk
View File

@@ -1759,7 +1759,7 @@ cc_archive: $(LIB_DIR)/$(LIBPREFIX)ortools.$(DYNAMIC_LIB_SUFFIX)
cd temp\\or-tools.$(PORT)\\include && ..\..\..\tools\tar.exe -C ..\\..\\..\\dependencies\\install\\include -c -v gflags | ..\..\..\tools\tar.exe xvm
cd temp\\or-tools.$(PORT)\\include && ..\..\..\tools\tar.exe -C ..\\..\\..\\dependencies\\install\\include -c -v google | ..\..\..\tools\tar.exe xvm
cd temp\\or-tools.$(PORT)\\include && ..\..\..\tools\tar.exe -C ..\\..\\..\\dependencies\\install\\include -c -v sparsehash | ..\..\..\tools\tar.exe xvm
cd temp && ..\tools\zip.exe -r ..\Google.OrTools.cc.$(PORT).$(GIT_REVISION).zip or-tools.$(PORT)
cd temp && ..\tools\zip.exe -r ..\Google.OrTools.cc.$(PORT)-$(OR_TOOLS_VERSION).zip or-tools.$(PORT)
-$(DELREC) temp
else
cc_archive: $(LIB_DIR)/$(LIBPREFIX)ortools.$(DYNAMIC_LIB_SUFFIX)
@@ -1822,7 +1822,7 @@ endif
cd temp/or-tools.$(PORT)/include && tar -C ../../../dependencies/install/include -c -v gflags | tar xvm
cd temp/or-tools.$(PORT)/include && tar -C ../../../dependencies/install/include -c -v google | tar xvm
cd temp/or-tools.$(PORT)/include && tar -C ../../../dependencies/install/include -c -v sparsehash | tar xvm
cd temp && tar -c -v -z --no-same-owner -f ../Google.OrTools.cc.$(PORT).$(GIT_REVISION).tar.gz or-tools.$(PORT)
cd temp && tar -c -v -z --no-same-owner -f ../Google.OrTools.cc.$(PORT)-$(OR_TOOLS_VERSION).tar.gz or-tools.$(PORT)
-$(DELREC) temp
endif
@@ -1837,7 +1837,7 @@ fz_archive: fz
copy LICENSE-2.0.txt temp\\or-tools.$(PORT)
copy bin\\fz.exe temp\\or-tools.$(PORT)\\bin\\fzn-or-tools.exe
copy src\\flatzinc\\mznlib\\*.mzn temp\\or-tools.$(PORT)\\share\\minizinc
cd temp && ..\tools\zip.exe -r ..\Google.OrTools.flatzinc.$(PORT).$(GIT_REVISION).zip or-tools.$(PORT)
cd temp && ..\tools\zip.exe -r ..\Google.OrTools.flatzinc.$(PORT)-$(OR_TOOLS_VERSION).zip or-tools.$(PORT)
-$(DELREC) temp
else
fz_archive: $(LIB_DIR)/$(LIBPREFIX)ortools.$(DYNAMIC_LIB_SUFFIX)
@@ -1850,7 +1850,7 @@ fz_archive: $(LIB_DIR)/$(LIBPREFIX)ortools.$(DYNAMIC_LIB_SUFFIX)
cp LICENSE-2.0.txt temp/or-tools.$(PORT)
cp bin/fz temp/or-tools.$(PORT)/bin/fzn-or-tools
cp src/flatzinc/mznlib/* temp/or-tools.$(PORT)/share/minizinc
cd temp && tar cvzf ../Google.OrTools.flatzinc.$(PORT).$(GIT_REVISION).tar.gz or-tools.$(PORT)
cd temp && tar cvzf ../Google.OrTools.flatzinc.$(PORT)-$(OR_TOOLS_VERSION).tar.gz or-tools.$(PORT)
-$(DELREC) temp
endif

26
makefiles/Makefile.csharp.mk
View File

@@ -110,7 +110,7 @@ clean_csharp:
-$(DEL) $(BIN_DIR)$S*$(CLR_EXE_SUFFIX).exe
-$(DEL) $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
$(GEN_DIR)/com/google/ortools/CommonAssemblyAttributes.cs : $(GEN_DIR)/com/google/ortools/SvnVersion$(GIT_REVISION).txt
$(GEN_DIR)/com/google/ortools/CommonAssemblyAttributes.cs : $(GEN_DIR)/com/google/ortools/SvnVersion$(OR_TOOLS_SHORT_VERSION).txt
ifeq ("$(SYSTEM)","win")
@echo using System.Reflection; > $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo using System.Runtime.CompilerServices; >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@@ -122,9 +122,9 @@ ifeq ("$(SYSTEM)","win")
@echo [assembly: System.Reflection.AssemblyProduct( "OR-Tools" )] >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo [assembly: System.Reflection.AssemblyCopyright( "Copyright (c) 2010-2015 Google" )] >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo [assembly: System.Reflection.AssemblyCulture( "" )] >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo [assembly: System.Reflection.AssemblyVersion( "2.0.$(GIT_REVISION).*" )] >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo [assembly: System.Reflection.AssemblyFileVersion( "2.0.$(GIT_REVISION).0" )] >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo [assembly: System.Reflection.AssemblyInformationalVersion( "OR-Tools 2.0.$(GIT_REVISION)" )] >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo [assembly: System.Reflection.AssemblyVersion( "$(OR_TOOLS_SHORT_VERSION).*" )] >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo [assembly: System.Reflection.AssemblyFileVersion( "$(OR_TOOLS_SHORT_VERSION)" )] >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo [assembly: System.Reflection.AssemblyInformationalVersion( "OR-Tools $(OR_TOOLS_SHORT_VERSION)" )] >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo [assembly: ComVisible(false)] >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo [assembly: Guid("0a227c4c-8bb3-4db0-808f-55dae227d8c5")] >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
else
@@ -138,15 +138,15 @@ else
@echo "[assembly: System.Reflection.AssemblyProduct( \"OR-Tools\" )]" >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo "[assembly: System.Reflection.AssemblyCopyright( \"Copyright (c) 2010-2015 Google\" )]" >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo "[assembly: System.Reflection.AssemblyCulture( \"\" )]" >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo "[assembly: System.Reflection.AssemblyVersion( \"2.0.$(GIT_REVISION).*\" )]" >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo "[assembly: System.Reflection.AssemblyFileVersion( \"2.0.$(GIT_REVISION).0\" )]" >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo "[assembly: System.Reflection.AssemblyInformationalVersion( \"OR-Tools 2.0.$(GIT_REVISION)-r$(GIT_HASH)\" )]" >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo "[assembly: System.Reflection.AssemblyVersion( \"$(OR_TOOLS_SHORT_VERSION).*\" )]" >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo "[assembly: System.Reflection.AssemblyFileVersion( \"$(OR_TOOLS_SHORT_VERSION).0\" )]" >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo "[assembly: System.Reflection.AssemblyInformationalVersion( \"OR-Tools $(OR_TOOLS_SHORT_VERSION)-r$(GIT_HASH)\" )]" >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo "[assembly: ComVisible(false)]" >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
@echo "[assembly: Guid(\"0a227c4c-8bb3-4db0-808f-55dae227d8c5\")]" >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs
endif
$(GEN_DIR)/com/google/ortools/SvnVersion$(GIT_REVISION).txt:
@echo $(GIT_REVISION) > $(GEN_DIR)$Scom$Sgoogle$Sortools$SSvnVersion$(GIT_REVISION).txt
$(GEN_DIR)/com/google/ortools/SvnVersion$(OR_TOOLS_SHORT_VERSION).txt:
@echo $(OR_TOOLS_SHORT_VERSION) > $(GEN_DIR)$Scom$Sgoogle$Sortools$SSvnVersion$(OR_TOOLS_SHORT_VERSION).txt
# csharportools
@@ -417,9 +417,9 @@ ifeq ("$(SYSTEM)","win")
copy examples\data\survo_puzzle\* temp\or-tools\examples\data\survo_puzzle
copy examples\data\quasigroup_completion\* temp\or-tools\examples\data\quasigroup_completion
copy tools\or-tools.nuspec temp\or-tools
$(SED) -i -e "s/VVVV/$(GIT_REVISION)/g" temp\or-tools\or-tools.nuspec
$(SED) -i -e "s/VVVV/$(OR_TOOLS_VERSION)/g" temp\or-tools\or-tools.nuspec
cd temp\or-tools && nuget pack or-tools.nuspec
cd temp\or-tools && nuget push Google.OrTools.2.2.$(GIT_REVISION).nupkg
cd temp\or-tools && nuget push Google.OrTools-$(OR_TOOLS_VERSION).nupkg
endif
dotnet_archive: csharp
@@ -452,7 +452,7 @@ ifeq ("$(SYSTEM)","win")
copy examples\data\rogo\* temp\or-tools.$(PORT)\examples\data\rogo
copy examples\data\survo_puzzle\* temp\or-tools.$(PORT)\examples\data\survo_puzzle
copy examples\data\quasigroup_completion\* temp\or-tools.$(PORT)\examples\data\quasigroup_completion
cd temp && ..\tools\zip$(CLR_EXE_SUFFIX).exe -r ..\$(CLR_DLL_NAME).NET.$(PORT).$(GIT_REVISION).zip or-tools.$(PORT)
cd temp && ..\tools\zip$(CLR_EXE_SUFFIX).exe -r ..\$(CLR_DLL_NAME).NET.$(PORT)-$(OR_TOOLS_VERSION).zip or-tools.$(PORT)
else
mkdir temp
mkdir temp/or-tools.$(PORT)
@@ -477,6 +477,6 @@ else
cp examples/data/rogo/* temp/or-tools.$(PORT)/examples/data/rogo
cp examples/data/survo_puzzle/* temp/or-tools.$(PORT)/examples/data/survo_puzzle
cp examples/data/quasigroup_completion/* temp/or-tools.$(PORT)/examples/data/quasigroup_completion
cd temp && tar -c -v -z --no-same-owner -f ../$(CLR_DLL_NAME).NET.$(PORT).$(GIT_REVISION).tar.gz or-tools.$(PORT)
cd temp && tar -c -v -z --no-same-owner -f ../$(CLR_DLL_NAME).NET.$(PORT)-$(OR_TOOLS_VERSION).tar.gz or-tools.$(PORT)
endif
-$(DELREC) temp

4
makefiles/Makefile.java.mk
View File

@@ -415,7 +415,7 @@ ifeq ("$(SYSTEM)","win")
copy examples\com\google\ortools\samples\*.java temp\or-tools.$(PORT)\examples\com\google\ortools\samples
copy examples\com\google\ortools\samples\*.java temp\or-tools.$(PORT)\examples\com\google\ortools\samples
copy examples\com\google\ortools\samples\*.java temp\or-tools.$(PORT)\examples\com\google\ortools\samples
cd temp && ..$Stools$Szip.exe -r ..$SGoogle.OrTools.java.$(PORT).$(GIT_REVISION).zip or-tools.$(PORT)
cd temp && ..$Stools$Szip.exe -r ..$SGoogle.OrTools.java.$(PORT)-$(OR_TOOLS_VERSION).zip or-tools.$(PORT)
else
mkdir temp/or-tools.$(PORT)/examples
mkdir temp/or-tools.$(PORT)/examples/com
@@ -444,6 +444,6 @@ else
cp examples/com/google/ortools/samples/*.java temp/or-tools.$(PORT)/examples/com/google/ortools/samples
cp examples/com/google/ortools/samples/*.java temp/or-tools.$(PORT)/examples/com/google/ortools/samples
cp examples/com/google/ortools/samples/*.java temp/or-tools.$(PORT)/examples/com/google/ortools/samples
cd temp && tar -c -v -z --no-same-owner -f ../Google.OrTools.java.$(PORT).$(GIT_REVISION).tar.gz or-tools.$(PORT)
cd temp && tar -c -v -z --no-same-owner -f ../Google.OrTools.java.$(PORT)-$(OR_TOOLS_VERSION).tar.gz or-tools.$(PORT)
endif
-$(DELREC) temp

3
makefiles/Makefile.port
View File

@@ -158,7 +158,8 @@ else
GIT_REVISION:= $(shell git log --oneline | find /C " ")
GIT_HASH:= $(shell git log --pretty=format:'%h' -n 1)
endif
OR_TOOLS_VERSION := $(GIT_REVISION)
OR_TOOLS_VERSION := $(OR_TOOLS_MAJOR).$(OR_TOOLS_MINOR).$(GIT_REVISION)
OR_TOOLS_SHORT_VERSION := $(OR_TOOLS_MAJOR).$(OR_TOOLS_MINOR)
printport:
@echo SHELL = $(SHELL)

14
makefiles/Makefile.python.mk
View File

@@ -232,7 +232,7 @@ python_archive: python
$(COPY) LICENSE-2.0.txt temp$Sor-tools.$(PORT)
$(COPY) tools$Ssetup.py temp$Sor-tools.$(PORT)
$(COPY) tools$Sdummy_ortools_dependency.cc temp$Sor-tools.$(PORT)$Sdummy
$(SED) -i -e 's/VVVV/$(GIT_REVISION)/' temp$Sor-tools.$(PORT)$Ssetup.py
$(SED) -i -e 's/VVVV/$(OR_TOOLS_VERSION)/' temp$Sor-tools.$(PORT)$Ssetup.py
ifeq ($(SYSTEM),win)
copy src\gen\ortools\constraint_solver\_pywrapcp.pyd temp$Sor-tools.$(PORT)$Sortools$Sconstraint_solver
copy src\gen\ortools\linear_solver\_pywraplp.pyd temp$Sor-tools.$(PORT)$Sortools$Slinear_solver
@@ -241,7 +241,7 @@ ifeq ($(SYSTEM),win)
$(SED) -i -e 's/\.dll/\.pyd/' temp/or-tools.$(PORT)/setup.py
-del temp\or-tools.$(PORT)\setup.py-e
cd temp\or-tools.$(PORT) && ..\..\tools\tar.exe -C ..\.. -c -v --exclude *svn* --exclude *roadef* examples\data | ..\..\tools\tar.exe xvm
cd temp && ..\tools\zip.exe -r ..\Google.OrTools.python.$(PORT).$(GIT_REVISION).zip or-tools.$(PORT)
cd temp && ..\tools\zip.exe -r ..\Google.OrTools.python.$(PORT)-$(OR_TOOLS_VERSION).zip or-tools.$(PORT)
else
cp lib$S_pywrapcp.$(DYNAMIC_SWIG_LIB_SUFFIX) temp$Sor-tools.$(PORT)$Sortools$Sconstraint_solver
cp lib$S_pywraplp.$(DYNAMIC_SWIG_LIB_SUFFIX) temp$Sor-tools.$(PORT)$Sortools$Slinear_solver
@@ -250,7 +250,7 @@ else
$(SED) -i -e 's/\.dll/\.so/' temp/or-tools.$(PORT)/setup.py
-rm temp/or-tools.$(PORT)/setup.py-e
cd temp/or-tools.$(PORT) && tar -C ../.. -c -v --exclude *svn* --exclude *roadef* examples/data | tar xvm
cd temp && tar -c -v -z --no-same-owner -f ../Google.OrTools.python.$(PORT).$(GIT_REVISION).tar.gz or-tools.$(PORT)
cd temp && tar -c -v -z --no-same-owner -f ../Google.OrTools.python.$(PORT)-$(OR_TOOLS_VERSION).tar.gz or-tools.$(PORT)
endif
python_examples_archive:
@@ -268,10 +268,10 @@ python_examples_archive:
-$(DEL) temp$Sortools_examples$Ssetup.py-e
ifeq ($(SYSTEM),win)
cd temp\ortools_examples && ..\..\tools\tar.exe -C ..\.. -c -v --exclude *svn* --exclude *roadef* examples\data | ..\..\tools\tar.exe xvm
cd temp && ..\tools\zip.exe -r ..\Google.OrTools.python.examples.$(GIT_REVISION).zip ortools_examples
cd temp && ..\tools\zip.exe -r ..\Google.OrTools.python.examples-$(OR_TOOLS_VERSION).zip ortools_examples
else
cd temp/ortools_examples && tar -C ../.. -c -v --exclude *svn* --exclude *roadef* examples/data | tar xvm
cd temp && tar -c -v -z --no-same-owner -f ../Google.OrTools.python.examples.$(GIT_REVISION).tar.gz ortools_examples
cd temp && tar -c -v -z --no-same-owner -f ../Google.OrTools.python.examples-$(OR_TOOLS_VERSION).tar.gz ortools_examples
endif
pypi2_archive: python $(PATCHELF)
@@ -298,7 +298,7 @@ pypi2_archive: python $(PATCHELF)
$(COPY) tools$SREADME.pypi temp$Sortools$SREADME.txt
$(COPY) LICENSE-2.0.txt temp$Sortools
$(COPY) tools$Ssetup.py temp$Sortools
$(SED) -i -e 's/VVVV/$(GIT_REVISION)/' temp$Sortools$Ssetup.py
$(SED) -i -e 's/VVVV/$(OR_TOOLS_VERSION)/' temp$Sortools$Ssetup.py
ifeq ($(SYSTEM),win)
copy src\gen\ortools\constraint_solver\_pywrapcp.pyd temp$Sortools$Sortools$Sconstraint_solver
copy src\gen\ortools\linear_solver\_pywraplp.pyd temp$Sortools$Sortools$Slinear_solver
@@ -360,7 +360,7 @@ pypi3_archive: python $(PATCHELF)
$(COPY) tools$SREADME.pypi temp$Sortools$SREADME.txt
$(COPY) LICENSE-2.0.txt temp$Sortools
$(COPY) tools$Ssetup_py3.py temp$Sortools$Ssetup.py
$(SED) -i -e 's/VVVV/$(GIT_REVISION)/' temp$Sortools$Ssetup.py
$(SED) -i -e 's/VVVV/$(OR_TOOLS_VERSION)/' temp$Sortools$Ssetup.py
ifeq ($(SYSTEM),win)
copy src\gen\ortools\constraint_solver\_pywrapcp.pyd temp$Sortools$Sortools$Sconstraint_solver
copy src\gen\ortools\linear_solver\_pywraplp.pyd temp$Sortools$Sortools$Slinear_solver

4
tools/or-tools.nuspec
View File

@@ -2,7 +2,7 @@
<package >
<metadata>
<id>Google.OrTools</id>
<version>2.2.VVVV</version>
<version>VVVV</version>
<authors>Google</authors>
<licenseUrl>https://github.com/google/or-tools/blob/master/LICENSE-2.0.txt</licenseUrl>
<projectUrl>https://developers.google.com/optimization</projectUrl>
@@ -11,7 +11,7 @@
<copyright>Copyright 2016 Google</copyright>
<tags>OperationsResearch MathProgramming LinearProgramming ConstraintProgramming .NET</tags>
<dependencies>
<dependency id="Google.Protobuf" version="3.0.0-beta2" />
<dependency id="Google.Protobuf" version="3.0.0-beta3" />
</dependencies>
</metadata>
<files>

2
tools/setup.py
View File

@@ -16,7 +16,7 @@ DELETEUNIX extra_link_args=['/MANIFEST'],
setup(
name='ortools',
version='3.VVVV',
version='VVVV',
packages=[
'ortools',
'ortools.algorithms',

2
tools/setup_data.py
View File

@@ -11,7 +11,7 @@ def read(fname):
setup(
name='ortools_examples',
version='3.VVVV',
version='VVVV',
install_requires = ['ortools'],
license='Apache 2.0',
author = 'Google Inc',

2
tools/setup_py3.py
View File

@@ -16,7 +16,7 @@ DELETEUNIX extra_link_args=['/MANIFEST'],
setup(
name='py3-ortools',
version='3.VVVV',
version='VVVV',
packages=[
'ortools',
'ortools.algorithms',