mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "java: Remove version number from the jar file (RHBZ#1022184)."

Browse Source 
This reverts commit 7330ccd288.

See comment in https://bugzilla.redhat.com/1022184
This commit is contained in:
Richard W.M. Jones
2013-10-22 17:56:11 +01:00
parent 7330ccd288
commit f59a404568
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/make-check-on-installed.pl
View File

@@ -97,7 +97,7 @@ my %mapping = (
'/guestfs/supermin.d/.*' => "appliance/supermin.d",
'/java/libguestfs\.jar$' => "java",
'/java/libguestfs-.*\.jar$' => "java",
'/libguestfs\.so.*' => "src/.libs",
'/libguestfs_jni\.so.*' => "java/.libs",

12
java/Makefile.am
View File

@@ -67,12 +67,12 @@ JAVADOC_FLAGS = -encoding utf-8
# Java source.
libguestfs_jardir = $(JAR_INSTALL_DIR)
libguestfs_jar_DATA = libguestfs.jar
libguestfs_jar_DATA = libguestfs-${VERSION}.jar
libguestfs_jar_class_files = $(java_sources:.java=.class)
$(libguestfs_jar_class_files): %.class: %.java
$(JAVAC) $(JAVAC_FLAGS) -d . -classpath $(srcdir):. $<
libguestfs.jar: $(libguestfs_jar_class_files)
libguestfs-${VERSION}.jar: $(libguestfs_jar_class_files)
$(JAR) cf $@ $^
# JNI source.
@@ -130,10 +130,10 @@ TESTS_ENVIRONMENT = $(top_builddir)/run --test
noinst_DATA = Bindtests.class $(java_tests:.java=.class)
t/%.class: t/%.java libguestfs.jar
$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs.jar -d t $<
t/%.class: t/%.java libguestfs-$(VERSION).jar
$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar -d t $<
Bindtests.class: Bindtests.java libguestfs.jar
$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs.jar -d . $<
Bindtests.class: Bindtests.java libguestfs-$(VERSION).jar
$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar -d . $<
endif

2
java/examples/Makefile.am
View File

@@ -50,6 +50,6 @@ noinst_SCRIPTS = CreateDisk.class InspectVM.class
JAVAC_FLAGS = $(EXTRA_JAVAC_FLAGS) -encoding utf-8
%.class: %.java
$(JAVAC) $(JAVAC_FLAGS) -classpath ../libguestfs.jar $<
$(JAVAC) $(JAVAC_FLAGS) -classpath ../libguestfs-$(VERSION).jar $<
endif

4
run.in
View File

@@ -142,9 +142,9 @@ export CAML_LD_LIBRARY_PATH
# For Java.
export JAVA_EXE=@JAVA_EXE@
if [ -z "$CLASSPATH" ]; then
CLASSPATH="$b/java:$b/java/t:$b/java/libguestfs.jar"
CLASSPATH="$b/java:$b/java/t:$b/java/libguestfs-@VERSION@.jar"
else
CLASSPATH="$b/java:$b/java/t:$b/java/libguestfs.jar:$CLASSPATH"
CLASSPATH="$b/java:$b/java/t:$b/java/libguestfs-@VERSION@.jar:$CLASSPATH"
fi
export CLASSPATH