aboutsummaryrefslogtreecommitdiffstats
path: root/src/contrib
diff options
context:
space:
mode:
authorNick Burch <nick@apache.org>2009-03-31 15:49:43 +0000
committerNick Burch <nick@apache.org>2009-03-31 15:49:43 +0000
commit0a0fdba2dc8f7a84c57709014954ac72fee91091 (patch)
treee5aea382eede3468924876af5c8c8fdfbd4a7af0 /src/contrib
parent2d91c7b31fe70b5857abd2ce19a10974028f23a5 (diff)
downloadpoi-0a0fdba2dc8f7a84c57709014954ac72fee91091.tar.gz
poi-0a0fdba2dc8f7a84c57709014954ac72fee91091.zip
Ditch poi 2.0 jar in the ruby contrib, and make it pull the one from dist instead
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@760494 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/contrib')
-rw-r--r--src/contrib/poi-ruby/Makefile7
-rw-r--r--src/contrib/poi-ruby/poi-2.0-final-20040126.jarbin616597 -> 0 bytes
2 files changed, 4 insertions, 3 deletions
diff --git a/src/contrib/poi-ruby/Makefile b/src/contrib/poi-ruby/Makefile
index 887ee7b3ee..2c2bfa8608 100644
--- a/src/contrib/poi-ruby/Makefile
+++ b/src/contrib/poi-ruby/Makefile
@@ -23,7 +23,7 @@
#
VERSION=0.1.0
-POI_VER=2.0-final-20040126
+POI_VER=$(shell grep '<property name="version.id"' ../../../build.xml | awk -F'"' '{print $$4}')
RUBY_VER=1.8
POI4R:=$(shell pwd)
@@ -148,6 +148,7 @@ JCCH=$(GCJ_HOME)/bin/gcjh
JAR=$(GCJ_HOME)/bin/jar
POI_ZIP=poi-$(POI_VER).jar
POI_JAR=poi-$(POI_VER).jar
+POI_JAR_WC=poi-$(POI_VER)-*.jar
POI4R_CP:=$(BINDIR)/$(POI_JAR):$(CLASSES)
@@ -188,8 +189,8 @@ _poi=$(POI)
endif
$(BINDIR)/$(POI_JAR):
- cp $(POI4R)/$(POI_JAR) $(BINDIR)/$(POI_JAR)
- cd $(JAR_CLASSES); $(JAR) -xf $(POI4R)/$(POI_JAR)
+ cp ../../../build/dist/$(POI_JAR_WC) $(BINDIR)/$(POI_JAR)
+ cd $(JAR_CLASSES); $(JAR) -xf ../../$(POI_JAR)
$(BINDIR)/io.java.o: java/org/apache/poi/RubyOutputStream.java
$(JCC) $(JCCFLAGS) -C -d $(CLASSES) java/org/apache/poi/RubyOutputStream.java
diff --git a/src/contrib/poi-ruby/poi-2.0-final-20040126.jar b/src/contrib/poi-ruby/poi-2.0-final-20040126.jar
deleted file mode 100644
index 3803a9304c..0000000000
--- a/src/contrib/poi-ruby/poi-2.0-final-20040126.jar
+++ /dev/null
Binary files differ