harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r619373 - in /harmony/enhanced: common_resources/ common_resources/branches/ common_resources/build/ common_resources/make/ common_resources/tags/ common_resources/trunk/ common_resources/trunk/build/ common_resources/trunk/make/ trunk/ tru...
Date Thu, 07 Feb 2008 11:47:20 GMT
Author: hindessm
Date: Thu Feb  7 03:47:19 2008
New Revision: 619373

URL: http://svn.apache.org/viewvc?rev=619373&view=rev
Log:
Attempting to move common_resources to common_resources/trunk.

Added:
    harmony/enhanced/common_resources/branches/
    harmony/enhanced/common_resources/tags/
    harmony/enhanced/common_resources/trunk/
    harmony/enhanced/common_resources/trunk/build/
      - copied from r618921, harmony/enhanced/common_resources/build/
    harmony/enhanced/common_resources/trunk/build.xml
      - copied unchanged from r618921, harmony/enhanced/common_resources/build.xml
    harmony/enhanced/common_resources/trunk/make/
      - copied from r618921, harmony/enhanced/common_resources/make/
Removed:
    harmony/enhanced/common_resources/build/
    harmony/enhanced/common_resources/build.xml
    harmony/enhanced/common_resources/make/
Modified:
    harmony/enhanced/trunk/build.xml
    harmony/enhanced/trunk/debian/changelog
    harmony/enhanced/trunk/debian/rules

Modified: harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?rev=619373&r1=619372&r2=619373&view=diff
==============================================================================
--- harmony/enhanced/trunk/build.xml (original)
+++ harmony/enhanced/trunk/build.xml Thu Feb  7 03:47:19 2008
@@ -734,7 +734,7 @@
 
         <property name="vm.svn.url" value="${svn.root}/harmony/enhanced/drlvm/trunk" />
         <property name="jdktools.svn.url" value="${svn.root}/harmony/enhanced/jdktools/trunk"
/>
-        <property name="commonresources.svn.url" value="${svn.root}/harmony/enhanced/common_resources"
/>
+        <property name="commonresources.svn.url" value="${svn.root}/harmony/enhanced/common_resources/trunk"
/>
     </target>
 
     <target name="bundle_src_tgz" depends="init" if="is.unix">

Modified: harmony/enhanced/trunk/debian/changelog
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/changelog?rev=619373&r1=619372&r2=619373&view=diff
==============================================================================
--- harmony/enhanced/trunk/debian/changelog (original)
+++ harmony/enhanced/trunk/debian/changelog Thu Feb  7 03:47:19 2008
@@ -1,8 +1,8 @@
-harmony-5.0 (0.0r564155-1) unstable; urgency=low
+harmony-5.0 (0.0r580890-1) unstable; urgency=low
 
   * Fixing source package name.
 
- -- Mark Hindess <mark.hindess@googlemail.com>  Thu,  9 Aug 2007 10:31:18 +0100
+ -- Mark Hindess <mark.hindess@googlemail.com>  Mon,  1 Oct 2007 10:16:44 +0100
 
 harmony-5.0 (0.0r564139-1) unstable; urgency=low
 

Modified: harmony/enhanced/trunk/debian/rules
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/rules?rev=619373&r1=619372&r2=619373&view=diff
==============================================================================
--- harmony/enhanced/trunk/debian/rules (original)
+++ harmony/enhanced/trunk/debian/rules Thu Feb  7 03:47:19 2008
@@ -10,6 +10,8 @@
 # Modified to make a template file for a multi-binary package with separated
 # build-arch and build-indep targets  by Bill Allombert 2001
 
+ANT_FLAGS = -Dhy.no.sig=true -Duse.libstdc++6=true -Dhy.local.zlib=true \
+            -Dhy.zip.api=false -Dhy.no.thr=false -Dauto.fetch=true
 JREDIR=$(CURDIR)/debian/harmony-5.0-jre
 JDKDIR=$(CURDIR)/debian/harmony-5.0-jdk
 HDKDIR=$(CURDIR)/debian/harmony-5.0-hdk
@@ -44,7 +46,7 @@
 build-arch-stamp: configure-stamp 
 
 	# Add here commands to compile the arch part of the package.
-	ant -Dhy.no.sig=true -Duse.libstdc++6=true -Dhy.local.zlib=true
+	ant $(ANT_FLAGS)
 	touch $@
 
 build-indep: build-indep-stamp
@@ -60,7 +62,7 @@
 	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
 
 	# Add here commands to clean up after the build process.
-	ant -Dhy.no.sig=true -Duse.libstdc++6=true -Dhy.local.zlib=true clean
+	ant $(ANT_FLAGS) clean
 
 	dh_clean  --exclude ./working_classlib/modules/luni/src/main/native/fdlibm_dist/Makefile.orig
--exclude ./working_classlib/modules/luni/src/main/native/fdlibm_dist/fdlibm.h.orig --exclude
./working_classlib/modules/luni/src/main/native/fdlibm_dist/s_lib_version.c.orig --exclude
./working_classlib/modules/archive/src/main/native/zlib_dist/Makefile.orig
 



Mime
View raw message