db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r412207 - /db/derby/code/trunk/build.xml
Date Tue, 06 Jun 2006 20:44:11 GMT
Author: rhillegas
Date: Tue Jun  6 13:44:11 2006
New Revision: 412207

URL: http://svn.apache.org/viewvc?rev=412207&view=rev
Log:
DERBY-1362: Commit bug1362_1.diff, fixing the manifest for derby.jar.

Modified:
    db/derby/code/trunk/build.xml

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=412207&r1=412206&r2=412207&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Tue Jun  6 13:44:11 2006
@@ -878,6 +878,7 @@
   <target name="initjars" depends="setsanityname,getsvnversion">
     <property name="derby.jar.dir" value="${basedir}/jars/${sanity.name}"/>
     <property name="derby.jar.topdir" value="${basedir}/jars"/>
+    <property name="manifest.file" value="${derby.jar.dir}/lists/smf.mf"/>
     <mkdir dir="${derby.jar.dir}"/>
     <mkdir dir="${derby.jar.dir}/lists"/>
     <loadfile srcFile="${basedir}/changenumber.properties"
@@ -1002,46 +1003,27 @@
 
   <target name="derbyjarwithoutosgi" depends="checkosgijar" if="osgijar.unavailable">
 
-    <manifest file="${derby.jar.dir}/lists/smf.mf">
-      <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-      <attribute name="Bundle-Name" value="Apache Derby ${major}.${minor}"/>
-      <attribute name="Bundle-Version" value="${major}.${minor}.${maint}.${changenumber}"/>
-      <attribute name="Class-Path" value="derbyLocale_de_DE.jar derbyLocale_es.jar derbyLocale_fr.jar
derbyLocale_it.jar derbyLocale_ja_JP.jar derbyLocale_ko_KR.jar derbyLocale_pt_BR.jar derbyLocale_zh_CN.jar
derbyLocale_zh_TW.jar"/>
+    <antcall target="make-core-derbyjar-manifest"/>
 
-      	<attribute name="Sealed" value="true"/>
-    	<section name="org/apache/derby/impl/tools/sysinfo/">
-    	  <attribute name="Sealed" value="false"/>
-    	</section>
-    	<section name="org/apache/derby/iapi/services/context/">
-    	  <attribute name="Sealed" value="false"/>
-    	</section>
-    	<section name="org/apache/derby/iapi/services/info/">
-    	  <attribute name="Sealed" value="false"/>
-    	</section>
-    	<section name="org/apache/derby/jdbc/">
-    	  <attribute name="Sealed" value="false"/>
-    	</section>
-    	<section name="org/apache/derby/info/">
-    	  <attribute name="Sealed" value="false"/>
-    	</section>
-    	<section name="org/apache/derby/iapi/error/">
-    	  <attribute name="Sealed" value="false"/>
-    	</section>
-    	<section name="org/apache/derby/iapi/services/i18n/">
-    	  <attribute name="Sealed" value="false"/>
-    	</section>
-    		<section name="org/apache/derby/impl/jdbc/">
-    	  <attribute name="Sealed" value="false"/>
-    	</section>
-    		<section name="org/apache/derby/iapi/tools/i18n/">
-    	  <attribute name="Sealed" value="false"/>
-    	</section>
-    	<section name="org/apache/derby/loc/">
-    	  <attribute name="Sealed" value="false"/>
-    	</section>
-      	<section name="org/apache/derby/tools/">
-    	  <attribute name="Sealed" value="false"/>
-    	</section>
+    <jar destfile="${derby.jar.dir}/derby.jar"
+         basedir="${out.dir}"
+	 includesfile="${derby.jar.dir}/lists/derby.list"
+         compress="true"
+         filesonly="true"
+         manifest="${manifest.file}"/>
+
+  </target>
+
+  <target name="derbyjarwithosgi" depends="checkosgijar" if="osgijar.available">
+
+    <antcall target="make-core-derbyjar-manifest"/>
+
+    <!-- add extra osgi bits to manifest -->
+
+    <manifest file="${manifest.file}"  mode="update">
+      <attribute name="Bundle-Activator" value="org.apache.derby.osgi.EmbeddedActivator"/>
+      <attribute name="DynamicImport-Package" value="*"/>
+      <attribute name="Export-Package" value="org.apache.derby.authentication,org.apache.derby.database,org.apache.derby.io,org.apache.derby.jdbc,org.apache.derby.vti"/>

     </manifest> 
 
     <jar destfile="${derby.jar.dir}/derby.jar"
@@ -1049,30 +1031,29 @@
 	 includesfile="${derby.jar.dir}/lists/derby.list"
          compress="true"
          filesonly="true"
-         manifest="${derby.jar.dir}/lists/smf.mf"/>
+         manifest="${manifest.file}"/>
 
   </target>
 
-  <target name="derbyjarwithosgi" depends="checkosgijar" if="osgijar.available">
+  <target name="make-core-derbyjar-manifest">
 
-    <manifest file="${derby.jar.dir}/lists/smf.mf">
+    <manifest file="${manifest.file}">
       <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-      <attribute name="Bundle-Activator" value="org.apache.derby.osgi.EmbeddedActivator"/>
       <attribute name="Bundle-Name" value="Apache Derby ${major}.${minor}"/>
       <attribute name="Bundle-Version" value="${major}.${minor}.${maint}.${changenumber}"/>
-      <attribute name="DynamicImport-Package" value="*"/>
-      <attribute name="Export-Package" value="org.apache.derby.authentication,org.apache.derby.database,org.apache.derby.io,org.apache.derby.jdbc,org.apache.derby.vti"/>

+      <attribute name="Class-Path" value="derbyLocale_de_DE.jar derbyLocale_es.jar derbyLocale_fr.jar
derbyLocale_it.jar derbyLocale_ja_JP.jar derbyLocale_ko_KR.jar derbyLocale_pt_BR.jar derbyLocale_zh_CN.jar
derbyLocale_zh_TW.jar"/>
+
       	<attribute name="Sealed" value="true"/>
     	<section name="org/apache/derby/impl/tools/sysinfo/">
     	  <attribute name="Sealed" value="false"/>
     	</section>
-    	<section name="org/apache/derby/iapi/services/info/">
+    	<section name="org/apache/derby/iapi/services/context/">
     	  <attribute name="Sealed" value="false"/>
     	</section>
-    	<section name="org/apache/derby/jdbc/">
+    	<section name="org/apache/derby/iapi/services/info/">
     	  <attribute name="Sealed" value="false"/>
     	</section>
-    	<section name="org/apache/derby/iapi/services/context/">
+    	<section name="org/apache/derby/jdbc/">
     	  <attribute name="Sealed" value="false"/>
     	</section>
     	<section name="org/apache/derby/info/">
@@ -1093,7 +1074,7 @@
     	<section name="org/apache/derby/loc/">
     	  <attribute name="Sealed" value="false"/>
     	</section>
-      	<section name="org/apache/derby/tools">
+      	<section name="org/apache/derby/tools/">
     	  <attribute name="Sealed" value="false"/>
     	</section>
     </manifest> 
@@ -1103,7 +1084,7 @@
 	 includesfile="${derby.jar.dir}/lists/derby.list"
          compress="true"
          filesonly="true"
-         manifest="${derby.jar.dir}/lists/smf.mf"/>
+         manifest="${manifest.file}"/>
 
   </target>
 



Mime
View raw message