From 98566c5ad1ea634000950a061b167752b4c446b0 Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Thu, 2 Jun 2011 11:43:19 +0900 Subject: [PATCH] Rename native library names from libsnappy to libsnappyjava --- Makefile.package | 92 ++++++++---------- .../java/org/xerial/snappy/LoadSnappy.java | 1 + .../amd64/{libsnappy.so => libsnappyjava.so} | Bin .../i386/{libsnappy.so => libsnappyjava.so} | Bin ...{libsnappy.jnilib => libsnappyjava.jnilib} | Bin 47044 -> 47044 bytes ...{libsnappy.jnilib => libsnappyjava.jnilib} | Bin 53920 -> 53920 bytes 6 files changed, 39 insertions(+), 54 deletions(-) rename src/main/resources/org/xerial/snappy/native/Linux/amd64/{libsnappy.so => libsnappyjava.so} (100%) rename src/main/resources/org/xerial/snappy/native/Linux/i386/{libsnappy.so => libsnappyjava.so} (100%) rename src/main/resources/org/xerial/snappy/native/Mac/i386/{libsnappy.jnilib => libsnappyjava.jnilib} (69%) rename src/main/resources/org/xerial/snappy/native/Mac/x86_64/{libsnappy.jnilib => libsnappyjava.jnilib} (95%) diff --git a/Makefile.package b/Makefile.package index 0dff675..798ffd1 100755 --- a/Makefile.package +++ b/Makefile.package @@ -6,98 +6,82 @@ 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 +WORK:=work/hg/snappy-java WIN64_SERVER=localhost -WIN64_WORK=work/hg/snappy-java +MAC_SERVER=172.16.133.41 +MAC_TIGER_SERVER=172.16.133.171 -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 +AMD_SERVER=hx02 -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 +BUILD_CMD_PREFIX = hg pull -u && make clean-native && make +BUILD_CMD = $(BUILD_CMD_PREFIX) 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_DIR=src/main/resources/org/xerial/snappy/native +DLL_WIN=$(DLL_DIR)/Windows/x86/snappyjava.dll +DLL_WIN64=$(DLL_DIR)/Windows/amd64/snappyjava.dll +DLL_MAC=$(DLL_DIR)/Mac/x86_64/libsnappyjava.jnilib +DLL_TIGER_MAC=$(DLL_DIR)/Mac/i386/libsnappyjava.jnilib +DLL_LINUX=$(DLL_DIR)/Linux/i386/libsnappyjava.so +DLL_AMD64=$(DLL_DIR)/Linux/amd64/libsnappyjava.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/ + ssh $(WIN64_SERVER) "source .zprofile && cd $(WORK) && $(BUILD_CMD_PREFIX) win32" + mkdir -p $(dir $(DLL_WIN)) + $(RSYNC) $(WIN_SERVER):./$(WORK)/$(DLL_WIN) $(DLL_WIN) $(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/ + ssh $(WIN64_SERVER) "source .zprofile && cd $(WORK) && $(BUILD_CMD)" + mkdir -p $(dir $(DLL_WIN64)) + $(RSYNC) $(WIN64_SERVER):./$(WORK)/$(DLL_WIN64) $(DLL_WIN64) $(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/ + ssh $(MAC_SERVER) "source .zprofile && cd $(WORK) && $(BUILD_CMD)" + mkdir -p $(dir $(DLL_MAC)) + $(RSYNC) $(MAC_SERVER):./$(WORK)/$(DLL_MAC) $(DLL_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/ - + ssh $(MAC_TIGER_SERVER) "source .zprofile && cd $(WORK) && $(BUILD_CMD)" + mkdir -p $(dir $(DLL_TIGER_MAC)) + $(RSYNC) $(MAC_TIGER_SERVER):./$(WORK)/$(DLL_TIGER_MAC) $(DLL_TIGER_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/ + ssh $(AMD_SERVER) "source .zprofile && cd $(WORK) && $(BUILD_CMD_PREFIX) linux32" + mkdir -p $(dir $(DLL_LINUX)) + $(RSYNC) $(AMD_SERVER):./$(WORK)/$(DLL_LINUX) $(DLL_LINUX) $(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/ + ssh $(AMD_SERVER) "source .zprofile && cd $(WORK) && $(BUILD_CMD)" + mkdir -p $(dir $(DLL_AMD64)) + $(RSYNC) $(AMD_SERVER):./$(WORK)/$(DLL_AMD64) $(DLL_AMD64) -$(DLL_DIR): - mkdir -p $@ -native: $(DLL_DIR) $(DLL_WIN) $(DLL_WIN64) $(DLL_MAC) $(DLL_TIGER_MAC) $(DLL_LINUX) $(DLL_AMD64) +native: $(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)" + ssh $(WIN64_SERVER) "source .zprofile && cd $(WORK) && $(TEST_CMD)" + ssh $(MAC_SERVER) "source .zprofile && cd $(WORK) && $(TEST_CMD)" + ssh $(MAC_TIGER_SERVER) "source .zprofile && cd $(WORK) && $(TEST_CMD)" + ssh $(AMD_SERVER) "source .zprofile && cd $(WORK) && $(TEST_CMD)" release: mvn release:prepare mvn release:perform release-xerial: - mvn release:perform -Dtag=snappy-java-$(version) + mvn release:perform -Dtag=snappy-java-$(VERSION) release-sourceforge: - mvn release:perform -Darguments="-P sourceforge" -Dtag=snappy-java-$(version) + mvn release:perform -Darguments="-P sourceforge" -Dtag=snappy-java-$(VERSION) diff --git a/src/main/java/org/xerial/snappy/LoadSnappy.java b/src/main/java/org/xerial/snappy/LoadSnappy.java index 22da8ec..e8465c1 100755 --- a/src/main/java/org/xerial/snappy/LoadSnappy.java +++ b/src/main/java/org/xerial/snappy/LoadSnappy.java @@ -192,6 +192,7 @@ public class LoadSnappy String tempFolder = new File(System.getProperty("java.io.tmpdir")).getAbsolutePath(); // Try extracting the library from jar if (extractAndLoadLibraryFile(snappyNativeLibraryPath, snappyNativeLibraryName, tempFolder)) { + isLoaded = true; return; } } diff --git a/src/main/resources/org/xerial/snappy/native/Linux/amd64/libsnappy.so b/src/main/resources/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so similarity index 100% rename from src/main/resources/org/xerial/snappy/native/Linux/amd64/libsnappy.so rename to src/main/resources/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so diff --git a/src/main/resources/org/xerial/snappy/native/Linux/i386/libsnappy.so b/src/main/resources/org/xerial/snappy/native/Linux/i386/libsnappyjava.so similarity index 100% rename from src/main/resources/org/xerial/snappy/native/Linux/i386/libsnappy.so rename to src/main/resources/org/xerial/snappy/native/Linux/i386/libsnappyjava.so diff --git a/src/main/resources/org/xerial/snappy/native/Mac/i386/libsnappy.jnilib b/src/main/resources/org/xerial/snappy/native/Mac/i386/libsnappyjava.jnilib similarity index 69% rename from src/main/resources/org/xerial/snappy/native/Mac/i386/libsnappy.jnilib rename to src/main/resources/org/xerial/snappy/native/Mac/i386/libsnappyjava.jnilib index 4f0dab9312d1ea67ff718012a61e1f7b3e41b856..77d57c58214e9f94da3abbe87489ac5374efa430 100755 GIT binary patch delta 4928 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 ZOOe;XCb&*ip;Yo&N6?*~zdSL-`9GWs8zTS! diff --git a/src/main/resources/org/xerial/snappy/native/Mac/x86_64/libsnappy.jnilib b/src/main/resources/org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib similarity index 95% rename from src/main/resources/org/xerial/snappy/native/Mac/x86_64/libsnappy.jnilib rename to src/main/resources/org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib index d9fc1b84ed369563c6f77968f615daadfbeaa285..691ac4cbb972fc7dba49f18bc1708f900912da18 100755 GIT binary patch delta 71 zcmZ3mlzG8Y<_RKpA5_%~;~zLp+4I4NrTi!00u XoM+TGY!+Y(;G4XFkz;d$h{HYr5lI(W