src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
branchJDK-8200758-branch
changeset 57391 970f28090a06
parent 57390 1cb722a11ead
child 57397 89549ecec1c7
equal deleted inserted replaced
57390:1cb722a11ead 57391:970f28090a06
   155                 File configScript = getConfig_Script(params);
   155                 File configScript = getConfig_Script(params);
   156                 if (configScript.exists()) {
   156                 if (configScript.exists()) {
   157                     Log.verbose(MessageFormat.format(I18N.getString(
   157                     Log.verbose(MessageFormat.format(I18N.getString(
   158                             "message.running-script"),
   158                             "message.running-script"),
   159                             configScript.getAbsolutePath()));
   159                             configScript.getAbsolutePath()));
   160                     IOUtils.run("bash", configScript, false);
   160                     IOUtils.run("bash", configScript);
   161                 }
   161                 }
   162 
   162 
   163                 return createPKG(params, outdir, appImageDir);
   163                 return createPKG(params, outdir, appImageDir);
   164             }
   164             }
   165             return null;
   165             return null;
   411                     "--install-location",
   411                     "--install-location",
   412                     MAC_INSTALL_DIR.fetchFrom(params),
   412                     MAC_INSTALL_DIR.fetchFrom(params),
   413                     "--analyze",
   413                     "--analyze",
   414                     cpl.getAbsolutePath());
   414                     cpl.getAbsolutePath());
   415 
   415 
   416             IOUtils.exec(pb, false);
   416             IOUtils.exec(pb);
   417 
   417 
   418             patchCPLFile(cpl);
   418             patchCPLFile(cpl);
   419 
   419 
   420             preparePackageScripts(params);
   420             preparePackageScripts(params);
   421 
   421 
   428                     "--component-plist",
   428                     "--component-plist",
   429                     cpl.getAbsolutePath(),
   429                     cpl.getAbsolutePath(),
   430                     "--scripts",
   430                     "--scripts",
   431                     SCRIPTS_DIR.fetchFrom(params).getAbsolutePath(),
   431                     SCRIPTS_DIR.fetchFrom(params).getAbsolutePath(),
   432                     appPKG.getAbsolutePath());
   432                     appPKG.getAbsolutePath());
   433             IOUtils.exec(pb, false);
   433             IOUtils.exec(pb);
   434 
   434 
   435             // build final package
   435             // build final package
   436             File finalPKG = new File(outdir, INSTALLER_NAME.fetchFrom(params)
   436             File finalPKG = new File(outdir, INSTALLER_NAME.fetchFrom(params)
   437                     + INSTALLER_SUFFIX.fetchFrom(params)
   437                     + INSTALLER_SUFFIX.fetchFrom(params)
   438                     + ".pkg");
   438                     + ".pkg");
   475             commandLine.add(PACKAGES_ROOT.fetchFrom(params).getAbsolutePath());
   475             commandLine.add(PACKAGES_ROOT.fetchFrom(params).getAbsolutePath());
   476 
   476 
   477             commandLine.add(finalPKG.getAbsolutePath());
   477             commandLine.add(finalPKG.getAbsolutePath());
   478 
   478 
   479             pb = new ProcessBuilder(commandLine);
   479             pb = new ProcessBuilder(commandLine);
   480             IOUtils.exec(pb, false);
   480             IOUtils.exec(pb);
   481 
   481 
   482             return finalPKG;
   482             return finalPKG;
   483         } catch (Exception ignored) {
   483         } catch (Exception ignored) {
   484             Log.verbose(ignored);
   484             Log.verbose(ignored);
   485             return null;
   485             return null;