Got rid of the MANIFEST.MF.in files

21 files changed, 129 insertions, 196 deletions

diff --git a/build/build.xml b/build/build.xml
index c38cca2..18792ff 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -42,9 +42,9 @@
 
 <project name="ooeclipseintegration" default="site">
 
-	<import file="../core/build/build.xml"/>
-	<import file="../java/build/build.xml"/>
-	<import file="../cpp/build/build.xml"/>
+	<import file="../core/build.xml"/>
+	<import file="../java/build.xml"/>
+	<import file="../cpp/build.xml"/>
 	
 	<property file="versions.properties"/>
 	
diff --git a/build/features/core/.project b/build/features/core/.project
new file mode 100644
index 0000000..6ecae06
--- /dev/null
+++ b/build/features/core/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>FEATURE org.openoffice.ide.eclipse.core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/build/features/core/build.properties b/build/features/core/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/build/features/core/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/build/features/core/feature.xml b/build/features/core/feature.xml
index c8ac368..b8b64c0 100644
--- a/build/features/core/feature.xml
+++ b/build/features/core/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.openoffice.ide.eclipse.core"
       label="LibreOffice development plugin core"
-      version="@CORE_VERSION@"
+      version="1.2.0"
       provider-name="Cédric Bosdonnat"
       plugin="org.openoffice.ide.eclipse.core">
 
@@ -340,19 +340,19 @@ version for the Library.
 
    <includes
          id="org.openoffice.ide.eclipse.java"
-         version="@JAVA_VERSION@"
+         version="0.0.0"
          optional="true"/>
 
    <includes
          id="org.openoffice.ide.eclipse.cpp"
-         version="@CPP_VERSION@"
+         version="0.0.0"
          optional="true"/>
 
    <plugin
          id="org.openoffice.ide.eclipse.core"
          download-size="0"
          install-size="0"
-         version="@CORE_VERSION@"
+         version="0.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/build/features/cpp/.project b/build/features/cpp/.project
new file mode 100644
index 0000000..c2c4f29
--- /dev/null
+++ b/build/features/cpp/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>FEATURE org.openoffice.ide.eclipse.cpp</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/build/features/cpp/build.properties b/build/features/cpp/build.properties
new file mode 100644
index 0000000..cc2efe0
--- /dev/null
+++ b/build/features/cpp/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml
+src.includes = feature.xml
diff --git a/build/features/cpp/feature.xml b/build/features/cpp/feature.xml
index 3ee10da..1b5f551 100644
--- a/build/features/cpp/feature.xml
+++ b/build/features/cpp/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.openoffice.ide.eclipse.cpp"
       label="LibreOffice development plugin support for C++ implementation"
-      version="@CPP_VERSION@"
+      version="0.5.0"
       provider-name="Cédric Bosdonnat">
 
    <description>
@@ -20,7 +20,7 @@ mailing list.
       Copyright: (c) 2005-2010 Cedric Bosdonnat
    </copyright>
 
-  <license url="http://www.gnu.org/licenses/lgpl.txt">
+   <license url="http://www.gnu.org/licenses/lgpl.txt">
       GNU LESSER GENERAL PUBLIC LICENSE
 Version 3, 29 June 2007
 Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/
@@ -328,14 +328,14 @@ version for the Library.
 
    <requires>
       <import feature="org.eclipse.cdt" version="6.0.0.200909110608"/>
-      <import plugin="org.openoffice.ide.eclipse.core" version="@CORE_VERSION@"/>
+      <import plugin="org.openoffice.ide.eclipse.core" version="0.0.0"/>
    </requires>
 
    <plugin
          id="org.openoffice.ide.eclipse.cpp"
          download-size="0"
          install-size="0"
-         version="@CPP_VERSION@"
+         version="0.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/build/features/java/.project b/build/features/java/.project
new file mode 100644
index 0000000..dc5fe48
--- /dev/null
+++ b/build/features/java/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>FEATURE org.openoffice.ide.eclipse.java</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/build/features/java/build.properties b/build/features/java/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/build/features/java/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/build/features/java/feature.xml b/build/features/java/feature.xml
index d8f8c48..2b238c4 100644
--- a/build/features/java/feature.xml
+++ b/build/features/java/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.openoffice.ide.eclipse.java"
       label="LibreOffice development plugin support for Java implementation"
-      version="@JAVA_VERSION@"
+      version="1.0.3"
       provider-name="Cédric Bosdonnat">
 
    <description>
@@ -20,7 +20,7 @@ mailing list.
       Copyright: (c) 2005-2010 Cedric Bosdonnat
    </copyright>
 
-  <license url="http://www.gnu.org/licenses/lgpl.txt">
+   <license url="http://www.gnu.org/licenses/lgpl.txt">
       GNU LESSER GENERAL PUBLIC LICENSE
 Version 3, 29 June 2007
 Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/
@@ -328,14 +328,14 @@ version for the Library.
 
    <requires>
       <import feature="org.eclipse.jdt" version="3.5.1.r351_v20090810-0600-7r88FEoFI0WTo6Az-1qFRHm37ChJ"/>
-      <import plugin="org.openoffice.ide.eclipse.core" version="@CORE_VERSION@"/>
+      <import plugin="org.openoffice.ide.eclipse.core" version="0.0.0"/>
    </requires>
 
    <plugin
          id="org.openoffice.ide.eclipse.java"
          download-size="0"
          install-size="0"
-         version="@JAVA_VERSION@"
+         version="0.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/build/site.xml b/build/site.xml
index d6a14c5..c89e12f 100644
--- a/build/site.xml
+++ b/build/site.xml
@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <category-def name="LibreOffice" label="LibreOffice"/>
-   
-   <feature 
-   		url="features/org.openoffice.ide.eclipse.core_@CORE_VERSION@.jar" 
-   		id="org.openoffice.ide.eclipse.core" version="@CORE_VERSION@">
+   <feature url="features/org.openoffice.ide.eclipse.core_1.2.0.jar" id="org.openoffice.ide.eclipse.core" version="1.2.0">
       <category name="LibreOffice"/>
    </feature>
-   
-   <feature 
-   		url="features/org.openoffice.ide.eclipse.java_@JAVA_VERSION@.jar" 
-   		id="org.openoffice.ide.eclipse.java" version="@JAVA_VERSION@">
+   <feature url="features/org.openoffice.ide.eclipse.cpp_0.6.0.jar" id="org.openoffice.ide.eclipse.cpp" version="0.6.0">
       <category name="LibreOffice"/>
    </feature>
-   
-   <feature 
-        url="features/org.openoffice.ide.eclipse.cpp_@CPP_VERSION@.jar"
-        id="org.openoffice.ide.eclipse.cpp"
-        version="@CPP_VERSION@">
+   <feature url="features/org.openoffice.ide.eclipse.java_1.0.3.jar" id="org.openoffice.ide.eclipse.java" version="1.0.3">
       <category name="LibreOffice"/>
    </feature>
-</site>
\ No newline at end of file
+   <category-def name="LibreOffice" label="LibreOffice"/>
+</site>
diff --git a/core/build/build.xml b/core/build.xml
index 3e5b7f6..e11f6f6 100644
--- a/core/build/build.xml
+++ b/core/build.xml
@@ -42,8 +42,8 @@
 
 <project name="core" default="core.error">
 	
-    <import file="../../packager/build/build.xml"/>
-
+    <import file="../packager/build/build.xml"/>
+	
 	<target name="core.error">
 		<fail>Wrong target!
 			
@@ -53,7 +53,7 @@
 	</target>
 	
 	<target name="init-env" depends="packager.init-env">
-		<dirname property="core.basedir" file="${ant.file.core}/.."/>
+		<dirname property="core.basedir" file="${ant.file.core}"/>
 		
 		<property name="core.out.path" value="${core.basedir}/bin/ant" />
 		<property name="core.out.classes" value="${core.out.path}/classes"/>
@@ -75,8 +75,15 @@
 		<mkdir dir="${core.out.classes}" />
 	</target>
 	
-	<target name="purge" depends="packager.purge">
-		<dirname property="core.basedir" file="${ant.file.core}/.."/>
+	<target name="core.version" depends="init-env">
+		<property name="manifest.properties" value="MANIFEST-MF.properties"/>
+		<copy tofile="${manifest.properties}" file="${core.basedir}/META-INF/MANIFEST.MF"/>
+		<replace file="${manifest.properties}" token=":" value="="/>
+		<property file="${manifest.properties}" prefix="core"/>
+		<delete file="${manifest.properties}" />
+	</target>
+	
+	<target name="purge" depends="init-env, packager.purge">
 		<property name="core.out.path" value="${core.basedir}/bin/ant" />
 		<delete dir="${core.out.path}" />
 		<delete dir="${core.basedir}/doc/help/html/api" />
@@ -90,15 +97,9 @@
 			excludes="**/unittests/**"/>
 	</target>
 	
-	<target name="core.plugin" depends="core.compile, javadocs">
-		
-		<copy file="${core.basedir}/build/MANIFEST.MF.in"
-			tofile="${core.out.path}/MANIFEST.MF" />
-		<replace file="${core.out.path}/MANIFEST.MF"
-			token="@CORE_VERSION@" value="${core.plugin.version}" />
-		
-		<jar destfile="${core.out.path}/plugins/${package.prefix}.core_${core.plugin.version}.jar"
-			manifest="${core.out.path}/MANIFEST.MF">
+	<target name="core.plugin" depends="core.version, core.compile, javadocs">
+		<jar destfile="${core.out.path}/plugins/${package.prefix}.core_${core.Bundle-Version}.jar"
+			manifest="${core.basedir}/META-INF/MANIFEST.MF">
 			
 			<zipfileset dir="${core.out.classes}" prefix=""/>
 			<zipfileset dir="${core.sources}" prefix="">
@@ -111,9 +112,6 @@
 				<include name="about.*"/>
 				<include name="plugin.*"/>
 			</zipfileset>
-			<zipfileset dir="${core.out.path}" prefix="META-INF" defaultexcludes="true">
-				<include name="MANIFEST.MF"/>
-			</zipfileset>
 		</jar>
 	</target>
 
diff --git a/core/build/MANIFEST.MF.in b/core/build/MANIFEST.MF.in
deleted file mode 100644
index 61408b3..0000000
--- a/core/build/MANIFEST.MF.in
+++ /dev/null
@@ -1,57 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.openoffice.ide.eclipse.core; singleton:=true
-Bundle-Version: @CORE_VERSION@
-Bundle-Activator: org.openoffice.ide.eclipse.core.OOEclipsePlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
- org.eclipse.jface.text,
- org.eclipse.core.resources,
- org.eclipse.ui.editors,
- org.eclipse.ui.ide,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.views,
- org.eclipse.ui.cheatsheets,
- org.eclipse.help,
- org.eclipse.ui.forms,
- org.junit,
- org.eclipse.debug.core;visibility:=reexport,
- org.eclipse.debug.ui,
- org.eclipse.ui;bundle-version="3.4.1"
-Bundle-ActivationPolicy: lazy
-Export-Package: org.openoffice.ide.eclipse.core,
- org.openoffice.ide.eclipse.core.actions,
- org.openoffice.ide.eclipse.core.builders,
- org.openoffice.ide.eclipse.core.editors,
- org.openoffice.ide.eclipse.core.editors.description,
- org.openoffice.ide.eclipse.core.editors.idl,
- org.openoffice.ide.eclipse.core.editors.pack,
- org.openoffice.ide.eclipse.core.editors.registry,
- org.openoffice.ide.eclipse.core.editors.syntax,
- org.openoffice.ide.eclipse.core.editors.utils,
- org.openoffice.ide.eclipse.core.gui,
- org.openoffice.ide.eclipse.core.gui.rows,
- org.openoffice.ide.eclipse.core.helpers,
- org.openoffice.ide.eclipse.core.i18n,
- org.openoffice.ide.eclipse.core.internal.helpers;x-internal:=true,
- org.openoffice.ide.eclipse.core.internal.model;x-internal:=true,
- org.openoffice.ide.eclipse.core.internal.office;x-internal:=true,
- org.openoffice.ide.eclipse.core.launch,
- org.openoffice.ide.eclipse.core.launch.office,
- org.openoffice.ide.eclipse.core.model,
- org.openoffice.ide.eclipse.core.model.config,
- org.openoffice.ide.eclipse.core.model.description,
- org.openoffice.ide.eclipse.core.model.language,
- org.openoffice.ide.eclipse.core.model.pack,
- org.openoffice.ide.eclipse.core.model.utils,
- org.openoffice.ide.eclipse.core.office,
- org.openoffice.ide.eclipse.core.preferences,
- org.openoffice.ide.eclipse.core.unittests,
- org.openoffice.ide.eclipse.core.unotypebrowser,
- org.openoffice.ide.eclipse.core.utils,
- org.openoffice.ide.eclipse.core.wizards,
- org.openoffice.ide.eclipse.core.wizards.pages,
- org.openoffice.ide.eclipse.core.wizards.utils
-Bundle-Vendor: Cédric Bosdonnat
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/cpp/META-INF/MANIFEST.MF b/cpp/META-INF/MANIFEST.MF
index 646386b..2f51602 100644
--- a/cpp/META-INF/MANIFEST.MF
+++ b/cpp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: C++ extensions support for OOo
 Bundle-SymbolicName: org.openoffice.ide.eclipse.cpp;singleton:=true
-Bundle-Version: 0.0.1
+Bundle-Version: 0.5.0
 Bundle-Activator: org.openoffice.ide.eclipse.cpp.Activator
 Bundle-Vendor: Cédric Bosdonnat
 Require-Bundle: org.eclipse.ui,
diff --git a/cpp/build/build.xml b/cpp/build.xml
index 5ff20d5..1628203 100644
--- a/cpp/build/build.xml
+++ b/cpp/build.xml
@@ -52,7 +52,7 @@
 	
 	
 	<target name="init-env"  unless="cpp.nobuild">
-		<dirname property="cpp.basedir" file="${ant.file.cpp}/.."/>
+		<dirname property="cpp.basedir" file="${ant.file.cpp}"/>
 		
 		<property name="cpp.out.path" value="${cpp.basedir}/bin/ant" />
 		<property name="cpp.out.classes" value="${cpp.out.path}/classes"/>
@@ -71,8 +71,15 @@
 		<mkdir dir="${cpp.out.classes}" />
 	</target>
 	
-	<target name="purge">
-		<dirname property="cpp.basedir" file="${ant.file.cpp}/.."/>
+	<target name="cpp.version" depends="init-env">
+		<property name="manifest.properties" value="MANIFEST-MF.properties"/>
+		<copy tofile="${manifest.properties}" file="${cpp.basedir}/META-INF/MANIFEST.MF"/>
+		<replace file="${manifest.properties}" token=":" value="="/>
+		<property file="${manifest.properties}" prefix="cpp"/>
+		<delete file="${manifest.properties}" />
+	</target>
+	
+	<target name="purge" depends="init-env">
 		<property name="cpp.out.path" value="${cpp.basedir}/bin/ant" />
 		<delete dir="${cpp.out.path}" />
 	</target>
@@ -85,16 +92,9 @@
 			excludes="**/unittests/**"/>
 	</target>
 	
-	<target name="cpp.plugin" depends="cpp.compile" unless="cpp.nobuild">
-		<copy file="${cpp.basedir}/build/MANIFEST.MF.in"
-			tofile="${cpp.out.path}/MANIFEST.MF" />
-		<replace file="${cpp.out.path}/MANIFEST.MF"
-			token="@CORE_VERSION@" value="${core.plugin.version}" />
-		<replace file="${cpp.out.path}/MANIFEST.MF"
-			token="@CPP_VERSION@" value="${cpp.plugin.version}" />
-		
-		<jar destfile="${cpp.out.path}/plugins/${package.prefix}.cpp_${cpp.plugin.version}.jar"
-			manifest="${cpp.out.path}/MANIFEST.MF">
+	<target name="cpp.plugin" depends="cpp.version, cpp.compile" unless="cpp.nobuild">
+		<jar destfile="${cpp.out.path}/plugins/${package.prefix}.cpp_${cpp.Bundle-Version}.jar"
+			manifest="${cpp.basedir}/META-INF/MANIFEST.MF">
 			<zipfileset prefix="" dir="${cpp.sources}">
 				<exclude name="**/*.java"/>
 			</zipfileset>
diff --git a/cpp/build/MANIFEST.MF.in b/cpp/build/MANIFEST.MF.in
deleted file mode 100644
index 0709383..0000000
--- a/cpp/build/MANIFEST.MF.in
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: C++ extensions support for LibreOffice
-Bundle-SymbolicName: org.openoffice.ide.eclipse.cpp;singleton:=true
-Bundle-Version: @CPP_VERSION@
-Bundle-Activator: org.openoffice.ide.eclipse.cpp.Activator
-Bundle-Vendor: Cédric Bosdonnat
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.openoffice.ide.eclipse.core;bundle-version="@CORE_VERSION@",
- org.eclipse.core.resources,
- org.eclipse.cdt.core;bundle-version="5.0.1",
- org.eclipse.cdt.managedbuilder.core;bundle-version="5.0.1",
- org.eclipse.cdt.ui,
- org.eclipse.ui.ide,
- org.eclipse.ui.cheatsheets,
- org.eclipse.debug.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/java/build/build.xml b/java/build.xml
index d95468b..5d666f0 100644
--- a/java/build/build.xml
+++ b/java/build.xml
@@ -53,7 +53,7 @@
 	
 	
 	<target name="init-env" unless="java.nobuild">
-		<dirname property="java.basedir" file="${ant.file.java}/.."/>
+		<dirname property="java.basedir" file="${ant.file.java}"/>
 		
 		<property name="java.out.path" value="${java.basedir}/bin/ant" />
 		<property name="java.out.classes" value="${java.out.path}/classes"/>
@@ -72,8 +72,15 @@
 		<mkdir dir="${java.out.classes}" />
 	</target>
 	
-	<target name="purge">
-		<dirname property="java.basedir" file="${ant.file.java}/.."/>
+	<target name="java.version" depends="init-env">
+		<property name="manifest.properties" value="MANIFEST-MF.properties"/>
+		<copy tofile="${manifest.properties}" file="${java.basedir}/META-INF/MANIFEST.MF"/>
+		<replace file="${manifest.properties}" token=":" value="="/>
+		<property file="${manifest.properties}" prefix="java"/>
+		<delete file="${manifest.properties}" />
+	</target>
+	
+	<target name="purge" depends="init-env">
 		<property name="java.out.path" value="${java.basedir}/bin/ant" />
 		<delete dir="${java.out.path}" />
 	</target>
@@ -86,16 +93,9 @@
 			excludes="**/unittests/**"/>
 	</target>
 	
-	<target name="java.plugin" depends="java.compile" unless="java.nobuild">
-		<copy file="${java.basedir}/build/MANIFEST.MF.in"
-			tofile="${java.out.path}/MANIFEST.MF" />
-		<replace file="${java.out.path}/MANIFEST.MF"
-			token="@CORE_VERSION@" value="${core.plugin.version}" />
-		<replace file="${java.out.path}/MANIFEST.MF"
-			token="@JAVA_VERSION@" value="${java.plugin.version}" />
-		
-		<jar destfile="${java.out.path}/plugins/${package.prefix}.java_${java.plugin.version}.jar"
-			manifest="${java.out.path}/MANIFEST.MF">
+	<target name="java.plugin" depends="java.version, java.compile" unless="java.nobuild">
+		<jar destfile="${java.out.path}/plugins/${package.prefix}.java_${java.Bundle-Version}.jar"
+			manifest="${java.basedir}/META-INF/MANIFEST.MF">
 			<zipfileset prefix="" dir="${java.sources}">
 				<exclude name="**/*.java"/>
 			</zipfileset>
diff --git a/java/build/MANIFEST.MF.in b/java/build/MANIFEST.MF.in
deleted file mode 100644
index 7a73062..0000000
--- a/java/build/MANIFEST.MF.in
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Java Plug-in for OOEclipse
-Bundle-SymbolicName: org.openoffice.ide.eclipse.java; singleton:=true
-Bundle-Version: @JAVA_VERSION@
-Bundle-Activator: org.openoffice.ide.eclipse.java.OOoJavaPlugin
-Bundle-Vendor: Cédric Bosdonnat
-Require-Bundle: org.eclipse.ui,
- org.openoffice.ide.eclipse.core,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.jdt.launching,
- org.eclipse.jdt,
- org.eclipse.jdt.ui,
- org.eclipse.jface.text,
- org.eclipse.jdt.junit;bundle-version="3.5.0",
- org.eclipse.ui.ide,
- org.eclipse.ui.cheatsheets,
- org.openoffice.ide.packager.core;bundle-version="@CORE_VERSION",
- org.eclipse.jdt.debug.ui;bundle-version="3.4.1"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
diff --git a/packager/build/MANIFEST.MF.in b/packager/build/MANIFEST.MF.in
deleted file mode 100644
index 69578ed..0000000
--- a/packager/build/MANIFEST.MF.in
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ooo-plugin-packager core
-Bundle-SymbolicName: org.openoffice.ide.packager.core
-Bundle-Version: @VERSION@
-Bundle-Vendor: Cédric Bosdonnat
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
-Export-Package: org.openoffice.plugin.core.model,
- org.openoffice.plugin.core.utils
diff --git a/packager/build/build.properties b/packager/build/build.properties
index 5685767..a265dff 100644
--- a/packager/build/build.properties
+++ b/packager/build/build.properties
@@ -1,4 +1 @@
-#Wed Apr 26 20:26:48 CEST 2006
-packager.plugin.version=0.1.0
-debug=true
 packager.git.repo=git://github.com/fredericmorin/ooo-plugin-packager.git
\ No newline at end of file
diff --git a/packager/build/build.xml b/packager/build/build.xml
index ed7b28f..856b009 100644
--- a/packager/build/build.xml
+++ b/packager/build/build.xml
@@ -49,8 +49,15 @@
         </condition>
 	</target>
 	
-	<target name="purge">
-		<dirname property="packager.basedir" file="${ant.file.packager}/.."/>
+	<target name="packager.version" depends="init-env">
+		<property name="manifest.properties" value="MANIFEST-MF.properties"/>
+		<copy tofile="${manifest.properties}" file="${packager.basedir}/META-INF/MANIFEST.MF"/>
+		<replace file="${manifest.properties}" token=":" value="="/>
+		<property file="${manifest.properties}" prefix="packager"/>
+		<delete file="${manifest.properties}" />
+	</target>
+	
+	<target name="purge" depends="init-env">
 		<property name="packager.out.path" value="${packager.basedir}/bin/ant" />
 		<delete dir="${packager.out.path}" />
 	</target>
@@ -77,14 +84,9 @@
     </target>
 
 
-	<target name="packager.plugin" depends="packager-compile">
-		<copy file="${packager.basedir}/build/MANIFEST.MF.in"
-			tofile="${packager.out.path}/MANIFEST.MF" />
-		<replace file="${packager.out.path}/MANIFEST.MF"
-			token="@VERSION@" value="${packager.plugin.version}" />
-		
-		<jar destfile="${packager.out.path}/plugins/${package.prefix}.packager.core_${packager.plugin.version}.jar"
-			manifest="${packager.out.path}/MANIFEST.MF">
+	<target name="packager.plugin" depends="packager.version, packager-compile">
+		<jar destfile="${packager.out.path}/plugins/${package.prefix}.packager.core_${packager.Bundle-Version}.jar"
+			manifest="${packager.basedir}/META-INF/MANIFEST.MF">
 			<zipfileset prefix="" dir="${packager.sources}/ooo-plugin-packager-core/src/main">
 				<exclude name="**/*.java"/>
 			</zipfileset>