← Back to branch summary

~ubuntu-branches/ubuntu/maverick/eucalyptus/maverick

« back to all changes in this revision

Viewing changes to clc/modules/storage-controller/build.xml

  • Committer: Bazaar Package Importer
  • Author(s): Dave Walker (Daviey)
  • Date: 2010-07-21 17:27:10 UTC
  • mfrom: (1.1.38 upstream)
  • Revision ID: james.westby@ubuntu.com-20100721172710-7xv07dmdqgivc3t9
Tags: 2.0~bzr1211-0ubuntu1
https://launchpad.net/bugs/597330
https://launchpad.net/bugs/595421
* New major upstream version merge, 2.0 (r1211).
* debian/patches/:
  - 01-wsdl-stubs.patch, debian/wsdl.md5sums: wsdl stubs updated.
  - 02-Makefile.patch: Updated to reflect new code layout.
  - 07-local_support_euca_conf-in.patch: Updated to reflect new code layout.
  - 08-ubuntu-default-networking.patch: Refreshed.
  - 09-small-128-192MB.patch: Updated to point to new location.
  - 10-disable-iscsi.patch: Refreshed.
  - 11-state-cleanup-memleakfix.patch: Removed, fixed upstream.
  - 15-fix-default-ramdisk.patch: Updated to point to new location.
  - 16-kvm_libvirt_xml_default_use_kvm.patch: Updated to reflect changes.
  - 17-fix_walrus_OOM_errors.patch: Removed, fixed upstream.
  - 18-priv_security.patch: Updated to reflect upstream changes.
  - 20-brute-force-webui.patch: Updated to reflect upstream changes. 
  - 21-eucalyptus-1.7-with-gwt-1.6.4.patch: New patch, allows 
    eucalyptus-1.7 to be built against gwt 1.6.4. Based on patch courtesy 
    of Dmitrii Zagorodnov, upstream. (LP: #597330)
* debian/eucalyptus-java-common.links: 
  - Changed symlink for groovy, point to groovy.all.jar, making compatiable 
    with groovy versions >1.7. (LP: #595421)
  - Added ant.jar & jetty-rewrite-handler.jar as they are now required.
* debian/control
  - & debian/build-jars: Added libjavassist-java and libjetty-extra-java as 
    build dependencies.
  - Added libjetty-extra-java as a dependency of eucalyptus-java-common
* The binary resulting jar's have been renamed from eucalyptus-*-1.6.2.jar
  to eucalyptus-*-main.jar:    
  - debian/eucalyptus-cc.upstart
  - debian/eucalyptus-cloud.install
  - debian/eucalyptus-common.eucalyptus.upstart
  - debian/eucalyptus-java-common.install
  - debian/eucalyptus-network.upstart
  - debian/eucalyptus-sc.install
  - debian/eucalyptus-walrus.install
* debian/eucalyptus-java-common.install: New upstream jars that have been
  installed:
  - eucalyptus-db-hsqldb-ext-main.jar
  - eucalyptus-component-main.jar
* debian/control:
  - Updated Standards Version to 3.8.4 (no change)
  - Updated the upstream Homepage to: http://open.eucalyptus.com/
  - Changed Vcs-Bzr to reflect new location of Ubuntu hosted development branch.
  - Made the Build Dependency of groovy and the binary eucalyptus-java-common
    package depend on version >=1.7.

Show diffs side-by-side

added added

removed removed

Lines of Context:
clc/modules/storage-controller/build.xml
64
64
 
65
65
<project name="eucalyptus-storagecontroller" basedir=".">
66
66
 
67
 
  <import file="../module-inc.xml"/>
68
 
  <target name="builder" depends="init,build-java,build-jni,jar"/>
69
 
    <!--================================== BUILD TARGETS ==================================-->
70
 
    <target name="build-jni">
71
 
        <mkdir dir="include"/>
72
 
        <javah classpath="${build.dir}" destdir="include" force="yes">
73
 
            <class name="edu.ucsb.eucalyptus.storage.LVM2Manager"/>
74
 
            <class name="edu.ucsb.eucalyptus.storage.AOEManager"/>
75
 
        </javah>
76
 
    </target>
 
67
        <import file="../module-inc.xml" />
 
68
        <!--================================== BUILD TARGETS ==================================-->
 
69
  <property name="builder.suffix" value="jni" />
 
70
        <target name="build-jni">
 
71
                <antcall target="build-java" />
 
72
    <antcall target="jar" />
 
73
                <mkdir dir="include" />
 
74
                <javah classpath="${build.dir}" destdir="include" force="yes">
 
75
                        <class name="com.eucalyptus.storage.OverlayManager" />
 
76
                        <class name="com.eucalyptus.storage.AOEManager" />
 
77
                </javah>
 
78
        </target>
77
79
 
78
 
    <target name="clean-jni">
79
 
        <delete dir="h"/>
80
 
        <delete dir="include"/>
81
 
    </target>
 
80
        <target name="clean-jni">
 
81
                <delete dir="h" />
 
82
                <delete dir="include" />
 
83
        </target>
82
84
</project>
83
85