From: Nick Burch <nick@apache.org>
Date: Tue, 31 Mar 2009 15:49:43 +0000 (+0000)
Subject: Ditch poi 2.0 jar in the ruby contrib, and make it pull the one from dist instead
X-Git-Tag: REL_3_5_BETA6~79
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0a0fdba2dc8f7a84c57709014954ac72fee91091;p=poi.git

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
---

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
Binary files a/src/contrib/poi-ruby/poi-2.0-final-20040126.jar and /dev/null differ