tyler.durden/snappy-java
1
0
Fork 0
mirror of https://github.com/xerial/snappy-java.git synced 2025-04-08 19:35:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix build scripts to use sbt instead of mvn

Browse Source
This commit is contained in:
Taro L. Saito 2014-06-26 14:12:03 +09:00
parent c96a345d85
commit 2cd4ed553f
5 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -2,6 +2,7 @@
include Makefile.common include Makefile.common
MVN:=mvn MVN:=mvn
SBT:=./sbt
all: snappy all: snappy
@ -93,7 +94,7 @@ 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) NATIVE_TARGET_DIR:=$(TARGET)/classes/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH)
NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME) 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; }') snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$$/d")
ifndef USE_GIT ifndef USE_GIT
native: $(SNAPPY_UNPACKED) $(NATIVE_DLL) native: $(SNAPPY_UNPACKED) $(NATIVE_DLL)
@ -109,11 +110,11 @@ $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME)
cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME) cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME)
$(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL) $(TARGET)/$(snappy-jar-version).jar:
$(MVN) package -Dmaven.test.skip=true $(SBT) package
test: $(NATIVE_DLL) test: $(NATIVE_DLL)
$(MVN) test $(SBT) test
win32: win32:
$(MAKE) native CROSS_PREFIX=i686-w64-mingw32- OS_NAME=Windows OS_ARCH=x86 $(MAKE) native CROSS_PREFIX=i686-w64-mingw32- OS_NAME=Windows OS_ARCH=x86
@ -146,8 +147,10 @@ clean-native-win32:
$(MAKE) clean-native OS_NAME=Windows OS_ARCH=x86 $(MAKE) clean-native OS_NAME=Windows OS_ARCH=x86
javadoc: javadoc:
$(MVN) javadoc:javadoc -DreportOutputDirectory=wiki/apidocs $(SBT) doc
install-m2:
$(SBT) publishM2
googlecode-upload: googlecode-lib-upload googlecode-src-upload googlecode-upload: googlecode-lib-upload googlecode-src-upload

2
Makefile.common
View File

@ -153,7 +153,7 @@ Mac-x86_SNAPPY_FLAGS :=
Mac-x86_64_CXX := g++ -arch $(OS_ARCH) Mac-x86_64_CXX := g++ -arch $(OS_ARCH)
Mac-x86_64_STRIP := strip -x Mac-x86_64_STRIP := strip -x
Mac-x86_64_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.5 -fvisibility=hidden Mac-x86_64_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.5 -fvisibility=hidden
Mac-x86_64_LINKFLAGS := -dynamiclib -static-libgcc Mac-x86_64_LINKFLAGS := -dynamiclib
Mac-x86_64_LIBNAME := libsnappyjava.jnilib Mac-x86_64_LIBNAME := libsnappyjava.jnilib
Mac-x86_64_SNAPPY_FLAGS := Mac-x86_64_SNAPPY_FLAGS :=

6
README.md
View File

@ -81,6 +81,12 @@ Add the following dependency to your pom.xml:
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
### Using with sbt
```
libraryDependencies += "org.xerial.snappy" % "snappy-java" % "(version)"
```
## Public discussion group ## Public discussion group
Post bug reports or feature request to the Issue Tracker: <https://github.com/xerial/snappy-java/issues> Post bug reports or feature request to the Issue Tracker: <https://github.com/xerial/snappy-java/issues>

2
build.sbt
View File

@ -12,8 +12,6 @@ description := "snappy-java: A fast compression/decompression library"
profileName := "org.xerial" profileName := "org.xerial"
version := "1.1.1-M3"
pomExtra := { pomExtra := {
<url>https://github.comm/xerial/snappy-java</url> <url>https://github.comm/xerial/snappy-java</url>
<licenses> <licenses>

BIN
lib/silk-weaver.jar
View File

Binary file not shown.