diff --git a/makefiles/Makefile.csharp.mk b/makefiles/Makefile.csharp.mk index 68275618a5..96e237d1f6 100644 --- a/makefiles/Makefile.csharp.mk +++ b/makefiles/Makefile.csharp.mk @@ -100,9 +100,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( "1.0.$(GIT_REVISION).*" )] >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs - @echo [assembly: System.Reflection.AssemblyFileVersion( "1.0.$(GIT_REVISION).0" )] >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs - @echo [assembly: System.Reflection.AssemblyInformationalVersion( "OR-Tools 1.0.$(GIT_REVISION)" )] >> $(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: 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 @@ -116,9 +116,9 @@ 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( \"1.0.$(GIT_REVISION).*\" )]" >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs - @echo "[assembly: System.Reflection.AssemblyFileVersion( \"1.0.$(GIT_REVISION).0\" )]" >> $(GEN_DIR)$Scom$Sgoogle$Sortools$SCommonAssemblyAttributes.cs - @echo "[assembly: System.Reflection.AssemblyInformationalVersion( \"OR-Tools 1.0.$(GIT_REVISION)-r$(GIT_HASH)\" )]" >> $(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: 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 @@ -337,7 +337,7 @@ ifeq ("$(SYSTEM)","win") copy tools\or-tools.nuspec temp\or-tools $(SED) -i -e "s/VVVV/$(GIT_REVISION)/g" temp\or-tools\or-tools.nuspec cd temp\or-tools && nuget pack or-tools.nuspec - cd temp\or-tools && nuget push Google.OrTools.1.0.$(GIT_REVISION).nupkg + cd temp\or-tools && nuget push Google.OrTools.2.0.$(GIT_REVISION).nupkg endif dotnet_archive: csharp diff --git a/makefiles/Makefile.python.mk b/makefiles/Makefile.python.mk index dbeef1cd9c..8b523f0ecb 100644 --- a/makefiles/Makefile.python.mk +++ b/makefiles/Makefile.python.mk @@ -199,7 +199,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$Sortools.$(PORT)$Sdummy - $(SED) -i -e 's/VVVV/$(shell svnversion)/' temp$Sor-tools.$(PORT)$Ssetup.py + $(SED) -i -e 's/VVVV/$(GIT_REVISION)/' 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 @@ -264,7 +264,7 @@ pypi_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/$(shell svnversion)/' temp$Sortools$Ssetup.py + $(SED) -i -e 's/VVVV/$(GIT_REVISION)/' 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 diff --git a/tools/setup.py b/tools/setup.py index fb28ddc353..0c744f4680 100644 --- a/tools/setup.py +++ b/tools/setup.py @@ -16,7 +16,7 @@ DELETEUNIX extra_link_args=['/MANIFEST'], setup( name='ortools', - version='1.VVVV', + version='2.VVVV', packages=[ 'ortools', 'ortools.algorithms', @@ -33,7 +33,7 @@ setup( 'ortools.linear_solver' : ['_pywraplp.dll'], 'ortools.graph' : ['_pywrapgraph.dll'], 'ortools.algorithms' : ['_pywrapknapsack_solver.dll'], - DELETEWIN 'ortools' : ['libortools.DLL'] + DELETEWIN 'ortools' : ['libortools.DLL'] }, license='Apache 2.0', author = 'Google Inc', diff --git a/tools/setup_data.py b/tools/setup_data.py index a31b6b4068..11a9ca70cf 100644 --- a/tools/setup_data.py +++ b/tools/setup_data.py @@ -11,7 +11,7 @@ def read(fname): setup( name='ortools_examples', - version='1.VVVV', + version='2.VVVV', install_requires = ['ortools'], license='Apache 2.0', author = 'Google Inc',