Changeset 19537

Show
Ignore:
Timestamp:
20.05.2009 10:17:35 (10 years ago)
Author:
oranfry
Message:

work on creating the cdrom installers and putting them with the cdrom components

Location:
release-kits
Files:
6 modified

Legend:

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

    r19460 r19537  
    100100            <fileset dir="components/tmp/imagemagick"/> 
    101101        </copy> 
    102  
    103         <!-- archive the cd components --> 
    104         <mkdir dir="products"/> 
    105         <tar destfile="products/cdrom-components-${version}-linux.tar.gz" basedir="components/tmp/cdrom" compression="gzip"/> 
    106102         
    107103    </target> 
  • release-kits/lirk2/ant-scripts/wrap.xml

    r19510 r19537  
    77        <antcall target="compile-wrapper-web"/> 
    88        <antcall target="compile-wrapper-cdrom"/> 
     9        <antcall target="archive-cdrom-components-and-installer"/> 
    910    </target> 
    1011 
     
    7172 
    7273    <target name="compile-wrapper-web" depends="calculate-object-sizes"> 
    73  
     74        <mkdir dir="products"/> 
    7475        <echo level="info">creating wrapper header file</echo> 
    7576        <delete file="wrapper.h"/> 
     
    8586        <echo level="info">link the compiled code and bundled files</echo> 
    8687        <exec executable="g++" dir="${basedir}/wrapped-installer"> 
    87             <arg line="-static -static-libgcc -o ../products/Greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone2.jar.o java.o"/> 
     88            <arg line="-static -static-libgcc -o ../products/Greenstone-${version}-linux wrapper.o libsearch4j.o greenstone2.jar.o java.o"/> 
    8889        </exec> 
    8990 
     
    9192 
    9293    <target name="compile-wrapper-cdrom" depends="calculate-object-sizes"> 
    93  
    9494        <echo level="info">creating wrapper header file</echo> 
    9595        <delete file="wrapper.h"/> 
     
    105105        <echo level="info">link the compiled code and bundled files</echo> 
    106106        <exec executable="g++" dir="${basedir}/wrapped-installer"> 
    107             <arg line="-static -static-libgcc -o ../products/cdrom-linux.bin wrapper.o libsearch4j.o cdrom.jar.o java.o"/> 
     107            <arg line="-static -static-libgcc -o ../wrapped-installer/cdrom-linux wrapper.o libsearch4j.o cdrom.jar.o java.o"/> 
    108108        </exec> 
    109109 
    110110    </target> 
    111111 
     112    <target name="archive-cdrom-components-and-installer"> 
     113        <mkdir dir="products"/> 
     114        <tar destfile="products/cdrom-components-${version}-linux.tar.gz" compression="gzip"> 
     115            <tarfileset dir="components/tmp"><include name="cdrom/**/*"/></tarfileset> 
     116            <tarfileset dir="wrapped-installer"><include name="cdrom-linux"/></tarfileset> 
     117        </tar> 
     118    </target> 
     119 
    112120</project> 
  • release-kits/mark2/ant-scripts/create-components.xml

    r19480 r19537  
    138138            <fileset dir="components/tmp/ghostscript"/> 
    139139        </copy> 
    140  
    141         <!-- archive the cd components --> 
    142         <mkdir dir="products"/> 
    143         <tar destfile="products/cdrom-components-${version}-mac.tar.gz" basedir="components/tmp/cdrom" compression="gzip"/> 
    144140         
    145141    </target> 
  • release-kits/mark2/ant-scripts/wrap.xml

    r19510 r19537  
    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> 
    59 
    6         <!-- create products directory --> 
     10    <target name="wrap-main-installer"> 
    711        <mkdir dir="products"/> 
    812 
     
    1216 
    1317        <!-- create app for main installer --> 
    14             <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app"><fileset dir="${mark2.home}/mac/Wrapper.app"/></copy> 
    15             <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources" file="${mark2.home}/greenstone2/icon/icon.icns"/> 
    16             <chmod file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/> 
     18        <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app"><fileset dir="${mark2.home}/mac/Wrapper.app"/></copy> 
     19        <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources" file="${mark2.home}/greenstone2/icon/icon.icns"/> 
     20        <chmod file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/> 
    1721 
    18             <!-- copy bundled files --> 
    19             <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources/Java" file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}.jar"/> 
     22        <!-- copy bundled files --> 
     23        <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources/Java" file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}.jar"/> 
    2024 
    21             <!-- substitute in real values --> 
    22             <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@jar@" replacement="Greenstone-${version}-MacOS-${processor}.jar"/> 
    23             <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/> 
     25        <!-- substitute in real values --> 
     26        <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@jar@" replacement="Greenstone-${version}-MacOS-${processor}.jar"/> 
     27        <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/> 
    2428 
    2529 
    26         <!-- create app for cdrom installer --> 
    27             <copy todir="${basedir}/products/cdrom.app"><fileset dir="${mark2.home}/mac/Wrapper.app"/></copy> 
    28             <copy todir="${basedir}/products/cdrom.app/Contents/Resources" file="${mark2.home}/greenstone2/icon/icon.icns"/> 
    29             <chmod file="${basedir}/products/cdrom.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/> 
    30  
    31             <!-- copy bundled files --> 
    32             <copy todir="${basedir}/products/cdrom.app/Contents/Resources/Java" file="${basedir}/installer/cdrom.jar"/> 
    33  
    34             <!-- substitute in real values --> 
    35             <rsr file="${basedir}/products/cdrom.app/Contents/Info.plist" pattern="@jar@" replacement="cdrom.jar"/> 
    36             <rsr file="${basedir}/products/cdrom.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/> 
    37  
    38         <!-- wrap main app in a dmg --> 
     30        <!-- turn app into a dmg --> 
    3931 
    4032        <!-- get size of app --> 
     
    5648        <!-- unmount it--> 
    5749        <exec executable="hdiutil"><arg line="detach /Volumes/${dmg.name}"/></exec> 
     50 
     51    </target> 
     52 
     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> 
    5873    </target> 
    5974 
  • release-kits/wirk2/ant-scripts/create-components.xml

    r19466 r19537  
    118118        </copy> 
    119119 
    120         <!-- archive the cd components --> 
    121         <mkdir dir="products"/> 
    122         <tar destfile="products/cdrom-components-${version}-windows.tar.gz" basedir="components/tmp/cdrom" compression="gzip"/> 
    123  
    124120    </target> 
    125121         
  • release-kits/wirk2/ant-scripts/wrap.xml

    r19008 r19537  
    109109    </target> 
    110110 
     111    <target name="archive-cdrom-components-and-installer"> 
     112        <mkdir dir="products"/> 
     113        <tar destfile="products/cdrom-components-${version}-linux.tar.gz" compression="gzip"> 
     114            <tarfileset dir="components/tmp"><include name="cdrom/**/*"/></tarfileset> 
     115            <tarfileset dir="wrapped-installer"><include name="cdrom-windows.exe"/></tarfileset> 
     116        </tar> 
     117    </target> 
     118 
    111119</project>