harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r952356 - /harmony/enhanced/java/trunk/debian/rules
Date Mon, 07 Jun 2010 18:05:40 GMT
Author: hindessm
Date: Mon Jun  7 18:05:40 2010
New Revision: 952356

URL: http://svn.apache.org/viewvc?rev=952356&view=rev
Log:
Move src jars from harmony-5.0-classlib to harmony-5.0-jdk package.
Minor cleanup of obsolete workaround.

Modified:
    harmony/enhanced/java/trunk/debian/rules

Modified: harmony/enhanced/java/trunk/debian/rules
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/debian/rules?rev=952356&r1=952355&r2=952356&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/debian/rules (original)
+++ harmony/enhanced/java/trunk/debian/rules Mon Jun  7 18:05:40 2010
@@ -10,9 +10,7 @@
 # Modified to make a template file for a multi-binary package with separated
 # build-arch and build-indep targets  by Bill Allombert 2001
 
-# -lib /usr/share/java ensures that ant finds ecj.jar, etc
-ANT_FLAGS = -lib /usr/share/java \
-            -Dhy.local.zlib=true -Dhy.zip.api=false   \
+ANT_FLAGS = -Dhy.local.zlib=true -Dhy.zip.api=false   \
             -Dhy.no.thr=false -Dauto.fetch=true
 VMDIR=$(CURDIR)/debian/harmony-5.0-drlvm
 CLDIR=$(CURDIR)/debian/harmony-5.0-classlib
@@ -28,7 +26,7 @@ export DH_OPTIONS
 
 
 
-CFLAGS = -Wall -g
+CFLAGS = -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -104,6 +102,13 @@ install-arch:
 	-rm -rf $(CLDIR)/usr/lib/harmony-5.0/jdk/jre
 	mv $(CURDIR)/target/hdk/jdk/jre $(CLDIR)/usr/lib/harmony-5.0/jdk
 
+	# move *-src.jar back out so they end up in the jdk
+	mkdir -p $(CURDIR)/target/hdk/jdk/jre/lib/boot
+	mv $(CLDIR)/usr/lib/harmony-5.0/jdk/jre/lib/boot/*-src.jar \
+	   $(CURDIR)/target/hdk/jdk/jre/lib/boot
+	mv $(CLDIR)/usr/lib/harmony-5.0/jdk/jre/lib/*-src.jar \
+	   $(CURDIR)/target/hdk/jdk/jre/lib
+
 	mkdir -p $(JREDIR)/usr/lib/harmony-5.0/jdk/jre/bin
 	mv $(CLDIR)/usr/lib/harmony-5.0/jdk/jre/bin/java \
 	   $(JREDIR)/usr/lib/harmony-5.0/jdk/jre/bin



Mime
View raw message