-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #134 from shannah/dedicated-jre
Dedicated jre for Java8 on windows
- Loading branch information
Showing
35 changed files
with
1,154 additions
and
255 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,3 +12,4 @@ installer/jdeploy-bundle | |
| cli/bin | ||
| tests/projects/*/jdeploy | ||
| ./jdeploy | ||
| #./installer/tests/*/mock_launcher* | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
installer/src/main/java/ca/weblite/jdeploy/installer/HeadlessInstallationSettings.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package ca.weblite.jdeploy.installer; | ||
|
|
||
| import ca.weblite.jdeploy.installer.models.InstallationSettings; | ||
|
|
||
| public class HeadlessInstallationSettings extends InstallationSettings { | ||
|
|
||
| } |
307 changes: 72 additions & 235 deletions
307
installer/src/main/java/ca/weblite/jdeploy/installer/Main.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
250 changes: 250 additions & 0 deletions
250
installer/src/main/java/ca/weblite/jdeploy/installer/win/InstallWindows.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,250 @@ | ||
| package ca.weblite.jdeploy.installer.win; | ||
|
|
||
| import ca.weblite.jdeploy.app.AppInfo; | ||
| import ca.weblite.jdeploy.installer.InstallationContext; | ||
| import ca.weblite.jdeploy.installer.Main; | ||
| import ca.weblite.jdeploy.installer.models.InstallationSettings; | ||
| import ca.weblite.tools.io.FileUtil; | ||
| import com.izforge.izpack.util.os.ShellLink; | ||
| import net.coobird.thumbnailator.Thumbnails; | ||
| import net.sf.image4j.codec.ico.ICOEncoder; | ||
| import org.apache.commons.io.FileUtils; | ||
|
|
||
| import java.awt.image.BufferedImage; | ||
| import java.io.File; | ||
| import java.io.FileOutputStream; | ||
| import java.io.IOException; | ||
| import java.nio.file.Files; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import static ca.weblite.tools.io.IOUtil.copyResourceToFile; | ||
|
|
||
| public class InstallWindows { | ||
|
|
||
| public File install( | ||
| InstallationContext context, | ||
| InstallationSettings installationSettings, | ||
| String fullyQualifiedPackageName, | ||
| File tmpBundles | ||
| ) throws Exception { | ||
| AppInfo appInfo = installationSettings.getAppInfo(); | ||
| File tmpExePath = findTmpExeFile(tmpBundles); | ||
| File appXmlFile = context.findAppXml(); | ||
| File userHome = new File(System.getProperty("user.home")); | ||
| File jdeployHome = new File(userHome, ".jdeploy"); | ||
| File appsDir = new File(jdeployHome, "apps"); | ||
| File appDir = new File(appsDir, fullyQualifiedPackageName); | ||
| appDir.mkdirs(); | ||
| String nameSuffix = ""; | ||
|
|
||
| if (appInfo.getNpmVersion().startsWith("0.0.0-")) { | ||
| nameSuffix = " " + | ||
| appInfo.getNpmVersion().substring(appInfo.getNpmVersion().indexOf("-") + 1) | ||
| .trim(); | ||
| } | ||
|
|
||
| String exeName = appInfo.getTitle() + nameSuffix + ".exe"; | ||
| File exePath = new File(appDir, exeName); | ||
| if (appInfo.isUsePrivateJVM()) { | ||
| File appBinDir = new File(appDir, "bin"); | ||
| appBinDir.mkdirs(); | ||
| exePath = new File(appBinDir, exeName); | ||
| } | ||
|
|
||
| FileUtil.copy(tmpExePath, exePath); | ||
| exePath.setExecutable(true, false); | ||
|
|
||
| // Copy the icon.png if it is present | ||
| File bundleIcon = new File(appXmlFile.getParentFile(), "icon.png"); | ||
| File iconPath = new File(appDir, "icon.png"); | ||
| File icoPath = new File(appDir, "icon.ico"); | ||
|
|
||
| if (Files.exists(bundleIcon.toPath())) { | ||
| FileUtil.copy(bundleIcon, iconPath); | ||
| } | ||
| installWindowsLinks( | ||
| appInfo, | ||
| installationSettings, | ||
| exePath, | ||
| appDir, | ||
| appInfo.getTitle() + nameSuffix | ||
| ); | ||
|
|
||
| File registryBackupLogs = new File(appDir, "registry-backup-logs"); | ||
|
|
||
| if (!registryBackupLogs.exists()) { | ||
| registryBackupLogs.mkdirs(); | ||
| } | ||
| int nextLogIndex = 0; | ||
| for (File child : registryBackupLogs.listFiles()) { | ||
| if (child.getName().endsWith(".reg")) { | ||
| String logIndex = child.getName().substring(0, child.getName().lastIndexOf(".")); | ||
| try { | ||
| int logIndexInt = Integer.parseInt(logIndex); | ||
| if (logIndexInt >= nextLogIndex) { | ||
| nextLogIndex = logIndexInt+1; | ||
| } | ||
| } catch (Exception ex) {} | ||
| } | ||
| } | ||
| File registryBackupLog = new File(registryBackupLogs, nextLogIndex+".reg"); | ||
| try (FileOutputStream fos = new FileOutputStream(registryBackupLog)) { | ||
| InstallWindowsRegistry registryInstaller = new InstallWindowsRegistry(appInfo, exePath, icoPath, fos); | ||
| registryInstaller.register(); | ||
|
|
||
| //Try to copy the uninstaller | ||
| File uninstallerPath = registryInstaller.getUninstallerPath(); | ||
| uninstallerPath.getParentFile().mkdirs(); | ||
| File installerExePath = new File(System.getProperty("client4j.launcher.path")); | ||
| if (uninstallerPath.exists()) { | ||
| if (!uninstallerPath.canWrite()) { | ||
| uninstallerPath.setWritable(true, false); | ||
| try { | ||
| // Give windows time to update its cache | ||
| Thread.sleep(1000L); | ||
| } catch (InterruptedException interruptedException) { | ||
| // Ignore | ||
| } | ||
| } | ||
| if (!uninstallerPath.delete()) { | ||
| throw new IOException("Failed to delete uninstaller: "+uninstallerPath); | ||
| } | ||
|
|
||
| try { | ||
| // Give Windows time to update its cache | ||
| Thread.sleep(1000L); | ||
| } catch (InterruptedException interruptedException) { | ||
| // Ignore | ||
| } | ||
| } | ||
| FileUtils.copyFile(installerExePath, uninstallerPath); | ||
| uninstallerPath.setExecutable(true, false); | ||
| FileUtils.copyDirectory( | ||
| context.findInstallFilesDir(), | ||
| new File( | ||
| uninstallerPath.getParentFile(), | ||
| context.findInstallFilesDir().getName() | ||
| ) | ||
| ); | ||
|
|
||
| return exePath; | ||
|
|
||
| } catch (Exception ex) { | ||
| // restore | ||
| try { | ||
| InstallWindowsRegistry.rollback(registryBackupLog); | ||
| } catch (Exception rollbackException) { | ||
| throw new RuntimeException( | ||
| "Failed to roll back registry after failed installation.", | ||
| rollbackException | ||
| ); | ||
| } | ||
| // Since we rolled back the changes, we'll delete the backup log so that it doesn't get rolled back again. | ||
| registryBackupLog.delete(); | ||
| ex.printStackTrace(System.err); | ||
| throw new RuntimeException("Failed to update registry. Rolling back changes.", ex); | ||
|
|
||
| } | ||
| } | ||
|
|
||
| private void installWindowsLink( | ||
| AppInfo appInfo, | ||
| int type, | ||
| File exePath, | ||
| File iconPath, | ||
| String appTitle | ||
| ) throws Exception { | ||
| ShellLink link = new ShellLink(type, appTitle); | ||
| link.setUserType(ShellLink.CURRENT_USER); | ||
| if (appInfo.getDescription() == null) { | ||
| link.setDescription("Windows application"); | ||
| } else { | ||
| link.setDescription(appInfo.getDescription()); | ||
| } | ||
| String iconPathString = iconPath.getCanonicalFile().getAbsolutePath(); | ||
| link.setIconLocation(iconPathString, 0); | ||
| String exePathString = exePath.getCanonicalFile().getAbsolutePath(); | ||
| link.setTargetPath(exePathString); | ||
| link.save(); | ||
| } | ||
|
|
||
| private void installWindowsLinks( | ||
| AppInfo appInfo, | ||
| InstallationSettings installationSettings, | ||
| File exePath, | ||
| File appDir, | ||
| String appTitle | ||
| ) throws Exception { | ||
| File pngIconPath = new File(appDir, "icon.png"); | ||
| File icoPath = new File(appDir.getCanonicalFile(), "icon.ico"); | ||
|
|
||
| if (!Files.exists(pngIconPath.toPath())) { | ||
| copyResourceToFile(Main.class, "icon.png", pngIconPath); | ||
| } | ||
| if (!Files.exists(pngIconPath.toPath())) { | ||
| throw new IOException("Failed to create the .ico file for some reason. "+icoPath); | ||
| } | ||
| convertWindowsIcon(pngIconPath.getCanonicalFile(), icoPath); | ||
|
|
||
|
|
||
| if (installationSettings.isAddToDesktop()) { | ||
| try { | ||
| installWindowsLink(appInfo, ShellLink.DESKTOP, exePath, icoPath, appTitle); | ||
| } catch (Exception ex) { | ||
| throw new RuntimeException("Failed to install desktop shortcut", ex); | ||
|
|
||
| } | ||
| } | ||
| if (installationSettings.isAddToPrograms()) { | ||
| try { | ||
| installWindowsLink(appInfo, ShellLink.PROGRAM_MENU, exePath, icoPath, appTitle); | ||
| } catch (Exception ex) { | ||
| throw new RuntimeException("Failed to install program menu shortcut", ex); | ||
|
|
||
| } | ||
| } | ||
| if (installationSettings.isAddToStartMenu()) { | ||
| try { | ||
| installWindowsLink(appInfo, ShellLink.START_MENU, exePath, icoPath, appTitle); | ||
| } catch (Exception ex) { | ||
| throw new RuntimeException("Failed to install start menu shortcut", ex); | ||
|
|
||
| } | ||
| } | ||
| } | ||
|
|
||
| private void convertWindowsIcon(File srcPng, File destIco) throws IOException { | ||
| List<BufferedImage> images = new ArrayList<>(); | ||
| List<Integer> bppList = new ArrayList<>(); | ||
| for (int i : new int[]{16, 24, 32, 48, 64, 128, 256}) { | ||
| BufferedImage img = Thumbnails.of(srcPng).size(i, i).asBufferedImage(); | ||
| images.add(img); | ||
| bppList.add(32); | ||
| if (i <= 48) { | ||
| images.add(img); | ||
| bppList.add(8); | ||
| images.add(img); | ||
| bppList.add(4); | ||
| } | ||
| } | ||
| int[] bppArray = bppList.stream().mapToInt(i->i).toArray(); | ||
| try (FileOutputStream fileOutputStream = new FileOutputStream(destIco)) { | ||
| ICOEncoder.write(images,bppArray, fileOutputStream); | ||
| } | ||
| } | ||
|
|
||
| private File findTmpExeFile(File tmpBundles) { | ||
| File tmpExePath = null; | ||
| for (File exeCandidate : new File(tmpBundles, "windows").listFiles()) { | ||
| if (exeCandidate.getName().endsWith(".exe")) { | ||
| tmpExePath = exeCandidate; | ||
| } | ||
| } | ||
| if (tmpExePath == null) { | ||
| throw new RuntimeException("Failed to find exe file after creation. Something must have gone wrong in generation process"); | ||
| } | ||
|
|
||
| return tmpExePath; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.