Merge branch 'master' of https://github.com/google/or-tools

google · Nov 4, 2016 · 3ed646a · 3ed646a
2 parents 1ca8806 + e70a019
commit 3ed646a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/examples/cpp/fap_parser.h b/examples/cpp/fap_parser.h
@@ -26,6 +26,7 @@
 #include "base/strtoint.h"
 #include "base/split.h"
 #include "base/map_util.h"
+#include "base/hash.h"
 
 namespace operations_research {
 

diff --git a/makefiles/Makefile.archive.mk b/makefiles/Makefile.archive.mk
@@ -65,7 +65,7 @@ create_dirs:
 	$(COPY) tools$SREADME.cc.java.csharp temp$S$(INSTALL_DIR)$SREADME
 	$(COPY) tools$SMakefile.cc temp$S$(INSTALL_DIR)$SMakefile
 
-cc_archive:
+cc_archive: cc
 
 	$(COPY) $(LIB_DIR)$S$(LIB_PREFIX)cvrptw_lib.$(LIB_SUFFIX) temp$S$(INSTALL_DIR)$Slib
 	$(COPY) $(LIB_DIR)$S$(LIB_PREFIX)dimacs.$(LIB_SUFFIX) temp$S$(INSTALL_DIR)$Slib
@@ -111,7 +111,7 @@ else
 	cd temp$S$(INSTALL_DIR)$Sinclude && tar -C ..$S..$S..$Sdependencies$Sinstall$Sinclude -c -v sparsehash | tar xvm
 endif
 
-dotnet_archive:
+dotnet_archive: csharp
 
 	$(COPY) bin$SGoogle.Protobuf.dll temp$S$(INSTALL_DIR)$Sbin
 	$(COPY) bin$S$(CLR_DLL_NAME).dll temp$S$(INSTALL_DIR)$Sbin
@@ -131,7 +131,7 @@ else
 	$(COPY) lib$Slib$(CLR_DLL_NAME).so temp$S$(INSTALL_DIR)$Sbin
 endif
 
-java_archive:
+java_archive: java
 	$(COPY) lib$S*.jar temp$S$(INSTALL_DIR)$Slib
 	$(COPY) lib$S$(LIB_PREFIX)jni*.$(JNI_LIB_EXT) temp$S$(INSTALL_DIR)$Slib
 
@@ -170,13 +170,15 @@ fz_archive: $(LIB_DIR)$S$(LIB_PREFIX)ortools.$(LIB_SUFFIX) $(LIB_DIR)$S$(LIB_PRE
 	mkdir temp$S$(FZ_INSTALL_DIR)$Sbin
 	mkdir temp$S$(FZ_INSTALL_DIR)$Slib
 	mkdir temp$S$(FZ_INSTALL_DIR)$Sshare
-	mkdir temp$S$(FZ_INSTALL_DIR)$Sshare$Sminizinc
+	mkdir temp$S$(FZ_INSTALL_DIR)$Sshare$Sminizinc_cp
+	mkdir temp$S$(FZ_INSTALL_DIR)$Sshare$Sminizinc_sat
 	mkdir temp$S$(FZ_INSTALL_DIR)$Sexamples
 	$(COPY) LICENSE-2.0.txt temp$S$(FZ_INSTALL_DIR)
 	$(COPY) bin$Sfz$E temp$S$(FZ_INSTALL_DIR)$Sbin$Sfzn-or-tools$E
 	$(COPY) $(LIB_DIR)$S$(LIB_PREFIX)ortools.$(LIB_SUFFIX) temp$S$(FZ_INSTALL_DIR)$Slib
 	$(COPY) $(LIB_DIR)$S$(LIB_PREFIX)fz.$(LIB_SUFFIX) temp$S$(FZ_INSTALL_DIR)$Slib
-	$(COPY) src$Sflatzinc$Smznlib$S* temp$S$(FZ_INSTALL_DIR)$Sshare$Sminizinc
+	$(COPY) src$Sflatzinc$Smznlib_cp$S* temp$S$(FZ_INSTALL_DIR)$Sshare$Sminizinc_cp
+	$(COPY) src$Sflatzinc$Smznlib_sat$S* temp$S$(FZ_INSTALL_DIR)$Sshare$Sminizinc_sat
 	$(COPY) examples$Sflatzinc$S* temp$S$(FZ_INSTALL_DIR)$Sexamples
 ifeq ($(PLATFORM),LINUX)
 	$(DEP_BIN_DIR)$Spatchelf --set-rpath '$$ORIGIN/../lib' temp$S$(FZ_INSTALL_DIR)$Sbin$Sfzn-or-tools

diff --git a/makefiles/Makefile.cpp.mk b/makefiles/Makefile.cpp.mk
@@ -141,7 +141,8 @@ CC_BINARIES = \
 	$(BIN_DIR)/linear_solver_protocol_buffers$E \
 	$(BIN_DIR)/strawberry_fields_with_column_generation$E \
 	$(BIN_DIR)/mps_driver$E \
-	$(BIN_DIR)/solve$E
+	$(BIN_DIR)/solve$E \
+	$(BIN_DIR)/frequency_assignment_problem$E
 
 ccexe: $(CC_BINARIES)
 

diff --git a/tools/Makefile.cc b/tools/Makefile.cc
@@ -46,7 +46,6 @@ ifeq ("$(SYSTEM)","unix")
 	OR_TOOLS_TOP ?= $(shell pwd)
 	OS = $(shell uname -s)
 	LIB_PREFIX = lib
-	LIB_SUFFIX = so
 	PRE_LIB = -Wl,-rpath $(OR_TOOLS_TOP)/lib -L$(OR_TOOLS_TOP)/lib
 	OR_TOOLS_LNK = $(PRE_LIB) -lortools
 	CVRPTW_LNK = $(PRE_LIB) -lcvrptw_lib $(PRE_LIB) -lortools
@@ -66,6 +65,7 @@ ifeq ("$(SYSTEM)","unix")
 		endif
 		CSC = mcs
 		MONO = LD_LIBRARY_PATH=$(LIB_DIR):$(LD_LIBRARY_PATH) mono
+		LIB_SUFFIX = so
 	endif
 	ifeq ($(OS),Darwin) # Assume Mac Os X
 		CCC = clang++ -fPIC -std=c++11
@@ -75,6 +75,7 @@ ifeq ("$(SYSTEM)","unix")
 		CSC = mcs
 		MONO =	DYLD_FALLBACK_LIBRARY_PATH=$(LIB_DIR):$(DYLD_LIBRARY_PATH) mono64
 		NETPLATFORM = x64
+		LIB_SUFFIX = dylib
 	endif
 	O = o
 	E =