Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Uploader
Commits
e2867392
Commit
e2867392
authored
Sep 06, 2020
by
Matija Obreza
Browse files
Eclipse SWT artifacts from Maven central
- Added comments for running the app on Linux
parent
958e3be5
Changes
10
Hide whitespace changes
Inline
Side-by-side
anno-gui-macosx/pom.xml
View file @
e2867392
...
...
@@ -15,9 +15,15 @@
<version>
2.0-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.
swt
</groupId>
<groupId>
org.eclipse.
platform
</groupId>
<artifactId>
org.eclipse.swt.cocoa.macosx.x86_64
</artifactId>
<version>
4.3
</version>
<version>
3.114.100
</version>
<exclusions>
<exclusion>
<groupId>
org.eclipse.platform
</groupId>
<artifactId>
org.eclipse.swt
</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
...
...
anno-gui-package/bin/Genesys Magic 32.exe
deleted
100644 → 0
View file @
958e3be5
File deleted
anno-gui-package/bin/assembly-linux-gtk32.xml
deleted
100644 → 0
View file @
958e3be5
<assembly
xmlns=
"http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"
>
<id>
linux-gtk-x86
</id>
<formats>
<format>
zip
</format>
</formats>
<baseDirectory>
${project.build.finalName}-i386
</baseDirectory>
<files>
<file>
<source>
bin/genesysmagic.sh
</source>
<destName>
genesysmagic.sh
</destName>
<fileMode>
0755
</fileMode>
</file>
</files>
<dependencySets>
<dependencySet>
<outputDirectory>
/lib
</outputDirectory>
<useProjectArtifact>
true
</useProjectArtifact>
<unpack>
false
</unpack>
<scope>
runtime
</scope>
<excludes>
<exclude>
org.eclipse.swt:org.eclipse.swt.win32.win32.x86:jar:4.3
</exclude>
<exclude>
org.eclipse.swt:org.eclipse.swt.win32.win32.x86_64:jar:4.3
</exclude>
<exclude>
org.eclipse.swt:org.eclipse.swt.gtk.linux.x86_64:jar:4.3
</exclude>
</excludes>
</dependencySet>
</dependencySets>
</assembly>
anno-gui-package/bin/assembly-linux-gtk64.xml
View file @
e2867392
...
...
@@ -21,9 +21,7 @@
<unpack>
false
</unpack>
<scope>
runtime
</scope>
<excludes>
<exclude>
org.eclipse.swt:org.eclipse.swt.win32.win32.x86:jar:4.3
</exclude>
<exclude>
org.eclipse.swt:org.eclipse.swt.win32.win32.x86_64:jar:4.3
</exclude>
<exclude>
org.eclipse.swt:org.eclipse.swt.gtk.linux.x86:jar:4.3
</exclude>
<exclude>
org.eclipse.platform:org.eclipse.swt.win32.win32.x86_64:jar:4.3
</exclude>
</excludes>
</dependencySet>
</dependencySets>
...
...
anno-gui-package/bin/assembly-win32.xml
deleted
100644 → 0
View file @
958e3be5
<assembly
xmlns=
"http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"
>
<id>
win-x86
</id>
<formats>
<format>
zip
</format>
</formats>
<baseDirectory>
${project.build.finalName}-i386
</baseDirectory>
<files>
<file>
<source>
bin/Genesys Magic 32.exe
</source>
<destName>
Genesys Magic.exe
</destName>
<fileMode>
0777
</fileMode>
</file>
<file>
<source>
bin/Genesys Magic.ini
</source>
<fileMode>
0444
</fileMode>
</file>
</files>
<dependencySets>
<dependencySet>
<outputDirectory>
/lib
</outputDirectory>
<useProjectArtifact>
true
</useProjectArtifact>
<unpack>
false
</unpack>
<scope>
runtime
</scope>
<excludes>
<exclude>
org.eclipse.swt:org.eclipse.swt.win32.win32.x86_64:jar:4.3
</exclude>
<exclude>
org.eclipse.swt:org.eclipse.swt.gtk.linux.x86:jar:4.3
</exclude>
<exclude>
org.eclipse.swt:org.eclipse.swt.gtk.linux.x86_64:jar:4.3
</exclude>
</excludes>
</dependencySet>
</dependencySets>
</assembly>
anno-gui-package/bin/assembly-win64.xml
View file @
e2867392
...
...
@@ -25,9 +25,7 @@
<unpack>
false
</unpack>
<scope>
runtime
</scope>
<excludes>
<exclude>
org.eclipse.swt:org.eclipse.swt.win32.win32.x86:jar:4.3
</exclude>
<exclude>
org.eclipse.swt:org.eclipse.swt.gtk.linux.x86:jar:4.3
</exclude>
<exclude>
org.eclipse.swt:org.eclipse.swt.gtk.linux.x86_64:jar:4.3
</exclude>
<exclude>
org.eclipse.platform:org.eclipse.swt.gtk.linux.x86_64:jar:4.3
</exclude>
</excludes>
</dependencySet>
</dependencySets>
...
...
anno-gui-package/pom.xml
View file @
e2867392
...
...
@@ -13,9 +13,7 @@
<version>
2.4
</version>
<configuration>
<descriptors>
<descriptor>
bin/assembly-win32.xml
</descriptor>
<descriptor>
bin/assembly-win64.xml
</descriptor>
<descriptor>
bin/assembly-linux-gtk32.xml
</descriptor>
<descriptor>
bin/assembly-linux-gtk64.xml
</descriptor>
</descriptors>
<archive>
...
...
@@ -36,15 +34,7 @@
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>
thirdparty
</id>
<name>
3rd Party Eclipse
</name>
<url>
http://maven.thingml.org/thirdparty/
</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>
org.genesys-pgr
</groupId>
...
...
@@ -52,24 +42,26 @@
<version>
2.0-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.swt
</groupId>
<artifactId>
org.eclipse.swt.win32.win32.x86
</artifactId>
<version>
4.3
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.swt
</groupId>
<groupId>
org.eclipse.platform
</groupId>
<artifactId>
org.eclipse.swt.win32.win32.x86_64
</artifactId>
<version>
4.3
</version>
<version>
3.114.100
</version>
<exclusions>
<exclusion>
<groupId>
org.eclipse.platform
</groupId>
<artifactId>
org.eclipse.swt
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
org.eclipse.
swt
</groupId>
<groupId>
org.eclipse.
platform
</groupId>
<artifactId>
org.eclipse.swt.gtk.linux.x86_64
</artifactId>
<version>
4.3
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.swt
</groupId>
<artifactId>
org.eclipse.swt.gtk.linux.x86
</artifactId>
<version>
4.3
</version>
<version>
3.114.100
</version>
<exclusions>
<exclusion>
<groupId>
org.eclipse.platform
</groupId>
<artifactId>
org.eclipse.swt
</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<name>
Anno for Windows, Linux
</name>
...
...
anno-gui/pom.xml
View file @
e2867392
...
...
@@ -15,13 +15,12 @@
<repositories>
<repository>
<id>
my-local-repo
</id>
<url>
file://${basedir}/lib
</url>
<id>
central
</id>
<url>
https://repo.maven.apache.org/maven2
</url>
</repository>
<repository>
<id>
thingml
</id>
<name>
3rd Party Eclipse
</name>
<url>
http://maven.thingml.org/thirdparty/
</url>
<id>
my-local-repo
</id>
<url>
file://${basedir}/lib
</url>
</repository>
</repositories>
...
...
@@ -52,24 +51,6 @@
<artifactId>
commons-lang3
</artifactId>
<version>
3.3.2
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.swt
</groupId>
<artifactId>
swing2swt
</artifactId>
<version>
1.0
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.swt
</groupId>
<artifactId>
org.eclipse.swt.cocoa.macosx.x86_64
</artifactId>
<version>
4.3
</version>
<scope>
provided
</scope>
</dependency>
<dependency>
<groupId>
org.eclipse.swt.gtk.linux
</groupId>
<artifactId>
x86_64
</artifactId>
<version>
3.3.0-v3346
</version>
<scope>
provided
</scope>
</dependency>
<dependency>
<groupId>
net.sf.supercsv
</groupId>
<artifactId>
super-csv
</artifactId>
...
...
@@ -80,53 +61,6 @@
<artifactId>
commons-io
</artifactId>
<version>
1.3.2
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.maven
</groupId>
<artifactId>
org.eclipse.core.databinding.beans
</artifactId>
<version>
3.8.0
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.maven
</groupId>
<artifactId>
org.eclipse.core.databinding
</artifactId>
<version>
3.8.0
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.maven
</groupId>
<artifactId>
org.eclipse.core.databinding.observable
</artifactId>
<version>
3.8.0
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.maven
</groupId>
<artifactId>
org.eclipse.core.databinding.property
</artifactId>
<version>
3.8.0
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.maven
</groupId>
<artifactId>
org.eclipse.jface.databinding
</artifactId>
<version>
3.8.0
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.maven
</groupId>
<artifactId>
org.eclipse.equinox.common
</artifactId>
<version>
3.8.0
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.maven
</groupId>
<artifactId>
org.eclipse.core.commands
</artifactId>
<version>
3.8.0
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.maven
</groupId>
<artifactId>
com.ibm.icu
</artifactId>
<version>
3.8.0
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.maven
</groupId>
<artifactId>
org.eclipse.jface
</artifactId>
<version>
3.8.0
</version>
</dependency>
<dependency>
<groupId>
log4j
</groupId>
<artifactId>
log4j
</artifactId>
...
...
@@ -172,5 +106,90 @@
<artifactId>
hsqldb
</artifactId>
<version>
2.3.4
</version>
</dependency>
<!-- Eclipse SWT -->
<dependency>
<groupId>
org.eclipse.swt
</groupId>
<artifactId>
swing2swt
</artifactId>
<version>
1.0
</version>
</dependency>
<!-- <dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.swt</artifactId>
<version>3.114.100</version>
</dependency> -->
<!-- To run on Linux: Comment out the macOS SWT dependency -->
<!-- Enable including dependencies with "Provided" scope inside the run configurations of your IDE-->
<dependency>
<groupId>
org.eclipse.platform
</groupId>
<artifactId>
org.eclipse.swt.cocoa.macosx.x86_64
</artifactId>
<version>
3.114.100
</version>
<scope>
provided
</scope>
<exclusions>
<exclusion>
<groupId>
org.eclipse.platform
</groupId>
<artifactId>
org.eclipse.swt
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
org.eclipse.platform
</groupId>
<artifactId>
org.eclipse.swt.gtk.linux.x86_64
</artifactId>
<version>
3.114.100
</version>
<scope>
provided
</scope>
<exclusions>
<exclusion>
<groupId>
org.eclipse.platform
</groupId>
<artifactId>
org.eclipse.swt
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
org.eclipse.platform
</groupId>
<artifactId>
org.eclipse.core.databinding
</artifactId>
<version>
1.9.0
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.platform
</groupId>
<artifactId>
org.eclipse.core.databinding.observable
</artifactId>
<version>
1.9.0
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.platform
</groupId>
<artifactId>
org.eclipse.core.databinding.beans
</artifactId>
<version>
1.6.100
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.platform
</groupId>
<artifactId>
org.eclipse.core.databinding.property
</artifactId>
<version>
1.8.0
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.platform
</groupId>
<artifactId>
org.eclipse.jface.databinding
</artifactId>
<version>
1.11.100
</version>
<exclusions>
<exclusion>
<groupId>
org.eclipse.platform
</groupId>
<artifactId>
org.eclipse.swt
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
org.eclipse.platform
</groupId>
<artifactId>
org.eclipse.equinox.common
</artifactId>
<version>
3.12.0
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.platform
</groupId>
<artifactId>
org.eclipse.core.commands
</artifactId>
<version>
3.9.700
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.platform
</groupId>
<artifactId>
org.eclipse.jface
</artifactId>
<version>
3.20.0
</version>
</dependency>
</dependencies>
</project>
anno-gui/src/main/java/org/genesys2/anno/gui/DatabaseDialog.java
View file @
e2867392
...
...
@@ -27,7 +27,7 @@ import org.apache.log4j.Logger;
import
org.eclipse.core.databinding.DataBindingContext
;
import
org.eclipse.core.databinding.beans.BeanProperties
;
import
org.eclipse.core.databinding.observable.value.IObservableValue
;
import
org.eclipse.jface.databinding.swt.WidgetProperties
;
import
org.eclipse.jface.databinding.swt.
typed.
WidgetProperties
;
import
org.eclipse.jface.viewers.TreeViewer
;
import
org.eclipse.swt.SWT
;
import
org.eclipse.swt.custom.ScrolledComposite
;
...
...
pom.xml
View file @
e2867392
...
...
@@ -61,7 +61,7 @@
<plugin>
<inherited>
true
</inherited>
<artifactId>
maven-compiler-plugin
</artifactId>
<version>
3.
6
.1
</version>
<version>
3.
8
.1
</version>
<configuration>
<source>
${jdk.source}
</source>
<target>
${jdk.target}
</target>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment