equal
deleted
inserted
replaced
625 |
625 |
626 Map<String, ? super Object> localParams = new HashMap<>(params); |
626 Map<String, ? super Object> localParams = new HashMap<>(params); |
627 try { |
627 try { |
628 bundler.validate(localParams); |
628 bundler.validate(localParams); |
629 File result = bundler.execute(localParams, deployParams.outdir); |
629 File result = bundler.execute(localParams, deployParams.outdir); |
630 if (!userProvidedBuildRoot) { |
|
631 bundler.cleanup(localParams); |
|
632 } |
|
633 if (result == null) { |
630 if (result == null) { |
634 throw new PackagerException("MSG_BundlerFailed", |
631 throw new PackagerException("MSG_BundlerFailed", |
635 bundler.getID(), bundler.getName()); |
632 bundler.getID(), bundler.getName()); |
636 } |
633 } |
637 Log.verbose(MessageFormat.format( |
634 Log.verbose(MessageFormat.format( |
658 } finally { |
655 } finally { |
659 if (userProvidedBuildRoot) { |
656 if (userProvidedBuildRoot) { |
660 Log.verbose(MessageFormat.format( |
657 Log.verbose(MessageFormat.format( |
661 I18N.getString("message.debug-working-directory"), |
658 I18N.getString("message.debug-working-directory"), |
662 (new File(buildRoot)).getAbsolutePath())); |
659 (new File(buildRoot)).getAbsolutePath())); |
|
660 } else { |
|
661 // always clean up the temporary directory created |
|
662 // when --temp-root option not used. |
|
663 bundler.cleanup(localParams); |
663 } |
664 } |
664 } |
665 } |
665 } |
666 } |
666 |
667 |
667 private void addResources(DeployParams deployParams, |
668 private void addResources(DeployParams deployParams, |