148179: manifest: export packages incomplete
+ branched to R3_2_maintenance
diff --git a/bundles/org.eclipse.core.expressions/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.expressions/META-INF/MANIFEST.MF
index f8ea6c0..0747f9d 100644
--- a/bundles/org.eclipse.core.expressions/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.core.expressions/META-INF/MANIFEST.MF
@@ -2,13 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.core.expressions; singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.1.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.core.internal.expressions.ExpressionPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.core.expressions,
- org.eclipse.core.internal.expressions;x-internal:=true
+ org.eclipse.core.internal.expressions;x-internal:=true,
+ org.eclipse.core.internal.expressions.util;x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)"
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
diff --git a/bundles/org.eclipse.core.expressions/scripts/exportplugin.xml b/bundles/org.eclipse.core.expressions/scripts/exportplugin.xml
index 4b2b97b..709d3cc 100644
--- a/bundles/org.eclipse.core.expressions/scripts/exportplugin.xml
+++ b/bundles/org.eclipse.core.expressions/scripts/exportplugin.xml
@@ -6,7 +6,14 @@
<property name="destdir" value="../../plugin-export" />
<property name="plugin" value="org.eclipse.core.expressions" />
<property name="qualifier" value="zzz${DSTAMP}-${TSTAMP}" />
- <property name="plugin_version" value="_3.2.0.${qualifier}" />
+
+ <!-- define property ${plugin_version} by reading version from MANIFEST.MF: -->
+ <tempfile property="plugin_version_file" suffix=".plugin_version.tmp" destdir="${destdir}"/>
+ <copy file="META-INF/MANIFEST.MF" tofile="${plugin_version_file}"/>
+ <replaceregexp file="${plugin_version_file}" match=".*Bundle-Version: ((\d)+\.(\d)+\.(\d)+\.)qualifier.*" replace="plugin_version=_\1${qualifier}" flags="s" />
+ <property file="${plugin_version_file}"/>
+ <delete file="${plugin_version_file}" />
+
<property name="dest" value="${destdir}/${plugin}${plugin_version}" />
<property name="destjar" value="${destdir}/${plugin}${plugin_version}.jar" />
</target>
