Updated to Photon platform
This commit is contained in:
parent
6c0bbd5f1f
commit
1cf00ec882
|
@ -1,2 +1,2 @@
|
|||
eclipse.preferences.version=1
|
||||
groovy.compiler.level=24
|
||||
groovy.compiler.level=26
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<product
|
||||
application="org.eclipse.e4.ui.workbench.swt.E4Application"
|
||||
description="%product.description"
|
||||
name="%product.name">
|
||||
name="SCViewer">
|
||||
<property
|
||||
name="lifeCycleURI"
|
||||
value="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.E4LifeCycle">
|
||||
|
@ -16,10 +16,6 @@
|
|||
name="appName"
|
||||
value="SCViewer">
|
||||
</property>
|
||||
<property
|
||||
name="windowImages"
|
||||
value="icons/SCViewer_16x32.png,icons/SCViewer_32x32.png,icons/SCViewer_48x32.png,icons/SCViewer_64x32.png,icons/SCViewer_128x32.png,icons/SCViewer_256x32.png">
|
||||
</property>
|
||||
<property
|
||||
name="applicationCSS"
|
||||
value="platform:/plugin/com.minres.scviewer.e4.application/css/default.css">
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
<relativePath>../com.minres.scviewer.parent</relativePath>
|
||||
</parent>
|
||||
<artifactId>com.minres.scviewer.e4.product</artifactId>
|
||||
<version>1.2.2-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
<groupId>com.minres.scviewer</groupId>
|
||||
<build>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?pde version="3.5"?>
|
||||
|
||||
<product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.2.2.qualifier" useFeatures="false" includeLaunchers="true">
|
||||
<product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.3.0.qualifier" useFeatures="false" includeLaunchers="true">
|
||||
|
||||
<configIni use="default">
|
||||
</configIni>
|
||||
|
@ -9,6 +9,8 @@
|
|||
<launcherArgs>
|
||||
<programArgs>-clearPersistedState -data @none
|
||||
</programArgs>
|
||||
<vmArgs>-Xmx2G
|
||||
</vmArgs>
|
||||
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
|
||||
</vmArgsMac>
|
||||
</launcherArgs>
|
||||
|
@ -39,6 +41,7 @@
|
|||
</license>
|
||||
|
||||
<plugins>
|
||||
<plugin id="com.google.guava"/>
|
||||
<plugin id="com.ibm.icu"/>
|
||||
<plugin id="com.minres.scviewer.database"/>
|
||||
<plugin id="com.minres.scviewer.database.sqlite"/>
|
||||
|
@ -50,12 +53,16 @@
|
|||
<plugin id="com.opcoach.e4.preferences"/>
|
||||
<plugin id="javax.annotation"/>
|
||||
<plugin id="javax.inject"/>
|
||||
<plugin id="javax.xml"/>
|
||||
<plugin id="org.apache.batik.constants"/>
|
||||
<plugin id="org.apache.batik.css"/>
|
||||
<plugin id="org.apache.batik.i18n"/>
|
||||
<plugin id="org.apache.batik.util"/>
|
||||
<plugin id="org.apache.batik.util.gui"/>
|
||||
<plugin id="org.apache.commons.io"/>
|
||||
<plugin id="org.apache.commons.jxpath"/>
|
||||
<plugin id="org.apache.commons.logging"/>
|
||||
<plugin id="org.apache.felix.scr"/>
|
||||
<plugin id="org.apache.xmlgraphics"/>
|
||||
<plugin id="org.codehaus.groovy"/>
|
||||
<plugin id="org.eclipse.core.commands"/>
|
||||
<plugin id="org.eclipse.core.contenttype"/>
|
||||
<plugin id="org.eclipse.core.databinding"/>
|
||||
|
@ -73,6 +80,7 @@
|
|||
<plugin id="org.eclipse.e4.core.di"/>
|
||||
<plugin id="org.eclipse.e4.core.di.annotations"/>
|
||||
<plugin id="org.eclipse.e4.core.di.extensions"/>
|
||||
<plugin id="org.eclipse.e4.core.di.extensions.supplier"/>
|
||||
<plugin id="org.eclipse.e4.core.services"/>
|
||||
<plugin id="org.eclipse.e4.emf.xpath"/>
|
||||
<plugin id="org.eclipse.e4.ui.bindings"/>
|
||||
|
@ -84,6 +92,7 @@
|
|||
<plugin id="org.eclipse.e4.ui.services"/>
|
||||
<plugin id="org.eclipse.e4.ui.widgets"/>
|
||||
<plugin id="org.eclipse.e4.ui.workbench"/>
|
||||
<plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
|
||||
<plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
|
||||
<plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" fragment="true"/>
|
||||
<plugin id="org.eclipse.e4.ui.workbench.swt"/>
|
||||
|
@ -105,6 +114,8 @@
|
|||
<plugin id="org.eclipse.osgi"/>
|
||||
<plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
|
||||
<plugin id="org.eclipse.osgi.services"/>
|
||||
<plugin id="org.eclipse.osgi.util"/>
|
||||
<plugin id="org.eclipse.pde.ds.lib"/>
|
||||
<plugin id="org.eclipse.swt"/>
|
||||
<plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
|
||||
<plugin id="org.w3c.css.sac"/>
|
||||
|
|
|
@ -34,12 +34,12 @@
|
|||
<repository>
|
||||
<id>mars</id>
|
||||
<layout>p2</layout>
|
||||
<url>http://download.eclipse.org/releases/neon</url>
|
||||
<url>http://download.eclipse.org/releases/photon</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>GRECLIPSE</id>
|
||||
<layout>p2</layout>
|
||||
<url>http://dist.springsource.org/snapshot/GRECLIPSE/e4.6</url>
|
||||
<url>http://dist.springsource.org/snapshot/GRECLIPSE/e4.8</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
|
|
|
@ -19,6 +19,6 @@
|
|||
</environment>
|
||||
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 7 [1.7.0_45]"/>
|
||||
<launcherArgs>
|
||||
<vmArgs>-Dosgi.requiredJavaVersion=1.6 -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -XX:MaxPermSize=256m -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xms40m -Xmx512m -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgs>
|
||||
<vmArgs>-Dosgi.requiredJavaVersion=1.6 -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/Eclipse.icns -Xms40m -Xmx2G</vmArgs>
|
||||
</launcherArgs>
|
||||
</target>
|
|
@ -4,7 +4,7 @@
|
|||
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>neon</artifactId>
|
||||
<artifactId>photon</artifactId>
|
||||
|
||||
<packaging>eclipse-target-definition</packaging>
|
||||
<name>SCViewer Target Definition</name>
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
eclipse.preferences.version=1
|
||||
groovy.compiler.level=24
|
||||
groovy.compiler.level=26
|
||||
groovy.script.filters=**/*.dsld,y,**/*.gradle,n
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="com.minres.scviewer.ui">
|
||||
<implementation class="com.minres.scviewer.ui.TxEditorPart"/>
|
||||
<reference bind="bind" cardinality="1..1" interface="com.minres.scviewer.database.IWaveformDbFactory" name="IWaveformDbFactory" policy="static" unbind="unbin"/>
|
||||
<reference bind="bind" cardinality="1..1" interface="com.minres.scviewer.database.IWaveformDbFactory" name="IWaveformDbFactory" policy="static" unbind="unbind"/>
|
||||
</scr:component>
|
||||
|
|
Loading…
Reference in New Issue