Changeset 19615


Ignore:
Timestamp:
2009-05-27T13:36:58+12:00 (12 years ago)
Author:
oranfry
Message:

fixed to creating cdrom components on linux and mac

Location:
release-kits/mark2/ant-scripts
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • release-kits/mark2/ant-scripts/create-cdrom-components.xml

    r19592 r19615  
    1010        <antcall target="compile-cdrom-installer"/> <!-- from init -->
    1111        <antcall target="prepare-cdrom-components"/>
     12        <antcall target="compile-cdrom-wrapper"/>
     13        <antcall target="create-cdrom-components-archive"/>
    1214    </target>
    1315
     
    1517
    1618        <delete dir="cdrom"/>
    17         <mkdir dir="cdrom/build"/>
    1819        <mkdir dir="cdrom/dist/Software"/>
    19         <mkdir dir="cdrom/dist/Java/Mac"/>
    20         <mkdir dir="cdrom/dist/Java/Jars"/>
    2120
    2221        <!-- core -->
    2322        <mkdir dir="cdrom/dist/Software/core/mac"/>
    24         <copy todir="components/tmp/cdrom/Software/core/mac" overwrite="true">
     23        <copy todir="cdrom/dist/Software/core/mac" overwrite="true">
    2524            <fileset dir="components/tmp/core">
    2625                <include name="bin/darwin"/>
     
    5049    </target>
    5150
     51    <target name="compile-cdrom-wrapper">
     52       
     53        <mkdir dir="wrapped-installer/cdrom"/>
     54        <!-- create app for cdrom installer -->
     55        <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app"><fileset dir="${mark2.home}/mac/Wrapper.app"/></copy>
     56        <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Resources" file="${mark2.home}/greenstone2/icon/icon.icns"/>
     57        <chmod file="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/MacOS/JavaApplicationStub" perm="+x"/>
     58
     59        <!-- copy bundled files -->
     60        <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Resources/Java" file="${basedir}/installer/cdrom.jar"/>
     61
     62        <!-- substitute in real values -->
     63        <rsr file="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Info.plist" pattern="@jar@" replacement="cdrom.jar"/>
     64        <rsr file="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
     65
     66    </target>
     67
     68    <target name="create-cdrom-components-archive">
     69        <mkdir dir="products"/>
     70        <exec dir="cdrom/dist" executable="bash">
     71            <arg value="-c"/>
     72            <arg value="tar -czf ../../products/cdrom-components-${version}-mac.tar.gz *"/>
     73        </exec>
     74    </target>
     75
     76
    5277</project>
  • release-kits/mark2/ant-scripts/wrap.xml

    r19537 r19615  
    33
    44    <target name="wrap">
    5         <antcall target="wrap-main-installer"/>
    6         <antcall target="wrap-cdrom-installer"/>
    7         <antcall target="archive-cdrom-components-and-installer"/>
    8     </target>
    95
    10     <target name="wrap-main-installer">
    116        <mkdir dir="products"/>
    127
     
    5146    </target>
    5247
    53     <target name="wrap-cdrom-installer">
    54         <mkdir dir="products"/>
    55         <!-- create app for cdrom installer -->
    56         <copy todir="${basedir}/wrapped-installer/cdrom.app"><fileset dir="${mark2.home}/mac/Wrapper.app"/></copy>
    57         <copy todir="${basedir}/wrapped-installer/cdrom.app/Contents/Resources" file="${mark2.home}/greenstone2/icon/icon.icns"/>
    58         <chmod file="${basedir}/wrapped-installer/cdrom.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>
    59 
    60         <!-- copy bundled files -->
    61         <copy todir="${basedir}/wrapped-installer/cdrom.app/Contents/Resources/Java" file="${basedir}/installer/cdrom.jar"/>
    62 
    63         <!-- substitute in real values -->
    64         <rsr file="${basedir}/wrapped-installer/cdrom.app/Contents/Info.plist" pattern="@jar@" replacement="cdrom.jar"/>
    65         <rsr file="${basedir}/wrapped-installer/cdrom.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
    66     </target>
    67 
    68     <target name="archive-cdrom-components-and-installer">
    69         <tar destfile="products/cdrom-components-${version}-mac.tar.gz" compression="gzip">
    70             <tarfileset dir="components/tmp"><include name="cdrom/**/*"/></tarfileset>
    71             <tarfileset dir="wrapped-installer"><include name="cdrom.app/**/*"/></tarfileset>
    72         </tar>
    73     </target>
    74 
    7548</project>
Note: See TracChangeset for help on using the changeset viewer.