From ecf685062fdb2213424b76a58366220ccfa1055d Mon Sep 17 00:00:00 2001 From: Driss Lahlou Date: Fri, 1 Jul 2016 11:24:17 +0200 Subject: [PATCH] refactoring archives target. New File : makefiles/Makefile.archive.mk --- makefiles/Makefile.archive.mk | 166 ++++++++++++++++++++++++++++++++++ makefiles/Makefile.cpp.mk | 143 ----------------------------- makefiles/Makefile.csharp.mk | 59 ------------ makefiles/Makefile.java.mk | 72 --------------- 4 files changed, 166 insertions(+), 274 deletions(-) create mode 100644 makefiles/Makefile.archive.mk diff --git a/makefiles/Makefile.archive.mk b/makefiles/Makefile.archive.mk new file mode 100644 index 0000000000..2963f26a77 --- /dev/null +++ b/makefiles/Makefile.archive.mk @@ -0,0 +1,166 @@ + +archive: $(LIB_DIR)$S$(LIB_PREFIX)ortools.$(LIB_SUFFIX) csharp java create_dirs cc_archive dotnet_archive java_archive +ifeq "$(SYSTEM)" "win" + cd temp && ..$Stools$Szip.exe -r ..$SGoogle.OrTools.$(INSTALL_PORT)-$(OR_TOOLS_VERSION).zip $(INSTALL_DIR) +else + cd temp && tar -c -v -z --no-same-owner -f ..$SGoogle.OrTools.$(INSTALL_PORT)-$(OR_TOOLS_VERSION).tar.gz $(INSTALL_DIR) +endif + + +create_dirs: + -$(DELREC) temp + $(MKDIR) temp + $(MKDIR) temp$S$(INSTALL_DIR) + $(MKDIR) temp$S$(INSTALL_DIR)$Slib + $(MKDIR) temp$S$(INSTALL_DIR)$Sobjs + $(MKDIR) temp$S$(INSTALL_DIR)$Sbin + $(MKDIR) temp$S$(INSTALL_DIR)$Sbin$Scpp + $(MKDIR) temp$S$(INSTALL_DIR)$Sbin$Scsharp + $(MKDIR) temp$S$(INSTALL_DIR)$Sinclude + $(MKDIR) temp$S$(INSTALL_DIR)$Sinclude$Salgorithms + $(MKDIR) temp$S$(INSTALL_DIR)$Sinclude$Sbase + $(MKDIR) temp$S$(INSTALL_DIR)$Sinclude$Sconstraint_solver + $(MKDIR) temp$S$(INSTALL_DIR)$Sinclude$Sgflags + $(MKDIR) temp$S$(INSTALL_DIR)$Sinclude$Sbop + $(MKDIR) temp$S$(INSTALL_DIR)$Sinclude$Sglop + $(MKDIR) temp$S$(INSTALL_DIR)$Sinclude$Sgoogle + $(MKDIR) temp$S$(INSTALL_DIR)$Sinclude$Sgraph + $(MKDIR) temp$S$(INSTALL_DIR)$Sinclude$Slinear_solver + $(MKDIR) temp$S$(INSTALL_DIR)$Sinclude$Ssat + $(MKDIR) temp$S$(INSTALL_DIR)$Sinclude$Sutil + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Scpp + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Scsharp + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Scsharp$Ssolution + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Scsharp$Ssolution$SProperties + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Scom + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Scom$Sgoogle + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Scom$Sgoogle$Sortools + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Scom$Sgoogle$Sortools$Ssamples + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata$Set_jobshop + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata$Sflexible_jobshop + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata$Sjobshop + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata$Smultidim_knapsack + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata$Scvrptw + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata$Spdptw + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata$Sfill_a_pix + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata$Sminesweeper + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata$Srogo + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata$Ssurvo_puzzle + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata$Squasigroup_completion + $(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata$Sdiscrete_tomography + + + #credits + $(COPY) LICENSE-2.0.txt temp$S$(INSTALL_DIR) + $(COPY) tools$SREADME.cc.java.csharp temp$S$(INSTALL_DIR)$SREADME + $(COPY) tools$SMakefile.cc temp$S$(INSTALL_DIR)$SMakefile + +cc_archive: create_dirs + + $(COPY) $(LIB_DIR)$S$(LIB_PREFIX)*.$(LIB_SUFFIX) temp$S$(INSTALL_DIR)$Slib + $(COPY) examples$Scpp$S*.cc temp$S$(INSTALL_DIR)$Sexamples$Scpp + $(COPY) examples$Scpp$S*.h temp$S$(INSTALL_DIR)$Sexamples$Scpp + $(COPY) src$Salgorithms$S*.h temp$S$(INSTALL_DIR)$Sinclude$Salgorithms + $(COPY) src$Sbase$S*.h temp$S$(INSTALL_DIR)$Sinclude$Sbase + $(COPY) src$Sconstraint_solver$S*.h temp$S$(INSTALL_DIR)$Sinclude$Sconstraint_solver + $(COPY) src$Sgen$Sconstraint_solver$S*.pb.h temp$S$(INSTALL_DIR)$Sinclude$Sconstraint_solver + $(COPY) src$Sbop$S*.h temp$S$(INSTALL_DIR)$Sinclude$Sbop + $(COPY) src$Sgen$Sbop$S*.pb.h temp$S$(INSTALL_DIR)$Sinclude$Sbop + $(COPY) src$Sglop$S*.h temp$S$(INSTALL_DIR)$Sinclude$Sglop + $(COPY) src$Sgen$Sglop$S*.pb.h temp$S$(INSTALL_DIR)$Sinclude$Sglop + $(COPY) src$Sgraph$S*.h temp$S$(INSTALL_DIR)$Sinclude$Sgraph + $(COPY) src$Slinear_solver$S*.h temp$S$(INSTALL_DIR)$Sinclude$Slinear_solver + $(COPY) src$Sgen$Slinear_solver$S*.pb.h temp$S$(INSTALL_DIR)$Sinclude$Slinear_solver + $(COPY) src$Ssat$S*.h temp$S$(INSTALL_DIR)$Sinclude$Ssat + $(COPY) src$Sgen$Ssat$S*.pb.h temp$S$(INSTALL_DIR)$Sinclude$Ssat + $(COPY) src$Sutil$S*.h temp$S$(INSTALL_DIR)$Sinclude$Sutil + + + + +ifeq "$(SYSTEM)" "win" + cd temp$S$(INSTALL_DIR) && ..$S..$Stools$Star.exe -C ..$S.. -c -v --exclude *svn* --exclude *roadef* examples$Sdata | ..$S..$Stools$Star.exe xvm + + cd temp$S$(INSTALL_DIR)$Sinclude && ..$S..$S..$Stools$Star.exe -C ..$S..$S..$Sdependencies$Sinstall$Sinclude -c -v gflags | ..$S..$S..$Stools$Star.exe xvm + cd temp$S$(INSTALL_DIR)$Sinclude && ..$S..$S..$Stools$Star.exe -C ..$S..$S..$Sdependencies$Sinstall$Sinclude -c -v google | ..$S..$S..$Stools$Star.exe xvm + cd temp$S$(INSTALL_DIR)$Sinclude && ..$S..$S..$Stools$Star.exe -C ..$S..$S..$Sdependencies$Sinstall$Sinclude -c -v sparsehash | ..$S..$S..$Stools$Star.exe xvm +else + $(COPY) -R examples$Sdata$Set_jobshop$S* temp$S$(INSTALL_DIR)$Sexamples$Sdata$Set_jobshop + $(COPY) -R examples$Sdata$Sflexible_jobshop$S* temp$S$(INSTALL_DIR)$Sexamples$Sdata$Sflexible_jobshop + $(COPY) -R examples$Sdata$Sjobshop$S* temp$S$(INSTALL_DIR)$Sexamples$Sdata$Sjobshop + $(COPY) -R examples$Sdata$Smultidim_knapsack$S* temp$S$(INSTALL_DIR)$Sexamples$Sdata$Smultidim_knapsack + $(COPY) -R examples$Sdata$Scvrptw$S* temp$S$(INSTALL_DIR)$Sexamples$Sdata$Scvrptw + $(COPY) -R examples$Sdata$Spdptw$S* temp$S$(INSTALL_DIR)$Sexamples$Sdata$Spdptw + + cd temp$S$(INSTALL_DIR)$Sinclude && tar -C ..$S..$S..$Sdependencies$Sinstall$Sinclude -c -v gflags | tar xvm + cd temp$S$(INSTALL_DIR)$Sinclude && tar -C ..$S..$S..$Sdependencies$Sinstall$Sinclude -c -v google | tar xvm + cd temp$S$(INSTALL_DIR)$Sinclude && tar -C ..$S..$S..$Sdependencies$Sinstall$Sinclude -c -v sparsehash | tar xvm + +ifeq ($(PLATFORM),MACOSX) + $(COPY) tools$Sinstall_libortools_mac.sh temp$S$(INSTALL_DIR) +endif +endif + +dotnet_archive: + + $(COPY) bin$SGoogle.Protobuf.dll temp$S$(INSTALL_DIR)$Slib$Scsharp + $(COPY) bin$S$(CLR_DLL_NAME).dll temp$S$(INSTALL_DIR)$Slib$Scsharp + $(COPY) examples$Scsharp$S*.cs temp$S$(INSTALL_DIR)$Sexamples$Scsharp + $(COPY) examples$Scsharp$Ssolution$SProperties$S*.cs temp$S$(INSTALL_DIR)$Sexamples$Scsharp$Ssolution$SProperties + $(COPY) examples$Sdata$Sdiscrete_tomography$S* temp$S$(INSTALL_DIR)$Sexamples$Sdata$Sdiscrete_tomography + $(COPY) examples$Sdata$Sfill_a_pix$S* temp$S$(INSTALL_DIR)$Sexamples$Sdata$Sfill_a_pix + $(COPY) examples$Sdata$Sminesweeper$S* temp$S$(INSTALL_DIR)$Sexamples$Sdata$Sminesweeper + $(COPY) examples$Sdata$Srogo$S* temp$S$(INSTALL_DIR)$Sexamples$Sdata$Srogo + $(COPY) examples$Sdata$Ssurvo_puzzle$S* temp$S$(INSTALL_DIR)$Sexamples$Sdata$Ssurvo_puzzle + $(COPY) examples$Sdata$Squasigroup_completion$S* temp$S$(INSTALL_DIR)$Sexamples$Sdata$Squasigroup_completion + +ifeq "$(SYSTEM)" "win" + $(COPY) examples$Scsharp$S*.sln temp$S$(INSTALL_DIR)$Sexamples + $(COPY) examples$Scsharp$Ssolution$S*.csproj temp$S$(INSTALL_DIR)$Sexamples$Scsharp$Ssolution +else + $(COPY) lib$Slib$(CLR_DLL_NAME).so temp$S$(INSTALL_DIR)$Slib +endif + +java_archive: + $(COPY) lib$S*.jar temp$S$(INSTALL_DIR)$Slib + $(COPY) lib$S$(LIB_PREFIX)jni*.$(JNI_LIB_EXT) temp$S$(INSTALL_DIR)$Slib + + $(COPY) examples$Sdata$Sdiscrete_tomography$S* temp$S$(INSTALL_DIR)$Sexamples$Sdata$Sdiscrete_tomography + $(COPY) examples$Sdata$Sfill_a_pix$S* temp$S$(INSTALL_DIR)$Sexamples$Sdata$Sfill_a_pix + $(COPY) examples$Sdata$Sminesweeper$S* temp$S$(INSTALL_DIR)$Sexamples$Sdata$Sminesweeper + $(COPY) examples$Sdata$Srogo$S* temp$S$(INSTALL_DIR)$Sexamples$Sdata$Srogo + $(COPY) examples$Sdata$Ssurvo_puzzle$S* temp$S$(INSTALL_DIR)$Sexamples$Sdata$Ssurvo_puzzle + $(COPY) examples$Sdata$Squasigroup_completion$S* temp$S$(INSTALL_DIR)$Sexamples$Sdata$Squasigroup_completion + $(COPY) examples$Scom$Sgoogle$Sortools$Ssamples$S*.java temp$S$(INSTALL_DIR)$Sexamples$Scom$Sgoogle$Sortools$Ssamples + + + +ifeq "$(SYSTEM)" "win" +fz_archive: fz + -$(DELREC) temp + mkdir temp + mkdir temp$S$(INSTALL_DIR) + mkdir temp$S$(INSTALL_DIR)$Sbin + mkdir temp$S$(INSTALL_DIR)$Sshare + mkdir temp$S$(INSTALL_DIR)$Sshare$Sminizinc + $(COPY) LICENSE-2.0.txt temp$S$(INSTALL_DIR) + $(COPY) bin$Sfz.exe temp$S$(INSTALL_DIR)$Sbin$Sfzn-or-tools.exe + $(COPY) src$Sflatzinc$Smznlib$S*.mzn temp$S$(INSTALL_DIR)$Sshare$Sminizinc + cd temp && ..$Stools$Szip.exe -r ..$SGoogle.OrTools.flatzinc.$(INSTALL_PORT)-$(OR_TOOLS_VERSION).zip $(INSTALL_DIR) + -$(DELREC) temp +else +fz_archive: $(LIB_DIR)$S$(LIB_PREFIX)ortools.$(LIB_SUFFIX) + -$(DELREC) temp + mkdir temp + mkdir temp$S$(INSTALL_DIR) + mkdir temp$S$(INSTALL_DIR)$Sbin + mkdir temp$S$(INSTALL_DIR)$Sshare + mkdir temp$S$(INSTALL_DIR)$Sshare$Sminizinc + $(COPY) LICENSE-2.0.txt temp$S$(INSTALL_DIR) + $(COPY) bin$Sfz temp$S$(INSTALL_DIR)$Sbin$Sfzn-or-tools + $(COPY) src$Sflatzinc$Smznlib$S* temp$S$(INSTALL_DIR)$Sshare$Sminizinc + cd temp && tar cvzf ..$SGoogle.OrTools.flatzinc.$(INSTALL_PORT)-$(OR_TOOLS_VERSION).tar.gz $(INSTALL_DIR) + -$(DELREC) temp +endif diff --git a/makefiles/Makefile.cpp.mk b/makefiles/Makefile.cpp.mk index f59779b537..11f720a212 100755 --- a/makefiles/Makefile.cpp.mk +++ b/makefiles/Makefile.cpp.mk @@ -1405,149 +1405,6 @@ $(LIB_DIR)/$(LIB_PREFIX)ortools.$(LIB_SUFFIX): $(CONSTRAINT_SOLVER_OBJS) $(LINEA $(OR_TOOLS_LD_FLAGS) -# Target for archives - -ifeq "$(SYSTEM)" "win" -cc_archive: $(LIB_DIR)/$(LIB_PREFIX)ortools.$(LIB_SUFFIX) - -$(DELREC) temp - mkdir temp - mkdir temp\\$(INSTALL_DIR) - mkdir temp\\$(INSTALL_DIR)\\bin - mkdir temp\\$(INSTALL_DIR)\\examples - mkdir temp\\$(INSTALL_DIR)\\examples\\cpp - mkdir temp\\$(INSTALL_DIR)\\examples\\data - mkdir temp\\$(INSTALL_DIR)\\include - mkdir temp\\$(INSTALL_DIR)\\include\\algorithms - mkdir temp\\$(INSTALL_DIR)\\include\\base - mkdir temp\\$(INSTALL_DIR)\\include\\constraint_solver - mkdir temp\\$(INSTALL_DIR)\\include\\gflags - mkdir temp\\$(INSTALL_DIR)\\include\\glop - mkdir temp\\$(INSTALL_DIR)\\include\\google - mkdir temp\\$(INSTALL_DIR)\\include\\graph - mkdir temp\\$(INSTALL_DIR)\\include\\linear_solver - mkdir temp\\$(INSTALL_DIR)\\include\\util - mkdir temp\\$(INSTALL_DIR)\\lib - mkdir temp\\$(INSTALL_DIR)\\objs - copy LICENSE-2.0.txt temp\\$(INSTALL_DIR) - copy tools\\README.cc temp\\$(INSTALL_DIR)\\README - copy tools\\Makefile.cc temp\\$(INSTALL_DIR)\\Makefile - copy lib\\ortools.lib temp\\$(INSTALL_DIR)\\lib - copy examples\\cpp\\*.cc temp\\$(INSTALL_DIR)\\examples\\cpp - copy examples\\cpp\\*.h temp\\$(INSTALL_DIR)\\examples\\cpp - cd temp\$(INSTALL_DIR) && ..\..\tools\tar.exe -C ..\.. -c -v --exclude *svn* --exclude *roadef* examples\data | ..\..\tools\tar.exe xvm - copy src\\algorithms\\*.h temp\\$(INSTALL_DIR)\\include\\algorithms - copy src\\base\\*.h temp\\$(INSTALL_DIR)\\include\\base - copy src\\constraint_solver\\*.h temp\\$(INSTALL_DIR)\\include\\constraint_solver - copy src\\gen\\constraint_solver\\*.pb.h temp\\$(INSTALL_DIR)\\include\\constraint_solver - copy src\\graph\\*.h temp\\$(INSTALL_DIR)\\include\\graph - copy src\\bop\\*.h temp\\$(INSTALL_DIR)\\include\\bop - copy src\\gen\\bop\\*.pb.h temp\\$(INSTALL_DIR)\\include\\bop - copy src\\glop\\*.h temp\\$(INSTALL_DIR)\\include\\glop - copy src\\gen\\glop\\*.h temp\\$(INSTALL_DIR)\\include\\glop - copy src\\linear_solver\\*.h temp\\$(INSTALL_DIR)\\include\\linear_solver - copy src\\gen\\linear_solver\\*.pb.h temp\\$(INSTALL_DIR)\\include\\linear_solver - copy src\\sat\\*.h temp\\$(INSTALL_DIR)\\include\\sat - copy src\\gen\\sat\\*.pb.h temp\\$(INSTALL_DIR)\\include\\sat - copy src\\util\\*.h temp\\$(INSTALL_DIR)\\include\\util - cd temp\\$(INSTALL_DIR)\\include && ..\..\..\tools\tar.exe -C ..\\..\\..\\dependencies\\install\\include -c -v gflags | ..\..\..\tools\tar.exe xvm - cd temp\\$(INSTALL_DIR)\\include && ..\..\..\tools\tar.exe -C ..\\..\\..\\dependencies\\install\\include -c -v google | ..\..\..\tools\tar.exe xvm - cd temp\\$(INSTALL_DIR)\\include && ..\..\..\tools\tar.exe -C ..\\..\\..\\dependencies\\install\\include -c -v sparsehash | ..\..\..\tools\tar.exe xvm - cd temp && ..\tools\zip.exe -r ..\Google.OrTools.cc.$(INSTALL_PORT)-$(OR_TOOLS_VERSION).zip $(INSTALL_DIR) - -$(DELREC) temp -else -cc_archive: $(LIB_DIR)/$(LIB_PREFIX)ortools.$(LIB_SUFFIX) - -$(DELREC) temp - mkdir temp - mkdir temp/$(INSTALL_DIR) - mkdir temp/$(INSTALL_DIR)/bin - mkdir temp/$(INSTALL_DIR)/examples - mkdir temp/$(INSTALL_DIR)/examples/cpp - mkdir temp/$(INSTALL_DIR)/examples/data - mkdir temp/$(INSTALL_DIR)/examples/data/et_jobshop - mkdir temp/$(INSTALL_DIR)/examples/data/flexible_jobshop - mkdir temp/$(INSTALL_DIR)/examples/data/jobshop - mkdir temp/$(INSTALL_DIR)/examples/data/multidim_knapsack - mkdir temp/$(INSTALL_DIR)/examples/data/cvrptw - mkdir temp/$(INSTALL_DIR)/examples/data/pdptw - mkdir temp/$(INSTALL_DIR)/include - mkdir temp/$(INSTALL_DIR)/include/algorithms - mkdir temp/$(INSTALL_DIR)/include/base - mkdir temp/$(INSTALL_DIR)/include/constraint_solver - mkdir temp/$(INSTALL_DIR)/include/gflags - mkdir temp/$(INSTALL_DIR)/include/bop - mkdir temp/$(INSTALL_DIR)/include/glop - mkdir temp/$(INSTALL_DIR)/include/google - mkdir temp/$(INSTALL_DIR)/include/graph - mkdir temp/$(INSTALL_DIR)/include/linear_solver - mkdir temp/$(INSTALL_DIR)/include/sat - mkdir temp/$(INSTALL_DIR)/include/util - mkdir temp/$(INSTALL_DIR)/lib - mkdir temp/$(INSTALL_DIR)/objs - cp LICENSE-2.0.txt temp/$(INSTALL_DIR) - cp tools/README.cc temp/$(INSTALL_DIR)/README - cp tools/Makefile.cc temp/$(INSTALL_DIR)/Makefile - cp lib/libortools.$(LIB_SUFFIX) temp/$(INSTALL_DIR)/lib -ifeq ($(PLATFORM),MACOSX) - cp tools/install_libortools_mac.sh temp/$(INSTALL_DIR) -endif - cp examples/cpp/*.cc temp/$(INSTALL_DIR)/examples/cpp - cp examples/cpp/*.h temp/$(INSTALL_DIR)/examples/cpp - cp -R examples/data/et_jobshop/* temp/$(INSTALL_DIR)/examples/data/et_jobshop - cp -R examples/data/flexible_jobshop/* temp/$(INSTALL_DIR)/examples/data/flexible_jobshop - cp -R examples/data/jobshop/* temp/$(INSTALL_DIR)/examples/data/jobshop - cp -R examples/data/multidim_knapsack/* temp/$(INSTALL_DIR)/examples/data/multidim_knapsack - cp -R examples/data/cvrptw/* temp/$(INSTALL_DIR)/examples/data/cvrptw - cp -R examples/data/pdptw/* temp/$(INSTALL_DIR)/examples/data/pdptw - cp src/algorithms/*.h temp/$(INSTALL_DIR)/include/algorithms - cp src/base/*.h temp/$(INSTALL_DIR)/include/base - cp src/constraint_solver/*.h temp/$(INSTALL_DIR)/include/constraint_solver - cp src/gen/constraint_solver/*.pb.h temp/$(INSTALL_DIR)/include/constraint_solver - cp src/bop/*.h temp/$(INSTALL_DIR)/include/bop - cp src/gen/bop/*.pb.h temp/$(INSTALL_DIR)/include/bop - cp src/glop/*.h temp/$(INSTALL_DIR)/include/glop - cp src/gen/glop/*.pb.h temp/$(INSTALL_DIR)/include/glop - cp src/graph/*.h temp/$(INSTALL_DIR)/include/graph - cp src/linear_solver/*.h temp/$(INSTALL_DIR)/include/linear_solver - cp src/gen/linear_solver/*.pb.h temp/$(INSTALL_DIR)/include/linear_solver - cp src/sat/*.h temp/$(INSTALL_DIR)/include/sat - cp src/gen/sat/*.pb.h temp/$(INSTALL_DIR)/include/sat - cp src/util/*.h temp/$(INSTALL_DIR)/include/util - cd temp/$(INSTALL_DIR)/include && tar -C ../../../dependencies/install/include -c -v gflags | tar xvm - cd temp/$(INSTALL_DIR)/include && tar -C ../../../dependencies/install/include -c -v google | tar xvm - cd temp/$(INSTALL_DIR)/include && tar -C ../../../dependencies/install/include -c -v sparsehash | tar xvm - cd temp && tar -c -v -z --no-same-owner -f ../Google.OrTools.cc.$(INSTALL_PORT)-$(OR_TOOLS_VERSION).tar.gz $(INSTALL_DIR) - -$(DELREC) temp -endif - -ifeq "$(SYSTEM)" "win" -fz_archive: fz - -$(DELREC) temp - mkdir temp - mkdir temp\\$(INSTALL_DIR) - mkdir temp\\$(INSTALL_DIR)\\bin - mkdir temp\\$(INSTALL_DIR)\\share - mkdir temp\\$(INSTALL_DIR)\\share\\minizinc - copy LICENSE-2.0.txt temp\\$(INSTALL_DIR) - copy bin\\fz.exe temp\\$(INSTALL_DIR)\\bin\\fzn-or-tools.exe - copy src\\flatzinc\\mznlib\\*.mzn temp\\$(INSTALL_DIR)\\share\\minizinc - cd temp && ..\tools\zip.exe -r ..\Google.OrTools.flatzinc.$(INSTALL_PORT)-$(OR_TOOLS_VERSION).zip $(INSTALL_DIR) - -$(DELREC) temp -else -fz_archive: $(LIB_DIR)/$(LIB_PREFIX)ortools.$(LIB_SUFFIX) - -$(DELREC) temp - mkdir temp - mkdir temp/$(INSTALL_DIR) - mkdir temp/$(INSTALL_DIR)/bin - mkdir temp/$(INSTALL_DIR)/share - mkdir temp/$(INSTALL_DIR)/share/minizinc - cp LICENSE-2.0.txt temp/$(INSTALL_DIR) - cp bin/fz temp/$(INSTALL_DIR)/bin/fzn-or-tools - cp src/flatzinc/mznlib/* temp/$(INSTALL_DIR)/share/minizinc - cd temp && tar cvzf ../Google.OrTools.flatzinc.$(INSTALL_PORT)-$(OR_TOOLS_VERSION).tar.gz $(INSTALL_DIR) - -$(DELREC) temp -endif - - # Debug printdir: @echo LIB_DIR = $(LIB_DIR) diff --git a/makefiles/Makefile.csharp.mk b/makefiles/Makefile.csharp.mk index b476be5513..2470a1cbd4 100755 --- a/makefiles/Makefile.csharp.mk +++ b/makefiles/Makefile.csharp.mk @@ -421,62 +421,3 @@ ifeq ("$(SYSTEM)","win") cd temp\or-tools && nuget pack or-tools.nuspec cd temp\or-tools && nuget push Google.OrTools-$(OR_TOOLS_VERSION).nupkg endif - -dotnet_archive: csharp - -$(DELREC) temp -ifeq ("$(SYSTEM)","win") - tools\mkdir temp - tools\mkdir temp\$(INSTALL_DIR) - tools\mkdir temp\$(INSTALL_DIR)\bin - tools\mkdir temp\$(INSTALL_DIR)\examples - tools\mkdir temp\$(INSTALL_DIR)\examples\solution - tools\mkdir temp\$(INSTALL_DIR)\examples\solution\Properties - tools\mkdir temp\$(INSTALL_DIR)\examples\data - tools\mkdir temp\$(INSTALL_DIR)\examples\data\discrete_tomography - tools\mkdir temp\$(INSTALL_DIR)\examples\data\fill_a_pix - tools\mkdir temp\$(INSTALL_DIR)\examples\data\minesweeper - tools\mkdir temp\$(INSTALL_DIR)\examples\data\rogo - tools\mkdir temp\$(INSTALL_DIR)\examples\data\survo_puzzle - tools\mkdir temp\$(INSTALL_DIR)\examples\data\quasigroup_completion - copy LICENSE-2.0.txt temp$S$(INSTALL_DIR) - copy tools\README.dotnet temp\$(INSTALL_DIR)\README - copy bin\Google.Protobuf.dll temp\$(INSTALL_DIR)\bin - copy bin\$(CLR_DLL_NAME).dll temp\$(INSTALL_DIR)\bin - copy examples\csharp\*.cs temp\$(INSTALL_DIR)\examples - copy examples\csharp\*.sln temp\$(INSTALL_DIR)\examples - copy examples\csharp\solution\*.csproj temp\$(INSTALL_DIR)\examples\solution - copy examples\csharp\solution\Properties\*.cs temp\$(INSTALL_DIR)\examples\solution\Properties - copy examples\data\discrete_tomography\* temp\$(INSTALL_DIR)\examples\data\discrete_tomography - copy examples\data\fill_a_pix\* temp\$(INSTALL_DIR)\examples\data\fill_a_pix - copy examples\data\minesweeper\* temp\$(INSTALL_DIR)\examples\data\minesweeper - copy examples\data\rogo\* temp\$(INSTALL_DIR)\examples\data\rogo - copy examples\data\survo_puzzle\* temp\$(INSTALL_DIR)\examples\data\survo_puzzle - copy examples\data\quasigroup_completion\* temp\$(INSTALL_DIR)\examples\data\quasigroup_completion - cd temp && ..\tools\zip$(CLR_EXE_SUFFIX).exe -r ..\$(CLR_DLL_NAME).NET.$(INSTALL_PORT)-$(OR_TOOLS_VERSION).zip $(INSTALL_DIR) -else - mkdir temp - mkdir temp/$(INSTALL_DIR) - mkdir temp/$(INSTALL_DIR)/bin - mkdir temp/$(INSTALL_DIR)/examples - mkdir temp/$(INSTALL_DIR)/examples/data - mkdir temp/$(INSTALL_DIR)/examples/data/discrete_tomography - mkdir temp/$(INSTALL_DIR)/examples/data/fill_a_pix - mkdir temp/$(INSTALL_DIR)/examples/data/minesweeper - mkdir temp/$(INSTALL_DIR)/examples/data/rogo - mkdir temp/$(INSTALL_DIR)/examples/data/survo_puzzle - mkdir temp/$(INSTALL_DIR)/examples/data/quasigroup_completion - cp LICENSE-2.0.txt temp/$(INSTALL_DIR) - cp tools/README.dotnet temp/$(INSTALL_DIR)/README - cp bin/Google.Protobuf.dll temp/$(INSTALL_DIR)/bin - cp bin/$(CLR_DLL_NAME).dll temp/$(INSTALL_DIR)/bin - cp lib/lib$(CLR_DLL_NAME).so temp/$(INSTALL_DIR)/bin - cp examples/csharp/*.cs temp/$(INSTALL_DIR)/examples - cp examples/data/discrete_tomography/* temp/$(INSTALL_DIR)/examples/data/discrete_tomography - cp examples/data/fill_a_pix/* temp/$(INSTALL_DIR)/examples/data/fill_a_pix - cp examples/data/minesweeper/* temp/$(INSTALL_DIR)/examples/data/minesweeper - cp examples/data/rogo/* temp/$(INSTALL_DIR)/examples/data/rogo - cp examples/data/survo_puzzle/* temp/$(INSTALL_DIR)/examples/data/survo_puzzle - cp examples/data/quasigroup_completion/* temp/$(INSTALL_DIR)/examples/data/quasigroup_completion - cd temp && tar -c -v -z --no-same-owner -f ../$(CLR_DLL_NAME).NET.$(INSTALL_PORT)-$(OR_TOOLS_VERSION).tar.gz $(INSTALL_DIR) -endif - -$(DELREC) temp diff --git a/makefiles/Makefile.java.mk b/makefiles/Makefile.java.mk index 991240dcfa..0001e23da5 100755 --- a/makefiles/Makefile.java.mk +++ b/makefiles/Makefile.java.mk @@ -375,75 +375,3 @@ cjava: $(OBJ_DIR)/com/google/ortools/samples/$(EX).class rjava: $(OBJ_DIR)/com/google/ortools/samples/$(EX).class javaortools $(JAVA_BIN) -Djava.library.path=$(LIB_DIR) -cp $(OBJ_DIR)$(CPSEP)$(LIB_DIR)$Scom.google.ortools.jar$(CPSEP)$(LIB_DIR)$Sprotobuf.jar com.google.ortools.samples.$(EX) $(ARGS) - -# Build stand-alone archive file for redistribution. - -java_archive: java - -$(DELREC) temp - $(MKDIR) temp - $(MKDIR) temp$S$(INSTALL_DIR) - $(MKDIR) temp$S$(INSTALL_DIR)$Slib - $(MKDIR) temp$S$(INSTALL_DIR)$Sobjs - $(COPY) LICENSE-2.0.txt temp$S$(INSTALL_DIR) - $(COPY) tools$SREADME.java temp$S$(INSTALL_DIR)$SREADME - $(COPY) lib$S*.jar temp$S$(INSTALL_DIR)$Slib - $(COPY) lib$S$(LIB_PREFIX)jni*.$(JNI_LIB_EXT) temp$S$(INSTALL_DIR)$Slib -ifeq ("$(SYSTEM)","win") - tools\mkdir temp\$(INSTALL_DIR)\examples - tools\mkdir temp\$(INSTALL_DIR)\examples\com - tools\mkdir temp\$(INSTALL_DIR)\examples\com\google - tools\mkdir temp\$(INSTALL_DIR)\examples\com\google\ortools - tools\mkdir temp\$(INSTALL_DIR)\examples\com\google\ortools\algorithms - tools\mkdir temp\$(INSTALL_DIR)\examples\com\google\ortools\constraintsolver - tools\mkdir temp\$(INSTALL_DIR)\examples\com\google\ortools\graph - tools\mkdir temp\$(INSTALL_DIR)\examples\com\google\ortools\linearsolver - tools\mkdir temp\$(INSTALL_DIR)\examples\com\google\ortools\samples - tools\mkdir temp\$(INSTALL_DIR)\examples\data - tools\mkdir temp\$(INSTALL_DIR)\examples\data\discrete_tomography - tools\mkdir temp\$(INSTALL_DIR)\examples\data\fill_a_pix - tools\mkdir temp\$(INSTALL_DIR)\examples\data\minesweeper - tools\mkdir temp\$(INSTALL_DIR)\examples\data\rogo - tools\mkdir temp\$(INSTALL_DIR)\examples\data\survo_puzzle - tools\mkdir temp\$(INSTALL_DIR)\examples\data\quasigroup_completion - copy examples\data\discrete_tomography\* temp\$(INSTALL_DIR)\examples\data\discrete_tomography - copy examples\data\fill_a_pix\* temp\$(INSTALL_DIR)\examples\data\fill_a_pix - copy examples\data\minesweeper\* temp\$(INSTALL_DIR)\examples\data\minesweeper - copy examples\data\rogo\* temp\$(INSTALL_DIR)\examples\data\rogo - copy examples\data\survo_puzzle\* temp\$(INSTALL_DIR)\examples\data\survo_puzzle - copy examples\data\quasigroup_completion\* temp\$(INSTALL_DIR)\examples\data\quasigroup_completion - copy examples\com\google\ortools\samples\*.java temp\$(INSTALL_DIR)\examples\com\google\ortools\samples - copy examples\com\google\ortools\samples\*.java temp\$(INSTALL_DIR)\examples\com\google\ortools\samples - copy examples\com\google\ortools\samples\*.java temp\$(INSTALL_DIR)\examples\com\google\ortools\samples - copy examples\com\google\ortools\samples\*.java temp\$(INSTALL_DIR)\examples\com\google\ortools\samples - cd temp && ..$Stools$Szip.exe -r ..$SGoogle.OrTools.java.$(INSTALL_PORT)-$(OR_TOOLS_VERSION).zip $(INSTALL_DIR) -else - mkdir temp/$(INSTALL_DIR)/examples - mkdir temp/$(INSTALL_DIR)/examples/com - mkdir temp/$(INSTALL_DIR)/examples/com/google - mkdir temp/$(INSTALL_DIR)/examples/com/google/ortools - mkdir temp/$(INSTALL_DIR)/examples/com/google/ortools/algorithms - mkdir temp/$(INSTALL_DIR)/examples/com/google/ortools/constraintsolver - mkdir temp/$(INSTALL_DIR)/examples/com/google/ortools/graph - mkdir temp/$(INSTALL_DIR)/examples/com/google/ortools/linearsolver - mkdir temp/$(INSTALL_DIR)/examples/com/google/ortools/samples - mkdir temp/$(INSTALL_DIR)/examples/data - mkdir temp/$(INSTALL_DIR)/examples/data/discrete_tomography - mkdir temp/$(INSTALL_DIR)/examples/data/fill_a_pix - mkdir temp/$(INSTALL_DIR)/examples/data/minesweeper - mkdir temp/$(INSTALL_DIR)/examples/data/rogo - mkdir temp/$(INSTALL_DIR)/examples/data/survo_puzzle - mkdir temp/$(INSTALL_DIR)/examples/data/quasigroup_completion - cp examples/data/discrete_tomography/* temp/$(INSTALL_DIR)/examples/data/discrete_tomography - cp examples/data/fill_a_pix/* temp/$(INSTALL_DIR)/examples/data/fill_a_pix - cp examples/data/minesweeper/* temp/$(INSTALL_DIR)/examples/data/minesweeper - cp examples/data/rogo/* temp/$(INSTALL_DIR)/examples/data/rogo - cp examples/data/survo_puzzle/* temp/$(INSTALL_DIR)/examples/data/survo_puzzle - cp examples/data/quasigroup_completion/* temp/$(INSTALL_DIR)/examples/data/quasigroup_completion - cp examples/com/google/ortools/samples/*.java temp/$(INSTALL_DIR)/examples/com/google/ortools/samples - cp examples/com/google/ortools/samples/*.java temp/$(INSTALL_DIR)/examples/com/google/ortools/samples - cp examples/com/google/ortools/samples/*.java temp/$(INSTALL_DIR)/examples/com/google/ortools/samples - cp examples/com/google/ortools/samples/*.java temp/$(INSTALL_DIR)/examples/com/google/ortools/samples - cp examples/com/google/ortools/samples/*.java temp/$(INSTALL_DIR)/examples/com/google/ortools/samples - cd temp && tar -c -v -z --no-same-owner -f ../Google.OrTools.java.$(INSTALL_PORT)-$(OR_TOOLS_VERSION).tar.gz $(INSTALL_DIR) -endif - -$(DELREC) temp