Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Tiede2014-01-26 18:09:27 +0000
committerMarkus Tiede2014-01-26 18:09:27 +0000
commite2837a4269c1fa6a12e041351e078c34877e6b98 (patch)
tree02c64550e16ee8f5fe261637e88c1cbf88f41d44 /org.eclipse.jubula.product.autagent.start
parent2fb7afaee05bf76af755df20044ee9900c38a321 (diff)
downloadorg.eclipse.jubula.core-e2837a4269c1fa6a12e041351e078c34877e6b98.tar.gz
org.eclipse.jubula.core-e2837a4269c1fa6a12e041351e078c34877e6b98.tar.xz
org.eclipse.jubula.core-e2837a4269c1fa6a12e041351e078c34877e6b98.zip
Non-sprint task - fix for errors during product launcher icon replacement; switch to ICO; howTo added; workaround for tycho < 0.15.0 removed.
Diffstat (limited to 'org.eclipse.jubula.product.autagent.start')
-rw-r--r--org.eclipse.jubula.product.autagent.start/icons/start_aut_agent.icobin0 -> 292878 bytes
-rw-r--r--org.eclipse.jubula.product.autagent.start/icons/start_aut_agent16x16.bmpbin1080 -> 0 bytes
-rw-r--r--org.eclipse.jubula.product.autagent.start/icons/start_aut_agent16x16_8bit.bmpbin1332 -> 0 bytes
-rw-r--r--org.eclipse.jubula.product.autagent.start/icons/start_aut_agent32x32.bmpbin4152 -> 0 bytes
-rw-r--r--org.eclipse.jubula.product.autagent.start/icons/start_aut_agent32x32_8bit.bmpbin2100 -> 0 bytes
-rw-r--r--org.eclipse.jubula.product.autagent.start/icons/start_aut_agent48x48.bmpbin9272 -> 0 bytes
-rw-r--r--org.eclipse.jubula.product.autagent.start/icons/start_aut_agent48x48_8bit.bmpbin3380 -> 0 bytes
-rw-r--r--org.eclipse.jubula.product.autagent.start/org.eclipse.jubula.product.autagent.start.product17
-rw-r--r--org.eclipse.jubula.product.autagent.start/pom.xml30
9 files changed, 6 insertions, 41 deletions
diff --git a/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent.ico b/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent.ico
new file mode 100644
index 000000000..446b2ef72
--- /dev/null
+++ b/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent.ico
Binary files differ
diff --git a/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent16x16.bmp b/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent16x16.bmp
deleted file mode 100644
index a5084596c..000000000
--- a/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent16x16.bmp
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent16x16_8bit.bmp b/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent16x16_8bit.bmp
deleted file mode 100644
index 7fd9a117e..000000000
--- a/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent16x16_8bit.bmp
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent32x32.bmp b/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent32x32.bmp
deleted file mode 100644
index 3e8bb3e73..000000000
--- a/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent32x32.bmp
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent32x32_8bit.bmp b/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent32x32_8bit.bmp
deleted file mode 100644
index acc1044aa..000000000
--- a/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent32x32_8bit.bmp
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent48x48.bmp b/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent48x48.bmp
deleted file mode 100644
index f103ddd0d..000000000
--- a/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent48x48.bmp
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent48x48_8bit.bmp b/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent48x48_8bit.bmp
deleted file mode 100644
index a65b2c72c..000000000
--- a/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent48x48_8bit.bmp
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jubula.product.autagent.start/org.eclipse.jubula.product.autagent.start.product b/org.eclipse.jubula.product.autagent.start/org.eclipse.jubula.product.autagent.start.product
index 278a8673d..8a21a9f12 100644
--- a/org.eclipse.jubula.product.autagent.start/org.eclipse.jubula.product.autagent.start.product
+++ b/org.eclipse.jubula.product.autagent.start/org.eclipse.jubula.product.autagent.start.product
@@ -25,17 +25,11 @@
<windowImages/>
<launcher name="autagent">
- <linux icon="/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent.xpm"/>
- <macosx icon="/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent.icns"/>
+ <linux icon="icons/start_aut_agent.xpm"/>
+ <macosx icon="icons/start_aut_agent.icns"/>
<solaris/>
- <win useIco="false">
- <bmp
- winSmallHigh="/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent16x16.bmp"
- winSmallLow="/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent16x16_8bit.bmp"
- winMediumHigh="/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent32x32.bmp"
- winMediumLow="/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent32x32_8bit.bmp"
- winLargeHigh="/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent48x48.bmp"
- winLargeLow="/org.eclipse.jubula.product.autagent.start/icons/start_aut_agent48x48_8bit.bmp"/>
+ <win useIco="true">
+ <ico path="icons/start_aut_agent.ico"/>
</win>
</launcher>
@@ -46,4 +40,5 @@
<plugin id="org.eclipse.osgi"/>
</plugins>
-</product> \ No newline at end of file
+
+</product>
diff --git a/org.eclipse.jubula.product.autagent.start/pom.xml b/org.eclipse.jubula.product.autagent.start/pom.xml
index 96699b6f5..57c6562aa 100644
--- a/org.eclipse.jubula.product.autagent.start/pom.xml
+++ b/org.eclipse.jubula.product.autagent.start/pom.xml
@@ -14,36 +14,6 @@
<build>
<plugins>
- <!-- image path workaround described in http://software.2206966.n2.nabble.com/How-to-apply-patch-no-launcher-icon-TYCHO-300-td6059641.html -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/products/${project.artifactId}/${project.artifactId}/icons/</outputDirectory>
- <nonFilteredFileExtensions>
- <nonFilteredFileExtension>ico</nonFilteredFileExtension>
- <nonFilteredFileExtension>xpm</nonFilteredFileExtension>
- <nonFilteredFileExtension>icns</nonFilteredFileExtension>
- <nonFilteredFileExtension>bmp</nonFilteredFileExtension>
- <nonFilteredFileExtension>gif</nonFilteredFileExtension>
- <nonFilteredFileExtension>png</nonFilteredFileExtension>
- </nonFilteredFileExtensions>
- <resources>
- <resource>
- <directory>icons</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>

Back to the top