db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r1437995 - /db/derby/code/trunk/build.xml
Date Thu, 24 Jan 2013 13:39:36 GMT
Author: dag
Date: Thu Jan 24 13:39:36 2013
New Revision: 1437995

URL: http://svn.apache.org/viewvc?rev=1437995&view=rev
Log:
DERBY-5955 Prepare Derby to run with Compact Profiles (JEP 161) 

Patch derby-5955-add-cp2-to-jars. This add a new attribute to the
manifest in the jar files to make sure the user will get a good error
message if Derby is attempted run with compact profile less than 2,
i.e. CP1:

MANIFEST.MF:
:
Profile: compact2 
:

Cf. this quite in http://openjdk.java.net/jeps/161:

"jar — The JAR-file manifest specification will be extended with a new
attribute which can be used to specify the minimum Profile required by
the code in a JAR file."


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=1437995&r1=1437994&r2=1437995&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Thu Jan 24 13:39:36 2013
@@ -1530,6 +1530,7 @@
   <target name="make-locale-classpath-manifest">
       <manifest file="${manifest.file}" mode="${manifest.mode}">
           <attribute name="Class-Path" value="derbyLocale_cs.jar derbyLocale_de_DE.jar
derbyLocale_es.jar derbyLocale_fr.jar derbyLocale_hu.jar derbyLocale_it.jar derbyLocale_ja_JP.jar
derbyLocale_ko_KR.jar derbyLocale_pl.jar derbyLocale_pt_BR.jar derbyLocale_ru.jar derbyLocale_zh_CN.jar
derbyLocale_zh_TW.jar"/>
+      <attribute name="Profile" value="compact2"/>
       </manifest>
   </target>
 
@@ -1540,7 +1541,7 @@
       <attribute name="Bundle-Name" value="Apache Derby ${major}.${minor}"/>
       <attribute name="Bundle-Version" value="${major}.${minor}.${maint}.${changenumber}"/>
       <attribute name="Bundle-ManifestVersion" value="2"/>
-
+      <attribute name="Profile" value="compact2"/>
       	<attribute name="Sealed" value="true"/>
     	<section name="org/apache/derby/impl/tools/sysinfo/">
     	  <attribute name="Sealed" value="false"/>
@@ -1674,6 +1675,7 @@
     <manifest file="${derby.jar.dir}/lists/smfnet.mf">
       <attribute name="Main-Class" value="org.apache.derby.drda.NetworkServerControl"/>
       <attribute name="Class-Path" value="derby.jar"/>
+      <attribute name="Profile" value="compact2"/>
       	<attribute name="Sealed" value="true"/>
     	<section name="org/apache/derby/impl/drda/">
     	  <attribute name="Sealed" value="false"/>
@@ -1752,6 +1754,7 @@
       <attribute name="Bundle-SymbolicName" value="derbyclient"/>
       <attribute name="DynamicImport-Package" value="*"/>
       <attribute name="Export-Package" value="org.apache.derby.jdbc"/> 
+      <attribute name="Profile" value="compact2"/>
       <!-- See DERBY-4669. -->
       <section name="org/apache/derby/shared/common/sanity/">
         <attribute name="Sealed" value="false"/>
@@ -1798,6 +1801,7 @@
     
     <manifest file="${derby.jar.dir}/lists/smfcmd.mf">
       <attribute name="Main-Class" value="org.apache.derby.iapi.tools.run"/>
+      <attribute name="Profile" value="compact2"/>
       <attribute name="Class-Path" value="derby.jar derbyclient.jar derbytools.jar derbynet.jar"/>
     </manifest> 
  	
@@ -1902,9 +1906,15 @@
       <param name="info.productfile" value="derbyLocale_${locale.iname}.jar"/>
       <param name="info.file" value="${out.dir}/org/apache/derby/info/locale_${locale.iname}.properties"/>
     </antcall>   
+
+    <manifest file="${derby.jar.dir}/lists/smflocale.mf">
+      <attribute name="Profile" value="compact2"/>
+    </manifest>
+
     <jar destfile="${derby.jar.dir}/derbyLocale_${locale.iname}.jar"
          compress="true"
-	 filesonly="true">
+	 filesonly="true"
+	 manifest="${derby.jar.dir}/lists/smflocale.mf">
       <fileset dir="${out.dir}"
 	       includes="org/apache/derby/info/*_${locale.iname}.properties,
 	                 org/apache/derby/loc/*_${locale.iname}.properties,



Mime
View raw message