Fix build dependencies

Makefile

@@ -5,33 +5,41 @@ MVN:=mvn
 
 all: snappy
 
+SNAPPY_OUT:=$(TARGET)/$(snappy)-$(os_arch)
 SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(VERSION).tar.gz 
 SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
+SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(VERSION)
+SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
 SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o)
 
+SNAPPY_UNPACKED:=$(TARGET)/snappy-extracted.log
+
+CXXFLAGS:=$(CXXFLAGS) -I$(SNAPPY_SRC_DIR)
 
 $(SNAPPY_ARCHIVE):
 	@mkdir -p $(@D)
 	curl -o$@ http://snappy.googlecode.com/files/snappy-$(VERSION).tar.gz
 
-
+$(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE)
-$(TARGET)/snappy-$(VERSION): $(SNAPPY_ARCHIVE)
 	tar xvfz $< -C $(TARGET)	
-
+	touch $@
 
 jni-header: $(SRC)/org/xerial/snappy/SnappyNative.h
 
+
 $(SRC)/org/xerial/snappy/SnappyNative.h: $(SRC)/org/xerial/snappy/SnappyNative.java
 	$(JAVAH) -classpath $(TARGET)/classes -o $@ org.xerial.snappy.SnappyNative
 
+$(SNAPPY_SRC): $(SNAPPY_UNPACKED)
 
-$(SNAPPY_OUT)/%.o : $(TARGET)/snappy-$(VERSION)/%.cc 
+$(SNAPPY_OUT)/%.o : $(SNAPPY_SRC_DIR)/%.cc
 	@mkdir -p $(@D)
-	$(CXX) $(CXXFLAGS) -c -o $@ $<
+	$(CXX) $(CXXFLAGS) -c $< -o $@ 
 
-$(SNAPPY_OUT)/%.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/org/xerial/snappy/SnappyNative.h  
+$(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/org/xerial/snappy/SnappyNative.h  
 	@mkdir -p $(@D)
-	$(CXX) $(CXXFLAGS) -c -o $@ $<
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+
 
 $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
 	$(CXX) $(CXXFLAGS) $(LINKFLAGS) $+ -o $@ 
@@ -40,6 +48,8 @@ $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
 clean-native: 
 	rm -rf $(SNAPPY_OUT)
 
+clean:
+	rm -rf $(TARGET)
 
 NATIVE_DIR:=src/main/resources/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH)
 NATIVE_TARGET_DIR:=$(TARGET)/classes/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH)
@@ -47,7 +57,7 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
 
 snappy-jar-version:=snappy-java-$(shell $(JAVA) -jar lib/silk-weaver.jar find 'project(artifactId, version)' pom.xml | grep snappy-java | awk '{ print $$2; }')
 
-native: $(TARGET)/snappy-$(VERSION) $(NATIVE_DLL) 
+native: $(SNAPPY_UNPACKED) $(NATIVE_DLL) 
 snappy: $(TARGET)/$(snappy-jar-version).jar
 
 $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) 
@@ -60,7 +70,7 @@ $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME)
 $(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL)
 	$(MVN) package -Dmaven.test.skip=true
 
-test: snappy
+test: $(NATIVE_DLL)
 	$(MVN) test
 
 win32: 

Makefile.common

@@ -31,7 +31,7 @@ else
 endif
 
 snappy := snappy-$(VERSION)
-SNAPPY_SRC:=$(TARGET)/snappy-$(VERSION)
+
 
 jni_md := $(shell find -L "$(JAVA_HOME)" -name jni_md.h)
 ifneq ($(jni_md),)
@@ -85,7 +85,7 @@ Mac-x86_64_SNAPPY_FLAGS  :=
 
 Windows-x86_CXX          := mingw32-g++
 Windows-x86_STRIP        := strip
-Windows-x86_CXXFLAGS     :=  -Ilib/inc_win -O2
+Windows-x86_CXXFLAGS     := -Ilib/inc_win -O2
 Windows-x86_LINKFLAGS    := -Wl,--kill-at -shared -static
 Windows-x86_LIBNAME      := snappy.dll
 Windows-x86_SNAPPY_FLAGS := 
@@ -105,9 +105,9 @@ LINKFLAGS := $($(os_arch)_LINKFLAGS)
 LIBNAME   := $($(os_arch)_LIBNAME)
 SNAPPY_FLAGS := $($(os_arch)_SNAPPY_FLAGS)
 
-SNAPPY_OUT:=$(TARGET)/$(snappy)-$(os_arch)
 
-CXXFLAGS := $(CXXFLAGS) -Ilib/include  -I$(SNAPPY_OUT) -I$(SNAPPY_SRC)
+
+CXXFLAGS := $(CXXFLAGS) -Ilib/include  
 ifneq ($(jni_include),)
 CXXFLAGS := $(CXXFLAGS) -I"$(jni_include)"
 endif

Makefile.package

@@ -0,0 +1,103 @@
+# Makefile for building and collecting native libraries in Win/Mac/Linux (32/64bit). 
+
+include Makefile.common
+
+RESOURCE_DIR=src/main/resources
+NATIVE_DIR=$(RESOURCE_DIR)/native
+RSYNC=rsync -av -e ssh --exclude=".hg"
+
+WIN_SERVER=192.168.11.10
+WIN_WORK=work/hg/snappy-java
+
+WIN64_SERVER=localhost
+WIN64_WORK=work/hg/snappy-java
+
+MAC_SERVER=192.168.11.11
+MAC_WORK=work/hg/snappy-java
+
+MAC_TIGER_SERVER=192.168.11.12
+MAC_TIGER_WORK=work/hg/snappy-java
+
+LINUX_SERVER=sprite
+LINUX_WORK=work/hg/snappy-java
+
+AMD_SERVER=utgb01
+AMD_WORK=work/hg/snappy-java
+
+BUILD_CMD = hg pull -u && make clean-native && make native
+TEST_CMD = mvn test
+
+all: compile test
+
+.PHONY: compile test native clean
+
+include VERSION
+sqlite-version := sqlite-$(version)
+
+LIB_DIR=target/dll/$(sqlite-version)
+DLL_DIR=$(LIB_DIR)/native
+
+DLL_WIN=$(DLL_DIR)/Windows/x86/snappy.dll
+DLL_WIN64=$(DLL_DIR)/Windows/amd64/snappy.dll
+DLL_MAC=$(DLL_DIR)/Mac/x86_64/libsnappy.jnilib
+DLL_TIGER_MAC=$(DLL_DIR)/Mac/i386/libsnappy.jnilib
+DLL_LINUX=$(DLL_DIR)/Linux/i386/libsnappy.so
+DLL_AMD64=$(DLL_DIR)/Linux/amd64/libsnappy.so
+
+
+
+$(DLL_WIN): 
+	ssh $(WIN_SERVER) "source .zprofile && cd $(WIN_WORK) && $(BUILD_CMD)"
+	mkdir -p $(DLL_DIR)/Windows
+	$(RSYNC)  $(WIN_SERVER):./$(WIN_WORK)/$(DLL_DIR)/Windows/ $(DLL_DIR)/Windows/
+
+$(DLL_WIN64): 
+	ssh $(WIN64_SERVER) "source .zprofile && cd $(WIN64_WORK) && $(BUILD_CMD)"
+	mkdir -p $(DLL_DIR)/Windows
+	$(RSYNC)  $(WIN64_SERVER):./$(WIN64_WORK)/$(DLL_DIR)/Windows/ $(DLL_DIR)/Windows/
+
+$(DLL_MAC): 
+	ssh $(MAC_SERVER) "source .zprofile && cd $(MAC_WORK) && $(BUILD_CMD)"
+	mkdir -p $(DLL_DIR)/Mac
+	$(RSYNC)  $(MAC_SERVER):./$(MAC_WORK)/$(DLL_DIR)/Mac/ $(DLL_DIR)/Mac/
+
+$(DLL_TIGER_MAC): 
+	ssh $(MAC_TIGER_SERVER) "source .zprofile && cd $(MAC_TIGER_WORK) && $(BUILD_CMD)"
+	mkdir -p $(DLL_DIR)/Mac
+	$(RSYNC)  $(MAC_TIGER_SERVER):./$(MAC_TIGER_WORK)/$(DLL_DIR)/Mac/ $(DLL_DIR)/Mac/
+
+
+$(DLL_LINUX):
+	ssh $(LINUX_SERVER) "source .zprofile && source /etc/profile.d/java.sh && cd $(LINUX_WORK) && $(BUILD_CMD)"
+	mkdir -p $(DLL_DIR)/Linux/i386
+	$(RSYNC)  $(LINUX_SERVER):./$(LINUX_WORK)/$(DLL_DIR)/Linux/i386/ $(DLL_DIR)/Linux/i386/
+
+$(DLL_AMD64):
+	ssh $(AMD_SERVER) "source .zprofile && cd $(AMD_WORK) && $(BUILD_CMD)"
+	mkdir -p $(DLL_DIR)/Linux/amd64
+	$(RSYNC)  $(AMD_SERVER):./$(AMD_WORK)/$(DLL_DIR)/Linux/amd64/ $(DLL_DIR)/Linux/amd64/
+
+$(DLL_DIR):
+	mkdir -p $@
+
+native: $(DLL_DIR) $(DLL_WIN) $(DLL_WIN64) $(DLL_MAC) $(DLL_TIGER_MAC) $(DLL_LINUX) $(DLL_AMD64)
+
+compile: native
+	cp -r $(DLL_DIR)/ $(RESOURCE_DIR)/native/
+
+test:
+	ssh $(WIN_SERVER) "source .zprofile && cd $(WIN_WORK) && $(TEST_CMD)"
+	ssh $(MAC_SERVER) "source .zprofile && cd $(MAC_WORK) && $(TEST_CMD)"
+	ssh $(MAC_TIGER_SERVER) "source .zprofile && cd $(MAC_WORK) && $(TEST_CMD)"
+	ssh $(LINUX_SERVER) "source .zprofile && source /etc/profile.d/java.sh && cd $(LINUX_WORK) && $(TEST_CMD)"
+	ssh $(AMD_SERVER) "source .zprofile && cd $(AMD_WORK) && $(TEST_CMD)"
+
+release:
+	mvn release:prepare
+	mvn release:perform
+
+release-xerial:
+	mvn release:perform -Dtag=snappy-java-$(version)
+
+release-sourceforge:
+	mvn release:perform -Darguments="-P sourceforge" -Dtag=snappy-java-$(version)