diff options
8 files changed, 172 insertions, 38 deletions
diff --git a/bundles/org.eclipse.compare/META-INF/MANIFEST.MF b/bundles/org.eclipse.compare/META-INF/MANIFEST.MF index 3dd9ce691..a106d9ebe 100644 --- a/bundles/org.eclipse.compare/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.compare/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.compare; singleton:=true Bundle-Version: 3.1.0 -Bundle-ClassPath: compare.jar Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.compare/build.properties b/bundles/org.eclipse.compare/build.properties index ee29c7721..56119ee6d 100644 --- a/bundles/org.eclipse.compare/build.properties +++ b/bundles/org.eclipse.compare/build.properties @@ -8,10 +8,10 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -source.compare.jar = compare/ +source.. = compare/ bin.includes = icons/,\ plugin.xml,\ - *.jar,\ + .,\ plugin.properties,\ about.html,\ META-INF/ diff --git a/bundles/org.eclipse.compare/component.xml b/bundles/org.eclipse.compare/component.xml new file mode 100644 index 000000000..2b9c6e78a --- /dev/null +++ b/bundles/org.eclipse.compare/component.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<component xmlns="http://eclipse.org/component" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://eclipse.org/component ../component.xsd " + name="Compare Support"> + <plugin id="org.eclipse.compare" /> + + <package name="org.eclipse.compare"> + <type name= "BufferedContent"/> + <type name= "CompareConfiguration"/> + <type name= "CompareEditorInput"/> + <type name= "CompareUI" subclass="false" instantiate="false"/> + <type name= "CompareViewerPane"/> + <type name= "CompareViewerSwitchingPane"/> + <type name= "EditionSelectionDialog" subclass="false"/> + <type name= "HistoryItem" subclass="false"/> + <type name= "ICompareNavigator"/> + <type name= "IContentChangeListener"/> + <type name= "IContentChangeNotifier"/> + <type name= "IEditableContent"/> + <type name= "IEncodedStreamContentAccessor"/> + <type name= "IModificationDate"/> + <type name= "IPropertyChangeNotifier"/> + <type name= "IResourceProvider"/> + <type name= "IStreamContentAccessor"/> + <type name= "IStreamMerger"/> + <type name= "ITypedElement"/> + <type name= "IViewerCreator"/> + <type name= "NavigationAction" subclass="false"/> + <type name= "ResourceNode" subclass="false"/> + <type name= "Splitter"/> + <type name= "ZipFileStructureCreator"/> + </package> + + <package name="org.eclipse.compare.contentmergeviewer"> + <type name= "ContentMergeViewer"/> + <type name= "IDocumentRange"/> + <type name= "IMergeViewerContentProvider"/> + <type name= "ITokenComparator"/> + <type name= "TextMergeViewer"/> + </package> + + <package name="org.eclipse.compare.rangedifferencer"> + <type name= "IRangeComparator"/> + <type name= "RangeDifference" subclass="false" instantiate="false"/> + <type name= "RangeDifferencer" subclass="false"/> + </package> + + <package name="org.eclipse.compare.structuremergeviewer"> + <type name= "DiffContainer"/> + <type name= "DiffElement"/> + <type name= "Differencer"/> + <type name= "DiffNode"/> + <type name= "DiffTreeViewer" subclass="false"/> + <type name= "DocumentRangeNode"/> + <type name= "ICompareInput"/> + <type name= "ICompareInputChangeListener"/> + <type name= "IDiffContainer"/> + <type name= "IDiffElement"/> + <type name= "IStructureComparator"/> + <type name= "IStructureCreator"/> + <type name= "StructureDiffViewer" subclass="false"/> + </package> + + <component-depends unrestricted="true"/> +</component> diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/META-INF/MANIFEST.MF b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/META-INF/MANIFEST.MF index 3dd9ce691..a106d9ebe 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.compare; singleton:=true Bundle-Version: 3.1.0 -Bundle-ClassPath: compare.jar Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/build.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/build.properties index ee29c7721..56119ee6d 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/build.properties +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/build.properties @@ -8,10 +8,10 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -source.compare.jar = compare/ +source.. = compare/ bin.includes = icons/,\ plugin.xml,\ - *.jar,\ + .,\ plugin.properties,\ about.html,\ META-INF/ diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/component.xml b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/component.xml new file mode 100644 index 000000000..2b9c6e78a --- /dev/null +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/component.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<component xmlns="http://eclipse.org/component" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://eclipse.org/component ../component.xsd " + name="Compare Support"> + <plugin id="org.eclipse.compare" /> + + <package name="org.eclipse.compare"> + <type name= "BufferedContent"/> + <type name= "CompareConfiguration"/> + <type name= "CompareEditorInput"/> + <type name= "CompareUI" subclass="false" instantiate="false"/> + <type name= "CompareViewerPane"/> + <type name= "CompareViewerSwitchingPane"/> + <type name= "EditionSelectionDialog" subclass="false"/> + <type name= "HistoryItem" subclass="false"/> + <type name= "ICompareNavigator"/> + <type name= "IContentChangeListener"/> + <type name= "IContentChangeNotifier"/> + <type name= "IEditableContent"/> + <type name= "IEncodedStreamContentAccessor"/> + <type name= "IModificationDate"/> + <type name= "IPropertyChangeNotifier"/> + <type name= "IResourceProvider"/> + <type name= "IStreamContentAccessor"/> + <type name= "IStreamMerger"/> + <type name= "ITypedElement"/> + <type name= "IViewerCreator"/> + <type name= "NavigationAction" subclass="false"/> + <type name= "ResourceNode" subclass="false"/> + <type name= "Splitter"/> + <type name= "ZipFileStructureCreator"/> + </package> + + <package name="org.eclipse.compare.contentmergeviewer"> + <type name= "ContentMergeViewer"/> + <type name= "IDocumentRange"/> + <type name= "IMergeViewerContentProvider"/> + <type name= "ITokenComparator"/> + <type name= "TextMergeViewer"/> + </package> + + <package name="org.eclipse.compare.rangedifferencer"> + <type name= "IRangeComparator"/> + <type name= "RangeDifference" subclass="false" instantiate="false"/> + <type name= "RangeDifferencer" subclass="false"/> + </package> + + <package name="org.eclipse.compare.structuremergeviewer"> + <type name= "DiffContainer"/> + <type name= "DiffElement"/> + <type name= "Differencer"/> + <type name= "DiffNode"/> + <type name= "DiffTreeViewer" subclass="false"/> + <type name= "DocumentRangeNode"/> + <type name= "ICompareInput"/> + <type name= "ICompareInputChangeListener"/> + <type name= "IDiffContainer"/> + <type name= "IDiffElement"/> + <type name= "IStructureComparator"/> + <type name= "IStructureCreator"/> + <type name= "StructureDiffViewer" subclass="false"/> + </package> + + <component-depends unrestricted="true"/> +</component> diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/scripts/exportplugin.xml b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/scripts/exportplugin.xml index 21a2d26af..ba0351540 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/scripts/exportplugin.xml +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/scripts/exportplugin.xml @@ -2,8 +2,10 @@ <target name="init"> <tstamp/> <property name="destdir" value="../../plugin-export" /> + <property name="tempdir" value="../../tmp" /> <property name="plugin" value="org.eclipse.compare" /> <property name="dest" value="${destdir}/${plugin}_3.1.0" /> + <property name="destjar" value="${destdir}/${plugin}_3.1.0.jar" /> </target> <target name="build" depends="init"> @@ -11,23 +13,22 @@ </target> <target name="export" depends="build"> + <delete dir="${tempdir}" /> + <mkdir dir="${tempdir}" /> <mkdir dir="${destdir}" /> - <delete dir="${dest}" /> - <mkdir dir="${dest}" /> - <jar - jarfile="${dest}/compare.jar" - basedir="bin" - /> - <copy file="plugin.xml" todir="${dest}"/> - <copy file="plugin.properties" todir="${dest}"/> - <copy todir="${dest}/icons"> - <fileset dir="icons" /> - </copy> - <copy todir="${dest}/META-INF"> - <fileset dir="META-INF" /> - </copy> - <zip zipfile="${dest}/comparesrc.zip"> + <delete file="${destjar}" /> + <zip zipfile="${tempdir}/src.zip"> <fileset dir="compare" /> - </zip> + </zip> + <zip zipfile="${destjar}"> + <fileset dir="."> + <include name="plugin.xml" /> + <include name="plugin.properties" /> + <include name="META-INF/**" /> + </fileset> + <fileset dir="bin" /> + <fileset file="${tempdir}/src.zip" /> + </zip> + <delete file="${tempdir}/src.zip" /> </target> </project> diff --git a/bundles/org.eclipse.compare/scripts/exportplugin.xml b/bundles/org.eclipse.compare/scripts/exportplugin.xml index 21a2d26af..ba0351540 100644 --- a/bundles/org.eclipse.compare/scripts/exportplugin.xml +++ b/bundles/org.eclipse.compare/scripts/exportplugin.xml @@ -2,8 +2,10 @@ <target name="init"> <tstamp/> <property name="destdir" value="../../plugin-export" /> + <property name="tempdir" value="../../tmp" /> <property name="plugin" value="org.eclipse.compare" /> <property name="dest" value="${destdir}/${plugin}_3.1.0" /> + <property name="destjar" value="${destdir}/${plugin}_3.1.0.jar" /> </target> <target name="build" depends="init"> @@ -11,23 +13,22 @@ </target> <target name="export" depends="build"> + <delete dir="${tempdir}" /> + <mkdir dir="${tempdir}" /> <mkdir dir="${destdir}" /> - <delete dir="${dest}" /> - <mkdir dir="${dest}" /> - <jar - jarfile="${dest}/compare.jar" - basedir="bin" - /> - <copy file="plugin.xml" todir="${dest}"/> - <copy file="plugin.properties" todir="${dest}"/> - <copy todir="${dest}/icons"> - <fileset dir="icons" /> - </copy> - <copy todir="${dest}/META-INF"> - <fileset dir="META-INF" /> - </copy> - <zip zipfile="${dest}/comparesrc.zip"> + <delete file="${destjar}" /> + <zip zipfile="${tempdir}/src.zip"> <fileset dir="compare" /> - </zip> + </zip> + <zip zipfile="${destjar}"> + <fileset dir="."> + <include name="plugin.xml" /> + <include name="plugin.properties" /> + <include name="META-INF/**" /> + </fileset> + <fileset dir="bin" /> + <fileset file="${tempdir}/src.zip" /> + </zip> + <delete file="${tempdir}/src.zip" /> </target> </project> |