463331: cannot install EPUB from Mars M6 due to nested jar
Bug: 463331
Change-Id: If6bba2cf5a1906260f8885f3620eae69e248864d
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=463331
diff --git a/org.eclipse.mylyn.docs.epub-feature/feature.xml b/org.eclipse.mylyn.docs.epub-feature/feature.xml
index 8e570c8..0512425 100644
--- a/org.eclipse.mylyn.docs.epub-feature/feature.xml
+++ b/org.eclipse.mylyn.docs.epub-feature/feature.xml
@@ -45,11 +45,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.mylyn.docs.epub.ant.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
diff --git a/org.eclipse.mylyn.docs.epub.ant.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.docs.epub.ant.core/META-INF/MANIFEST.MF
index 5a59e14..09ad174 100644
--- a/org.eclipse.mylyn.docs.epub.ant.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.docs.epub.ant.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.mylyn.docs.epub.ant.core;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.1.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.mylyn.docs.epub.ant;x-internal:=true,
diff --git a/org.eclipse.mylyn.docs.epub.ant.core/build-ant-jar.xml b/org.eclipse.mylyn.docs.epub.ant.core/build-ant-jar.xml
deleted file mode 100644
index 8e17512..0000000
--- a/org.eclipse.mylyn.docs.epub.ant.core/build-ant-jar.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2009 Chris Aniszczyk and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- Chris Aniszczyk - initial API and implementation
- Torkild U. Resheim - Adapted to build EPUB Ant support
--->
-<project name="Build EPUB Ant Support Jar" default="build">
-
- <target name="build" description="Cleans, builds and refreshes" depends="clean, lib/epub-ant.jar" />
-
- <target name="init" depends="properties">
- <property name="temp.folder" location="${basedir}/temp.folder" />
- <property name="build.result.folder" location="${basedir}" />
- <property name="src.folder" location="${basedir}/src" />
- </target>
-
- <target name="properties" if="eclipse.running">
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
- </target>
-
- <target name="lib/epub-ant.jar" description="Creates the lib/epub-ant.jar" depends="init">
- <property name="destdir" value="${temp.folder}/lib/epub-ant.bin" />
- <property name="target.platform.path" value="${eclipse.home}" />
- <delete dir="${destdir}" />
- <mkdir dir="${destdir}" />
- <mkdir dir="${build.result.folder}/lib" />
- <!-- compile the source code -->
- <javac target="1.5" source="1.5" destdir="${destdir}" failonerror="true" verbose="false" debug="on">
- <classpath>
- <dirset dir="${basedir}/../">
- <include name="org.eclipse.mylyn.docs.epub.core/bin" />
- </dirset>
- </classpath>
- <src path="${src.folder}" />
- </javac>
- <!-- copy the *.class files to the jar location -->
- <copy todir="${destdir}" failonerror="true" overwrite="false">
- <fileset dir="${src.folder}">
- <exclude name="**/*.java" />
- <exclude name="**/package.htm*" />
- </fileset>
- </copy>
- <jar destfile="${build.result.folder}/lib/epub-ant.jar" basedir="${destdir}" />
- <delete dir="${temp.folder}" />
- </target>
-
- <target name="clean" description="Deletes previous build remnants" depends="init">
- <delete file="${build.result.folder}/lib/epub-ant.jar" />
- <delete dir="${temp.folder}" />
- </target>
-</project>
diff --git a/org.eclipse.mylyn.docs.epub.ant.core/build.properties b/org.eclipse.mylyn.docs.epub.ant.core/build.properties
index f2190c2..e6daa1a 100644
--- a/org.eclipse.mylyn.docs.epub.ant.core/build.properties
+++ b/org.eclipse.mylyn.docs.epub.ant.core/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2012 Torkild U. Resheim
+# Copyright (c) 2012,2015 Torkild U. Resheim
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -12,8 +12,6 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml,\
- lib/,\
OSGI-INF/l10n/bundle.properties,\
OSGI-INF/,\
about.html
diff --git a/org.eclipse.mylyn.docs.epub.ant.core/plugin.xml b/org.eclipse.mylyn.docs.epub.ant.core/plugin.xml
deleted file mode 100644
index 846fa76..0000000
--- a/org.eclipse.mylyn.docs.epub.ant.core/plugin.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.ant.core.antTasks">
- <antTask
- class="org.eclipse.mylyn.docs.epub.ant.core.EpubTask"
- library="lib/epub-ant.jar"
- name="epub">
- </antTask>
- </extension>
- <extension
- point="org.eclipse.ant.core.extraClasspathEntries">
- <extraClasspathEntry
- library="lib/epub-ant.jar">
- </extraClasspathEntry>
- </extension>
-
-</plugin>
diff --git a/org.eclipse.mylyn.docs.epub.ant.core/pom.xml b/org.eclipse.mylyn.docs.epub.ant.core/pom.xml
index fa83f3c..21d9f42 100644
--- a/org.eclipse.mylyn.docs.epub.ant.core/pom.xml
+++ b/org.eclipse.mylyn.docs.epub.ant.core/pom.xml
@@ -8,28 +8,10 @@
<version>2.4.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.docs.epub.ant.core</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <phase>prepare-package</phase>
- <configuration>
- <target>
- <jar destfile="lib/epub-ant.jar" basedir="target/classes"/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
diff --git a/org.eclipse.mylyn.docs.epub.help/META-INF/MANIFEST.MF b/org.eclipse.mylyn.docs.epub.help/META-INF/MANIFEST.MF
index 90eed4a..72e2a24 100644
--- a/org.eclipse.mylyn.docs.epub.help/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.docs.epub.help/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.mylyn.docs.epub.help;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.1.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Localization: OSGI-INF/l10n/bundle
diff --git a/org.eclipse.mylyn.docs.epub.help/docs/generate-ant.textile b/org.eclipse.mylyn.docs.epub.help/docs/generate-ant.textile
index f284850..81d16d9 100644
--- a/org.eclipse.mylyn.docs.epub.help/docs/generate-ant.textile
+++ b/org.eclipse.mylyn.docs.epub.help/docs/generate-ant.textile
@@ -15,7 +15,3 @@
</project>
p. In this example only some of the required properties have been specified, the rest will be automatically added. See the comprehensive description of the "epub":epub-ant-task.html Ant task for details. A more complete example is found in the "examples":examples.html chapter.
-
-p. Note that in order for the script to execute the epub task must be in the classpath. If you execute the script from within Eclipse simply make sure that the runtime environment of the workspace is used as shown in the illustration below.
-
-!runtime-jre.png(External task launch configuration.)!
\ No newline at end of file
diff --git a/org.eclipse.mylyn.docs.epub.help/docs/runtime-jre.png b/org.eclipse.mylyn.docs.epub.help/docs/runtime-jre.png
deleted file mode 100644
index 44fef40..0000000
--- a/org.eclipse.mylyn.docs.epub.help/docs/runtime-jre.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.docs.epub.help/pom.xml b/org.eclipse.mylyn.docs.epub.help/pom.xml
index 07a7b11..a29a2e1 100644
--- a/org.eclipse.mylyn.docs.epub.help/pom.xml
+++ b/org.eclipse.mylyn.docs.epub.help/pom.xml
@@ -9,7 +9,7 @@
<version>2.4.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.docs.epub.help</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
