Skip to content

Commit

Permalink
Removed unnecessary code
Browse files Browse the repository at this point in the history
  • Loading branch information
xerial committed Jun 26, 2014
1 parent 199cdac commit 492be99
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 71 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ project/plugins/project/

# Scala-IDE specific
.scala_dependencies
atlassian-ide-plugin.xml


19 changes: 7 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,12 @@ $(SNAPPY_GIT_UNPACKED):

jni-header: $(SRC)/org/xerial/snappy/SnappyNative.h

$(TARGET)/classes/org/xerial/snappy/SnappyNative.class : $(SRC)/org/xerial/snappy/SnappyNative.java
@mkdir -p $(TARGET)/classes
$(JAVAC) -source 1.6 -target 1.6 -d $(TARGET)/classes -sourcepath $(SRC) $<
$(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class : $(SRC)/org/xerial/snappy/SnappyNative.java
@mkdir -p $(TARGET)/jni-classes
$(JAVAC) -source 1.6 -target 1.6 -d $(TARGET)/jni-classes -sourcepath $(SRC) $<

$(SRC)/org/xerial/snappy/SnappyNative.h: $(TARGET)/classes/org/xerial/snappy/SnappyNative.class
$(JAVAH) -classpath $(TARGET)/classes -o $@ org.xerial.snappy.SnappyNative

bytecode: src/main/resources/org/xerial/snappy/SnappyNativeLoader.bytecode

src/main/resources/org/xerial/snappy/SnappyNativeLoader.bytecode: src/main/resources/org/xerial/snappy/SnappyNativeLoader.java
@mkdir -p $(TARGET)/temp
$(JAVAC) -source 1.5 -target 1.5 -d $(TARGET)/temp $<
cp $(TARGET)/temp/org/xerial/snappy/SnappyNativeLoader.class $@
$(SRC)/org/xerial/snappy/SnappyNative.h: $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class
$(JAVAH) -force -classpath $(TARGET)/classes -o $@ org.xerial.snappy.SnappyNative

ifndef USE_GIT
$(SNAPPY_SRC): $(SNAPPY_UNPACKED)
Expand Down Expand Up @@ -110,6 +103,8 @@ $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME)
cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME)


package: $(TARGET)/$(snappy-jar-version).jar

$(TARGET)/$(snappy-jar-version).jar:
$(SBT) package

Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ If you are using Mac and openjdk7 (or higher), use the following option:

$ make native LIBNAME=libsnappyjava.dylib

## Running tests

$ make test

## Miscellaneous Notes
### Using snappy-java with Tomcat 6 (or higher) Web Server

Expand Down
Binary file not shown.
59 changes: 0 additions & 59 deletions src/main/resources/org/xerial/snappy/SnappyNativeLoader.java

This file was deleted.

0 comments on commit 492be99

Please sign in to comment.