summaryrefslogtreecommitdiff
path: root/pdf-over-gui
diff options
context:
space:
mode:
Diffstat (limited to 'pdf-over-gui')
-rw-r--r--pdf-over-gui/.classpath2
-rw-r--r--pdf-over-gui/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--pdf-over-gui/pom.xml75
3 files changed, 47 insertions, 36 deletions
diff --git a/pdf-over-gui/.classpath b/pdf-over-gui/.classpath
index ffffea55..b1f1249d 100644
--- a/pdf-over-gui/.classpath
+++ b/pdf-over-gui/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
diff --git a/pdf-over-gui/.settings/org.eclipse.jdt.core.prefs b/pdf-over-gui/.settings/org.eclipse.jdt.core.prefs
index 26e5d21d..0e650d49 100644
--- a/pdf-over-gui/.settings/org.eclipse.jdt.core.prefs
+++ b/pdf-over-gui/.settings/org.eclipse.jdt.core.prefs
@@ -4,8 +4,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonN
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -99,7 +99,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,LOW
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,NOTE
diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index c6c33038..5493566f 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>pdf-over</artifactId>
@@ -167,6 +168,15 @@
<outputDirectory>${staging.dir}/lib-swt</outputDirectory>
<destFileName>swt-${target.name}-64.jar</destFileName>
</artifactItem>
+<!-- <artifactItem> -->
+<!-- <groupId>at.a-sit</groupId> -->
+<!-- <artifactId>pdf-over-install-helper</artifactId> -->
+<!-- <version>1.0.0</version> -->
+<!-- <type>jar</type> -->
+<!-- <overWrite>true</overWrite> -->
+<!-- <outputDirectory>${staging.dir}/lib</outputDirectory> -->
+<!-- <destFileName>pdf-over-install-helper-1.0.0.jar</destFileName> -->
+<!-- </artifactItem> -->
</artifactItems>
</configuration>
</execution>
@@ -288,7 +298,7 @@
<chdir>.</chdir>
<icon>src/main/resources/icons/icon.ico</icon>
<jre>
- <minVersion>1.6.0</minVersion>
+ <minVersion>1.7.0</minVersion>
</jre>
<versionInfo>
<fileVersion>${version.exe}</fileVersion>
@@ -322,7 +332,7 @@
<chdir>.</chdir>
<icon>src/main/resources/icons/icon.ico</icon>
<jre>
- <minVersion>1.6.0</minVersion>
+ <minVersion>1.7.0</minVersion>
</jre>
<versionInfo>
<fileVersion>${version.exe}</fileVersion>
@@ -418,78 +428,79 @@
<properties>
<izpack-standalone.version>4.3.5</izpack-standalone.version>
<project.maindir>${project.basedir}/..</project.maindir>
- <target.name>linux</target.name>
+ <target.name>windows</target.name>
<staging.dir>${project.build.directory}/staging/${target.name}</staging.dir>
<swt.version>4.3.2</swt.version>
</properties>
<profiles>
- <!--
- Note: Build system profile has to come first!
- Else it overwrites the chosen profile
- -->
+ <!-- Note: Build system profile has to come first! Else it overwrites the
+ chosen profile -->
<profile>
- <id>linux-64</id>
+ <id>windows-64</id>
<activation>
<os>
- <name>linux</name>
+ <family>windows</family>
<arch>amd64</arch>
</os>
</activation>
<properties>
- <swt.artifactId.32>org.eclipse.swt.gtk.linux.x86</swt.artifactId.32>
- <swt.artifactId.64>org.eclipse.swt.gtk.linux.x86_64</swt.artifactId.64>
+ <swt.artifactId.32>org.eclipse.swt.win32.win32.x86</swt.artifactId.32>
+ <swt.artifactId.64>org.eclipse.swt.win32.win32.x86_64</swt.artifactId.64>
<swt.artifactId>${swt.artifactId.64}</swt.artifactId>
- <target.name>linux</target.name>
+ <target.name>windows</target.name>
</properties>
</profile>
<profile>
- <id>linux</id>
+ <id>windows</id>
<activation>
<os>
- <name>linux</name>
+ <family>windows</family>
<arch>x86</arch>
</os>
</activation>
<properties>
- <swt.artifactId.32>org.eclipse.swt.gtk.linux.x86</swt.artifactId.32>
- <swt.artifactId.64>org.eclipse.swt.gtk.linux.x86_64</swt.artifactId.64>
+ <swt.artifactId.32>org.eclipse.swt.win32.win32.x86</swt.artifactId.32>
+ <swt.artifactId.64>org.eclipse.swt.win32.win32.x86_64</swt.artifactId.64>
<swt.artifactId>${swt.artifactId.32}</swt.artifactId>
- <target.name>linux</target.name>
+ <target.name>windows</target.name>
</properties>
</profile>
+
<profile>
- <id>windows</id>
+ <id>linux-64</id>
<activation>
<os>
- <family>windows</family>
- <arch>x86</arch>
+ <name>linux</name>
+ <arch>amd64</arch>
</os>
</activation>
<properties>
- <swt.artifactId.32>org.eclipse.swt.win32.win32.x86</swt.artifactId.32>
- <swt.artifactId.64>org.eclipse.swt.win32.win32.x86_64</swt.artifactId.64>
- <swt.artifactId>${swt.artifactId.32}</swt.artifactId>
- <target.name>windows</target.name>
+ <swt.artifactId.32>org.eclipse.swt.gtk.linux.x86</swt.artifactId.32>
+ <swt.artifactId.64>org.eclipse.swt.gtk.linux.x86_64</swt.artifactId.64>
+ <swt.artifactId>${swt.artifactId.64}</swt.artifactId>
+ <target.name>linux</target.name>
</properties>
</profile>
<profile>
- <id>windows-64</id>
+ <id>linux</id>
<activation>
<os>
- <family>windows</family>
- <arch>amd64</arch>
+ <name>linux</name>
+ <arch>x86</arch>
</os>
</activation>
<properties>
- <swt.artifactId.32>org.eclipse.swt.win32.win32.x86</swt.artifactId.32>
- <swt.artifactId.64>org.eclipse.swt.win32.win32.x86_64</swt.artifactId.64>
- <swt.artifactId>${swt.artifactId.64}</swt.artifactId>
- <target.name>windows</target.name>
+ <swt.artifactId.32>org.eclipse.swt.gtk.linux.x86</swt.artifactId.32>
+ <swt.artifactId.64>org.eclipse.swt.gtk.linux.x86_64</swt.artifactId.64>
+ <swt.artifactId>${swt.artifactId.32}</swt.artifactId>
+ <target.name>linux</target.name>
</properties>
</profile>
+
+
<profile>
<id>mac</id>
<activation>