You are viewing a plain text version of this content. The canonical link for it is here.

Posted to derby-commits@db.apache.org by fu...@apache.org on 2006/08/22 09:07:05 UTC

svn commit: r433548 - /db/derby/code/branches/10.2/build.xml

Author: fuzzylogic
Date: Tue Aug 22 00:07:05 2006
New Revision: 433548

URL: http://svn.apache.org/viewvc?rev=433548&view=rev
Log:
Merge fixes for DERBY-1730 and DERBY-744 to the 10.2 branch.

Modified:
    db/derby/code/branches/10.2/build.xml

Modified: db/derby/code/branches/10.2/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/build.xml?rev=433548&r1=433547&r2=433548&view=diff
==============================================================================
--- db/derby/code/branches/10.2/build.xml (original)
+++ db/derby/code/branches/10.2/build.xml Tue Aug 22 00:07:05 2006
@@ -71,7 +71,7 @@
       <or>
         <equals arg1="${sane}" arg2="true"/>
         <not>
-          <isset property="${sane}"/>
+          <isset property="sane"/>
         </not>
       </or>
     </condition>
@@ -328,7 +328,7 @@
     <ant dir="${derby.build.src.dir}"/>
   </target>
 
-  <target name="demo">
+  <target name="demo" depends="buildsource">
     <ant dir="${derby.demo.src.dir}"/>
   </target>
 
@@ -1041,7 +1041,7 @@
 
     <!-- add extra osgi bits to manifest -->
 
-    <manifest file="${manifest.file}"  mode="update">
+    <manifest file="${derby.jar.dir}/lists/smf.mf"  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"/>