133 } else { |
133 } else { |
134 APP_BUNDLER.fetchFrom(params).validate(params); |
134 APP_BUNDLER.fetchFrom(params).validate(params); |
135 } |
135 } |
136 } |
136 } |
137 |
137 |
138 protected File prepareAppBundle(Map<String, ? super Object> p, |
138 protected File prepareAppBundle(Map<String, ? super Object> params, |
139 boolean pkg) throws PackagerException { |
139 boolean pkg) throws PackagerException { |
140 File predefinedImage = StandardBundlerParam.getPredefinedAppImage(p); |
140 File predefinedImage = |
|
141 StandardBundlerParam.getPredefinedAppImage(params); |
141 if (predefinedImage != null) { |
142 if (predefinedImage != null) { |
142 return predefinedImage; |
143 return predefinedImage; |
143 } |
144 } |
144 File appImageRoot = APP_IMAGE_TEMP_ROOT.fetchFrom(p); |
145 File appImageRoot = APP_IMAGE_TEMP_ROOT.fetchFrom(params); |
145 if (pkg) { |
146 if (pkg) { |
146 // create pkg in dmg |
147 // create pkg in dmg |
147 return new MacPkgBundler().bundle(p, appImageRoot); |
148 return new MacPkgBundler().bundle(params, appImageRoot); |
148 } else { |
149 } else { |
149 return APP_BUNDLER.fetchFrom(p).doBundle(p, appImageRoot, true); |
150 return APP_BUNDLER.fetchFrom(params).doBundle( |
|
151 params, appImageRoot, true); |
150 } |
152 } |
151 } |
153 } |
152 |
154 |
153 @Override |
155 @Override |
154 public Collection<BundlerParamInfo<?>> getBundleParameters() { |
156 public Collection<BundlerParamInfo<?>> getBundleParameters() { |