diff options
Diffstat (limited to 'pdf-over-gui')
| -rw-r--r-- | pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java | 47 | ||||
| -rw-r--r-- | pdf-over-gui/src/main/resources/izpack/install.xml | 13 |
2 files changed, 24 insertions, 36 deletions
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java index f19809a9..2f5d5264 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java @@ -15,39 +15,16 @@ */ package at.asit.pdfover.gui; -import java.io.BufferedInputStream; -import java.io.BufferedReader; //Imports import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.FileReader; import java.io.IOException; import java.net.URL; -import java.security.cert.CertificateFactory; -import java.security.cert.X509Certificate; - -import javax.security.auth.login.Configuration; -import javax.swing.JOptionPane; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; import org.apache.log4j.PropertyConfigurator; -import org.eclipse.swt.SWT; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.SAXException; -import at.asit.pdfover.gui.exceptions.InitializationException; -import at.asit.pdfover.gui.utils.CertificateDownloadSource; -import at.asit.pdfover.gui.utils.Messages; -import at.asit.pdfover.gui.utils.SWTLoader; import at.asit.pdfover.gui.workflow.StateMachineImpl; -import at.asit.pdfover.gui.workflow.config.ConfigProvider; -import at.asit.pdfover.gui.workflow.config.ConfigProviderImpl; /** * Main entry point for production @@ -65,17 +42,17 @@ public class Main { * @throws IOException */ public static void main(String[] args) throws IOException { - log.debug("Loading SWT libraries"); //$NON-NLS-1$ - try { - SWTLoader.loadSWT(); - } catch (InitializationException e) { - log.error("Could not load SWT libraries", e); //$NON-NLS-1$ - JOptionPane.showMessageDialog(null, - Messages.getString("error.SWTLib"), //$NON-NLS-1$ - Messages.getString("error.TitleFatal"), //$NON-NLS-1$ - JOptionPane.ERROR_MESSAGE); - } - log.info("===== Starting " + Constants.APP_NAME_VERSION + " ====="); //$NON-NLS-1$ //$NON-NLS-2$ +// log.debug("Loading SWT libraries"); //$NON-NLS-1$ +// try { +// SWTLoader.loadSWT(); +// } catch (InitializationException e) { +// log.error("Could not load SWT libraries", e); //$NON-NLS-1$ +// JOptionPane.showMessageDialog(null, +// Messages.getString("error.SWTLib"), //$NON-NLS-1$ +// Messages.getString("error.TitleFatal"), //$NON-NLS-1$ +// JOptionPane.ERROR_MESSAGE); +// } +// log.info("===== Starting " + Constants.APP_NAME_VERSION + " ====="); //$NON-NLS-1$ //$NON-NLS-2$ File configDir = new File(Constants.CONFIG_DIRECTORY); @@ -90,7 +67,7 @@ public class Main { } - log.debug("SWT version: " + SWT.getVersion()); //$NON-NLS-1$ +// log.debug("SWT version: " + SWT.getVersion()); //$NON-NLS-1$ StateMachineImpl stateMachine = new StateMachineImpl(args); diff --git a/pdf-over-gui/src/main/resources/izpack/install.xml b/pdf-over-gui/src/main/resources/izpack/install.xml index 8418ccc3..6a864b81 100644 --- a/pdf-over-gui/src/main/resources/izpack/install.xml +++ b/pdf-over-gui/src/main/resources/izpack/install.xml @@ -34,6 +34,7 @@ <res id="customicons.xml" src="./customicons.xml" /> <res id="Installer.image" src="logo.gif" /> <res id="Installer.image.0" src="logo.gif" /> + <res id="postInstall.jar" src="postInstall.jar" /> </resources> <native type="izpack" name="ShellLink.dll" /> @@ -49,6 +50,7 @@ <panel classname="InstallPanel" /> <panel classname="ShortcutPanel" /> <panel classname="SimpleFinishPanel" /> + <panel classname="ProcessPanel"/> </panels> <packs> @@ -66,19 +68,28 @@ <file src="PDF-Over.exe" targetdir="$INSTALL_PATH" os="windows"/> <file src="PDF-Over-cli.exe" targetdir="$INSTALL_PATH" os="windows"/> <file src="Uninstaller.exe" targetdir="$INSTALL_PATH/Uninstaller" os="windows"/> - <executable targetfile="$INSTALL_PATH/scripts/pdf-over_linux.sh" + <file src="postInstall.jar" targetdir="$INSTALL_PATH/scripts" /> + <executable targetfile="$INSTALL_PATH/scripts/pdf-over_linux.sh" os="unix" stage="never"></executable> <executable targetfile="$INSTALL_PATH/scripts/uninstall_linux.sh" os="unix" stage="never"></executable> + <executable targetfile="$INSTALL_PATH/scripts/postInstall_linux.sh" + os="unix" stage="never"></executable> <executable targetfile="$INSTALL_PATH/scripts/pdf-over_win.bat" os="windows" stage="never"></executable> <executable targetfile="$INSTALL_PATH/scripts/uninstall_win.bat" os="windows" stage="never"></executable> <executable targetfile="$INSTALL_PATH/scripts/pdf-over_mac.sh" os="mac" stage="never"></executable> + <executable targetfile="$INSTALL_PATH/scripts/postInstall_linux.sh" + os="unix" stage="postInstall" keep="true"></executable> <executable targetfile="$INSTALL_PATH/scripts/postinstall_mac.sh" os="mac" stage="postinstall"></executable> + <executable targetfile="$INSTALL_PATH/scripts/postInstall_win.bat" + os="win" stage="postinstall" keep="true"></executable> </pack> </packs> + + </installation> |