From 804499501e428044734030d14bffaa62f8002984 Mon Sep 17 00:00:00 2001 From: Andreas Abraham Date: Fri, 23 Mar 2018 16:15:11 +0100 Subject: Code cleanup, Mac script changed --- installer/windows/PDF-Over-signed.aip | 155 +++++++++++---------- .../src/main/java/at/asit/pdfover/gui/Main.java | 13 -- pdf-over-gui/src/main/resources/izpack/install.xml | 13 +- .../src/main/resources/izpack/win_shortcutSpec.xml | 2 +- .../main/resources/izpack/win_shortcutSpec_deu.xml | 2 +- .../src/main/resources/scripts/pdf-over_linux.sh | 1 + .../src/main/resources/scripts/pdf-over_mac.sh | 1 + .../src/main/resources/scripts/pdf-over_win.bat | 1 + .../main/resources/scripts/postInstall_linux.sh | 4 +- .../src/main/resources/scripts/postInstall_win.bat | 3 +- pdf-over-install-helper/pom.xml | 39 ++++-- publish.sh | 2 +- 12 files changed, 122 insertions(+), 114 deletions(-) diff --git a/installer/windows/PDF-Over-signed.aip b/installer/windows/PDF-Over-signed.aip index c22a5154..7080e2be 100644 --- a/installer/windows/PDF-Over-signed.aip +++ b/installer/windows/PDF-Over-signed.aip @@ -1,7 +1,7 @@ - + @@ -9,16 +9,16 @@ - + - + - + @@ -26,77 +26,90 @@ - - + - - - - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -109,7 +122,7 @@ - + @@ -169,9 +182,6 @@ - - - @@ -189,9 +199,10 @@ + - + @@ -201,10 +212,11 @@ - - - + + + + @@ -226,11 +238,6 @@ - - - - - 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 9cf917bd..4e6df19a 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 @@ -45,17 +45,6 @@ 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$ try { File configDir = new File(Constants.CONFIG_DIRECTORY); @@ -70,8 +59,6 @@ public class Main { PropertyConfigurator.configureAndWatch(log4j.getAbsolutePath()); } - -// 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 40fcb820..03f6a56f 100644 --- a/pdf-over-gui/src/main/resources/izpack/install.xml +++ b/pdf-over-gui/src/main/resources/izpack/install.xml @@ -34,7 +34,6 @@ - @@ -65,8 +64,8 @@ - - + + - + - + diff --git a/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml b/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml index 72d4b271..48dfca76 100644 --- a/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml +++ b/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml @@ -11,7 +11,7 @@ applications="no" startMenu="no" startup="no" - target="$INSTALL_PATH/PDF-Over.exe" + target="$INSTALL_PATH/scripts/pdf-over_win.bat" commandLine="" workingDirectory="$INSTALL_PATH" description="PDF-Over 4.1" diff --git a/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec_deu.xml b/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec_deu.xml index 555874eb..26b1a640 100644 --- a/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec_deu.xml +++ b/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec_deu.xml @@ -11,7 +11,7 @@ applications="no" startMenu="no" startup="no" - target="$INSTALL_PATH/PDF-Over.exe" + target="$INSTALL_PATH/scripts/pdf-over_win.bat" commandLine="" workingDirectory="$INSTALL_PATH" description="PDF-Over 4.1" diff --git a/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh b/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh index 8ee31f2a..cbd8db16 100644 --- a/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh +++ b/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh @@ -1,3 +1,4 @@ #!/bin/sh BASEDIR=`dirname $0` +java -jar "$BASEDIR/../lib/pdf-over-install-helper-1.0.0.jar" exec java -cp "$BASEDIR/../lib/*" at.asit.pdfover.gui.Main "$@" diff --git a/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh b/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh index dcb805ae..3ad25c74 100644 --- a/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh +++ b/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh @@ -1,4 +1,5 @@ #!/bin/sh BASEDIR=$(cd "$(dirname "$0")"; pwd) export LC_CTYPE="UTF-8" +java -jar "$BASEDIR/../lib/pdf-over-install-helper-1.0.0.jar" exec java -XstartOnFirstThread -cp "$BASEDIR/../lib/*" at.asit.pdfover.gui.Main "$@" & diff --git a/pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat b/pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat index 6468e582..5597168b 100644 --- a/pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat +++ b/pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat @@ -1,2 +1,3 @@ @echo off +start /b javaw -jar "%~dp0\..\lib\pdf-over-install-helper-1.0.0.jar" start /b javaw -cp "%~dp0\..\lib\*" at.asit.pdfover.gui.Main %* diff --git a/pdf-over-gui/src/main/resources/scripts/postInstall_linux.sh b/pdf-over-gui/src/main/resources/scripts/postInstall_linux.sh index e7553a99..8c4b18a6 100644 --- a/pdf-over-gui/src/main/resources/scripts/postInstall_linux.sh +++ b/pdf-over-gui/src/main/resources/scripts/postInstall_linux.sh @@ -1,2 +1,4 @@ #!/bin/sh -exec java -jar ../lib/pdf-over-install-helper-1.0.0.jar +BASEDIR=`dirname $0` +java -jar "$BASEDIR/../lib/pdf-over-install-helper-1.0.0.jar" + diff --git a/pdf-over-gui/src/main/resources/scripts/postInstall_win.bat b/pdf-over-gui/src/main/resources/scripts/postInstall_win.bat index 419ae097..496bf419 100644 --- a/pdf-over-gui/src/main/resources/scripts/postInstall_win.bat +++ b/pdf-over-gui/src/main/resources/scripts/postInstall_win.bat @@ -1 +1,2 @@ -start /b java -jar ../lib/pdf-over-install-helper-1.0.0.jar +@echo off +java -jar "%~dp0\..\lib\pdf-over-install-helper-1.0.0.jar" diff --git a/pdf-over-install-helper/pom.xml b/pdf-over-install-helper/pom.xml index 5114e61e..80c9cde3 100644 --- a/pdf-over-install-helper/pom.xml +++ b/pdf-over-install-helper/pom.xml @@ -1,4 +1,5 @@ - 4.0.0 @@ -6,6 +7,7 @@ pdf-over 4.1.17-SNAPSHOT + pdf-over-install-helper 1.0.0 @@ -13,6 +15,7 @@ commons-io commons-io + @@ -35,25 +38,31 @@ - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - prepare-package - - copy-dependencies - - - - - + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + prepare-package + + copy-dependencies + + + + ${project.build.directory} + + + + + + org.apache.maven.plugins maven-jar-plugin + false - true + true at.asit.helper.Main diff --git a/publish.sh b/publish.sh index e08e28c2..c365b868 100755 --- a/publish.sh +++ b/publish.sh @@ -1,7 +1,7 @@ #!/bin/bash #### CONFIGURE: ###### -PUBLISH_DIR="/home/andreas/Documents/pdf-over-build" +PUBLISH_DIR="C:\Users\aabraham\eclipse-workspace-pdf-over\pdf-over\pdf-over-build" LOG_DIR="log" CODEBASE_URL="http:\/\/abyss.iaik.tugraz.at\/pdf-over\/" CONTEXT_URL="http:\/\/abyss.iaik.tugraz.at\/pdf-over\/" -- cgit v1.2.3