From 9d4e5bf636594b878447935ace96c30cf5767697 Mon Sep 17 00:00:00 2001 From: eyck Date: Sun, 4 Oct 2020 17:42:01 +0200 Subject: [PATCH] fix product setup --- com.minres.scviewer.e4.product/scviewer.product | 2 +- .../.gitignore | 0 .../.project | 2 +- .../icons/SCViewer.icns | Bin .../icons/SCViewer.ico | Bin .../icons/SCViewer.png | Bin .../icons/SCViewer_16x16@32.bmp | Bin .../icons/SCViewer_16x16@8.bmp | Bin .../icons/SCViewer_256x256@32.bmp | Bin .../icons/SCViewer_32x32@32.bmp | Bin .../icons/SCViewer_32x32@8.bmp | Bin .../icons/SCViewer_48x48@32.bmp | Bin .../icons/SCViewer_48x48@8.bmp | Bin .../icons/SCViewer_512x512.xpm | 0 .../icons/convert2ico.sh | 0 .../pom.xml | 0 .../scviewer.product | 2 +- .../META-INF/MANIFEST.MF | 3 ++- pom.xml | 2 +- 19 files changed, 6 insertions(+), 5 deletions(-) rename {com.minres.scviewer.e4-slim.product => com.minres.scviewer.e4.product_slim}/.gitignore (100%) rename {com.minres.scviewer.e4-slim.product => com.minres.scviewer.e4.product_slim}/.project (78%) rename {com.minres.scviewer.e4-slim.product => com.minres.scviewer.e4.product_slim}/icons/SCViewer.icns (100%) rename {com.minres.scviewer.e4-slim.product => com.minres.scviewer.e4.product_slim}/icons/SCViewer.ico (100%) rename {com.minres.scviewer.e4-slim.product => com.minres.scviewer.e4.product_slim}/icons/SCViewer.png (100%) rename {com.minres.scviewer.e4-slim.product => com.minres.scviewer.e4.product_slim}/icons/SCViewer_16x16@32.bmp (100%) rename {com.minres.scviewer.e4-slim.product => com.minres.scviewer.e4.product_slim}/icons/SCViewer_16x16@8.bmp (100%) rename {com.minres.scviewer.e4-slim.product => com.minres.scviewer.e4.product_slim}/icons/SCViewer_256x256@32.bmp (100%) rename {com.minres.scviewer.e4-slim.product => com.minres.scviewer.e4.product_slim}/icons/SCViewer_32x32@32.bmp (100%) rename {com.minres.scviewer.e4-slim.product => com.minres.scviewer.e4.product_slim}/icons/SCViewer_32x32@8.bmp (100%) rename {com.minres.scviewer.e4-slim.product => com.minres.scviewer.e4.product_slim}/icons/SCViewer_48x48@32.bmp (100%) rename {com.minres.scviewer.e4-slim.product => com.minres.scviewer.e4.product_slim}/icons/SCViewer_48x48@8.bmp (100%) rename {com.minres.scviewer.e4-slim.product => com.minres.scviewer.e4.product_slim}/icons/SCViewer_512x512.xpm (100%) rename {com.minres.scviewer.e4-slim.product => com.minres.scviewer.e4.product_slim}/icons/convert2ico.sh (100%) rename {com.minres.scviewer.e4-slim.product => com.minres.scviewer.e4.product_slim}/pom.xml (100%) rename {com.minres.scviewer.e4-slim.product => com.minres.scviewer.e4.product_slim}/scviewer.product (97%) diff --git a/com.minres.scviewer.e4.product/scviewer.product b/com.minres.scviewer.e4.product/scviewer.product index a44211f..9846949 100644 --- a/com.minres.scviewer.e4.product/scviewer.product +++ b/com.minres.scviewer.e4.product/scviewer.product @@ -1,7 +1,7 @@ - + diff --git a/com.minres.scviewer.e4-slim.product/.gitignore b/com.minres.scviewer.e4.product_slim/.gitignore similarity index 100% rename from com.minres.scviewer.e4-slim.product/.gitignore rename to com.minres.scviewer.e4.product_slim/.gitignore diff --git a/com.minres.scviewer.e4-slim.product/.project b/com.minres.scviewer.e4.product_slim/.project similarity index 78% rename from com.minres.scviewer.e4-slim.product/.project rename to com.minres.scviewer.e4.product_slim/.project index 16ad524..3e7dc24 100644 --- a/com.minres.scviewer.e4-slim.product/.project +++ b/com.minres.scviewer.e4.product_slim/.project @@ -1,6 +1,6 @@ - com.minres.scviewer.e4-slim.product + com.minres.scviewer.e4.product_slim diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer.icns b/com.minres.scviewer.e4.product_slim/icons/SCViewer.icns similarity index 100% rename from com.minres.scviewer.e4-slim.product/icons/SCViewer.icns rename to com.minres.scviewer.e4.product_slim/icons/SCViewer.icns diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer.ico b/com.minres.scviewer.e4.product_slim/icons/SCViewer.ico similarity index 100% rename from com.minres.scviewer.e4-slim.product/icons/SCViewer.ico rename to com.minres.scviewer.e4.product_slim/icons/SCViewer.ico diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer.png b/com.minres.scviewer.e4.product_slim/icons/SCViewer.png similarity index 100% rename from com.minres.scviewer.e4-slim.product/icons/SCViewer.png rename to com.minres.scviewer.e4.product_slim/icons/SCViewer.png diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_16x16@32.bmp b/com.minres.scviewer.e4.product_slim/icons/SCViewer_16x16@32.bmp similarity index 100% rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_16x16@32.bmp rename to com.minres.scviewer.e4.product_slim/icons/SCViewer_16x16@32.bmp diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_16x16@8.bmp b/com.minres.scviewer.e4.product_slim/icons/SCViewer_16x16@8.bmp similarity index 100% rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_16x16@8.bmp rename to com.minres.scviewer.e4.product_slim/icons/SCViewer_16x16@8.bmp diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_256x256@32.bmp b/com.minres.scviewer.e4.product_slim/icons/SCViewer_256x256@32.bmp similarity index 100% rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_256x256@32.bmp rename to com.minres.scviewer.e4.product_slim/icons/SCViewer_256x256@32.bmp diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_32x32@32.bmp b/com.minres.scviewer.e4.product_slim/icons/SCViewer_32x32@32.bmp similarity index 100% rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_32x32@32.bmp rename to com.minres.scviewer.e4.product_slim/icons/SCViewer_32x32@32.bmp diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_32x32@8.bmp b/com.minres.scviewer.e4.product_slim/icons/SCViewer_32x32@8.bmp similarity index 100% rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_32x32@8.bmp rename to com.minres.scviewer.e4.product_slim/icons/SCViewer_32x32@8.bmp diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_48x48@32.bmp b/com.minres.scviewer.e4.product_slim/icons/SCViewer_48x48@32.bmp similarity index 100% rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_48x48@32.bmp rename to com.minres.scviewer.e4.product_slim/icons/SCViewer_48x48@32.bmp diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_48x48@8.bmp b/com.minres.scviewer.e4.product_slim/icons/SCViewer_48x48@8.bmp similarity index 100% rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_48x48@8.bmp rename to com.minres.scviewer.e4.product_slim/icons/SCViewer_48x48@8.bmp diff --git a/com.minres.scviewer.e4-slim.product/icons/SCViewer_512x512.xpm b/com.minres.scviewer.e4.product_slim/icons/SCViewer_512x512.xpm similarity index 100% rename from com.minres.scviewer.e4-slim.product/icons/SCViewer_512x512.xpm rename to com.minres.scviewer.e4.product_slim/icons/SCViewer_512x512.xpm diff --git a/com.minres.scviewer.e4-slim.product/icons/convert2ico.sh b/com.minres.scviewer.e4.product_slim/icons/convert2ico.sh similarity index 100% rename from com.minres.scviewer.e4-slim.product/icons/convert2ico.sh rename to com.minres.scviewer.e4.product_slim/icons/convert2ico.sh diff --git a/com.minres.scviewer.e4-slim.product/pom.xml b/com.minres.scviewer.e4.product_slim/pom.xml similarity index 100% rename from com.minres.scviewer.e4-slim.product/pom.xml rename to com.minres.scviewer.e4.product_slim/pom.xml diff --git a/com.minres.scviewer.e4-slim.product/scviewer.product b/com.minres.scviewer.e4.product_slim/scviewer.product similarity index 97% rename from com.minres.scviewer.e4-slim.product/scviewer.product rename to com.minres.scviewer.e4.product_slim/scviewer.product index 659c4c3..69ce508 100644 --- a/com.minres.scviewer.e4-slim.product/scviewer.product +++ b/com.minres.scviewer.e4.product_slim/scviewer.product @@ -1,7 +1,7 @@ - + diff --git a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF index edabd54..8ee0898 100644 --- a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF @@ -28,7 +28,8 @@ Require-Bundle: javax.inject;bundle-version="1.0.0", com.opcoach.e4.preferences, org.eclipse.e4.core.di.extensions, org.eclipse.e4.ui.css.swt.theme;bundle-version="0.10.0", - org.eclipse.core.resources;bundle-version="3.13.0" + org.eclipse.core.resources;bundle-version="3.13.0", + javax.annotation;bundle-version="1.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.minres.scviewer.database, javax.inject;version="1.0.0" diff --git a/pom.xml b/pom.xml index 2f31a58..c95fb60 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ features/com.minres.scviewer.e4.feature p2repositories//com.minres.scviewer.updateSite com.minres.scviewer.e4.product - com.minres.scviewer.e4-slim.product + com.minres.scviewer.e4.product_slim