Skip to content

Commit 492be99

Browse files
committed
Removed unnecessary code
1 parent 199cdac commit 492be99

File tree

5 files changed

+13
-71
lines changed

5 files changed

+13
-71
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,6 @@ project/plugins/project/
2020

2121
# Scala-IDE specific
2222
.scala_dependencies
23+
atlassian-ide-plugin.xml
24+
2325

Makefile

+7-12
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,12 @@ $(SNAPPY_GIT_UNPACKED):
5151

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

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

58-
$(SRC)/org/xerial/snappy/SnappyNative.h: $(TARGET)/classes/org/xerial/snappy/SnappyNative.class
59-
$(JAVAH) -classpath $(TARGET)/classes -o $@ org.xerial.snappy.SnappyNative
60-
61-
bytecode: src/main/resources/org/xerial/snappy/SnappyNativeLoader.bytecode
62-
63-
src/main/resources/org/xerial/snappy/SnappyNativeLoader.bytecode: src/main/resources/org/xerial/snappy/SnappyNativeLoader.java
64-
@mkdir -p $(TARGET)/temp
65-
$(JAVAC) -source 1.5 -target 1.5 -d $(TARGET)/temp $<
66-
cp $(TARGET)/temp/org/xerial/snappy/SnappyNativeLoader.class $@
58+
$(SRC)/org/xerial/snappy/SnappyNative.h: $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class
59+
$(JAVAH) -force -classpath $(TARGET)/classes -o $@ org.xerial.snappy.SnappyNative
6760

6861
ifndef USE_GIT
6962
$(SNAPPY_SRC): $(SNAPPY_UNPACKED)
@@ -110,6 +103,8 @@ $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME)
110103
cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME)
111104

112105

106+
package: $(TARGET)/$(snappy-jar-version).jar
107+
113108
$(TARGET)/$(snappy-jar-version).jar:
114109
$(SBT) package
115110

README.md

+4
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ If you are using Mac and openjdk7 (or higher), use the following option:
136136

137137
$ make native LIBNAME=libsnappyjava.dylib
138138

139+
## Running tests
140+
141+
$ make test
142+
139143
## Miscellaneous Notes
140144
### Using snappy-java with Tomcat 6 (or higher) Web Server
141145

Binary file not shown.

src/main/resources/org/xerial/snappy/SnappyNativeLoader.java

-59
This file was deleted.

0 commit comments

Comments
 (0)