[Aplaws-commit] r731 - tools/trunk/scripts/bin

[<ssk...@vh...>]

Author: sskracic
Date: 2005-08-29 14:18:20 +0200 (Mon, 29 Aug 2005)
New Revision: 731

Modified:
   tools/trunk/scripts/bin/make-zip
Log:
  Preserve existing ANT_OPTS, if exist.


Modified: tools/trunk/scripts/bin/make-zip
===================================================================
--- tools/trunk/scripts/bin/make-zip	2005-08-29 05:26:15 UTC (rev 730)
+++ tools/trunk/scripts/bin/make-zip	2005-08-29 12:18:20 UTC (rev 731)
@@ -108,7 +108,7 @@
     my $build_root = shift;
     if (defined $build_root) {
         my $tmp_exists = -d File::Spec->catdir($build_root,'tmp');
-        my $ant_opts="-Dapps.$ccm_app.version=$ccm_pkgversion";
+        my $ant_opts="$ENV{'ANT_OPTS'} -Dapps.$ccm_app.version=$ccm_pkgversion";
         $ant_opts="$ant_opts -Ddeploy.conf.dir=" . File::Spec->catdir($build_root,'usr','share','ccm','conf');
         $ant_opts="$ant_opts -Ddeploy.shared.lib.dir=" . File::Spec->catdir($build_root,'usr','share','java');
         $ant_opts="$ant_opts -Ddeploy.private.lib.dir=" . File::Spec->catdir($build_root,'usr','share','java',"$ccm_package-$ccm_pkgversion");