Changeset 19592 for release-kits

Show
Ignore:
Timestamp:
25.05.2009 15:30:41 (11 years ago)
Author:
oranfry
Message:

separating out cdrom code for linux and mac too

Location:
release-kits
Files:
3 added
7 modified

Legend:

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

    r19154 r19592  
    3030    <import file="create-installer.xml"/> 
    3131    <import file="wrap.xml"/> 
     32    <import file="create-cdrom-components.xml"/> 
    3233 
    3334    <!-- THE MAIN TARGET --> 
     
    3839        <antcall target="create-installer"/> 
    3940        <antcall target="wrap"/> 
     41        <antcall target="create-cdrom-components"/> 
    4042    </target> 
    4143 
  • release-kits/lirk2/ant-scripts/create-components.xml

    r19537 r19592  
    88        <antcall target="prepare-components" /> 
    99        <antcall target="compress-components" /> 
    10         <antcall target="produce-cd-components"/> 
    1110    </target> 
    1211 
     
    6665    </target> 
    6766 
    68     <!-- 
    69         cd components 
    70         produce components for cdrom distributions, to be picked up and used by cdrk2 release kit 
    71         split components into linux only files (linux) and general files (all) 
    72     --> 
    73     <target name="produce-cd-components"> 
    74         <delete dir="components/tmp/cdrom"/> 
    75         <mkdir dir="components/tmp/cdrom"/> 
    76  
    77         <!-- core --> 
    78         <mkdir dir="components/tmp/cdrom/core/all"/> 
    79         <mkdir dir="components/tmp/cdrom/core/linux"/> 
    80         <copy todir="components/tmp/cdrom/core/all" overwrite="true"> 
    81             <fileset dir="components/tmp/core"/> 
    82         </copy> 
    83         <move todir="components/tmp/cdrom/core/linux" overwrite="true"> 
    84             <fileset dir="components/tmp/cdrom/core/all"> 
    85                 <include name="bin/linux"/> 
    86                 <include name="bin/linux/**/*"/> 
    87                 <include name="bin/windows"/> 
    88                 <include name="bin/windows/**/*"/> 
    89                 <include name="apache-httpd/linux"/> 
    90                 <include name="apache-httpd/linux/**/*"/> 
    91                 <include name="*.sh"/> 
    92                 <include name="*.csh"/> 
    93                 <include name="*.bash"/> 
    94             </fileset> 
    95         </move> 
    96  
    97         <!-- imagemagick (completely linux specific) --> 
    98         <mkdir dir="components/tmp/cdrom/imagemagick/linux"/> 
    99         <copy todir="components/tmp/cdrom/imagemagick/linux" overwrite="true"> 
    100             <fileset dir="components/tmp/imagemagick"/> 
    101         </copy> 
    102          
    103     </target> 
    104  
    10567</project> 
  • release-kits/lirk2/ant-scripts/create-installer.xml

    r19510 r19592  
    66        <antcall target="make-installer-files-concrete"><param name="java.os" value="linux"/></antcall> <!-- from init --> 
    77        <antcall target="compile-binary-installer"/> <!-- from init --> 
    8         <antcall target="compile-cdrom-installer"/> <!-- from init --> 
    98    </target> 
    109 
  • release-kits/lirk2/ant-scripts/wrap.xml

    r19537 r19592  
    66        <antcall target="create-objects"/> 
    77        <antcall target="compile-wrapper-web"/> 
    8         <antcall target="compile-wrapper-cdrom"/> 
    9         <antcall target="archive-cdrom-components-and-installer"/> 
    108    </target> 
    119 
     
    3432 
    3533        <echo level="info">create an object file (extension .o) for each file to bundle</echo> 
    36         <!-- jar (web) --> 
     34        <!-- jar --> 
    3735        <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer"> 
    3836            <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone2_jar_start=greenstone2jar --readonly-text greenstone2.jar greenstone2.jar.o"/> 
    39         </exec> 
    40         <!-- jar (cdrom) --> 
    41         <exec executable="/usr/bin/objcopy" dir="installer"> 
    42             <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_cdrom_jar_start=greenstone2jar --readonly-text cdrom.jar ../wrapped-installer/cdrom.jar.o"/> 
    4337        </exec> 
    4438        <!-- java --> 
     
    6054        <exec executable="ls" dir="wrapped-installer" outputproperty="greenstone2.jar.ls"><arg line="-l greenstone2.jar"/></exec> 
    6155        <exec executable="sed" inputstring="${greenstone2.jar.ls}" outputproperty="greenstone2.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 
    62  
    63         <!-- jar(cdrom) --> 
    64         <exec executable="ls" dir="installer" outputproperty="cdrom.jar.ls"><arg line="-l cdrom.jar"/></exec> 
    65         <exec executable="sed" inputstring="${cdrom.jar.ls}" outputproperty="cdrom.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 
    6656 
    6757        <!-- java --> 
     
    9181    </target> 
    9282 
    93     <target name="compile-wrapper-cdrom" depends="calculate-object-sizes"> 
    94         <echo level="info">creating wrapper header file</echo> 
    95         <delete file="wrapper.h"/> 
    96         <exec executable="echo" output="${basedir}/wrapped-installer/wrapper.h"><arg line="extern const char greenstone2jar[${cdrom.jar.size}];"/></exec> 
    97         <exec executable="echo" output="${basedir}/wrapped-installer/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec> 
    98         <exec executable="echo" output="${basedir}/wrapped-installer/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec> 
    99  
    100         <echo level="info">compile the wrapper program</echo> 
    101         <exec executable="g++" dir="wrapped-installer"> 
    102             <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/> 
    103         </exec> 
    104  
    105         <echo level="info">link the compiled code and bundled files</echo> 
    106         <exec executable="g++" dir="${basedir}/wrapped-installer"> 
    107             <arg line="-static -static-libgcc -o ../wrapped-installer/cdrom-linux wrapper.o libsearch4j.o cdrom.jar.o java.o"/> 
    108         </exec> 
    109  
    110     </target> 
    111  
    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  
    12083</project> 
  • release-kits/mark2/ant-scripts/build.xml

    r19154 r19592  
    3232    <import file="create-installer.xml"/> 
    3333    <import file="wrap.xml"/> 
     34    <import file="create-cdrom-components.xml"/> 
    3435 
    3536    <!-- TARGET TO PERFORM ADDITIONAL PRECONDITION CHECKS --> 
     
    5758        <antcall target="create-installer"/> 
    5859        <antcall target="wrap"/> 
     60        <antcall target="create-cdrom-components"/> 
    5961    </target> 
    6062 
  • release-kits/mark2/ant-scripts/create-components.xml

    r19537 r19592  
    88        <antcall target="prepare-components" /> 
    99        <antcall target="compress-components" /> 
    10         <antcall target="produce-cd-components"/> 
    1110    </target> 
    1211 
     
    9897    </target> 
    9998 
    100     <!-- 
    101         cd components 
    102         produce components for cdrom distributions, to be picked up and used by cdrk2 release kit 
    103         split components into mac only files (mac) and general files (all) 
    104     --> 
    105     <target name="produce-cd-components"> 
    106         <delete dir="components/tmp/cdrom"/> 
    107         <mkdir dir="components/tmp/cdrom"/> 
    108  
    109         <!-- core --> 
    110         <mkdir dir="components/tmp/cdrom/core/all"/> 
    111         <mkdir dir="components/tmp/cdrom/core/mac"/> 
    112         <copy todir="components/tmp/cdrom/core/all" overwrite="true"> 
    113             <fileset dir="components/tmp/core"/> 
    114         </copy> 
    115         <move todir="components/tmp/cdrom/core/mac" overwrite="true"> 
    116             <fileset dir="components/tmp/cdrom/core/all"> 
    117                 <include name="bin/darwin"/> 
    118                 <include name="bin/darwin/**/*"/> 
    119                 <include name="bin/windows"/> 
    120                 <include name="bin/windows/**/*"/> 
    121                 <include name="apache-httpd/darwin"/> 
    122                 <include name="apache-httpd/darwin/**/*"/> 
    123                 <include name="*.sh"/> 
    124                 <include name="*.csh"/> 
    125                 <include name="*.bash"/> 
    126             </fileset> 
    127         </move> 
    128  
    129         <!-- imagemagick (completely mac specific) --> 
    130         <mkdir dir="components/tmp/cdrom/imagemagick/mac"/> 
    131         <copy todir="components/tmp/cdrom/imagemagick/mac" overwrite="true"> 
    132             <fileset dir="components/tmp/imagemagick"/> 
    133         </copy> 
    134  
    135         <!-- ghostscript (completely mac specific) --> 
    136         <mkdir dir="components/tmp/cdrom/ghostscript/mac"/> 
    137         <copy todir="components/tmp/cdrom/ghostscript/mac" overwrite="true"> 
    138             <fileset dir="components/tmp/ghostscript"/> 
    139         </copy> 
    140          
    141     </target> 
    142  
    143  
    14499</project> 
  • release-kits/mark2/ant-scripts/create-installer.xml

    r19510 r19592  
    66        <antcall target="make-installer-files-concrete"/>  <!-- from init --> 
    77        <antcall target="compile-binary-installer"/> <!-- from init --> 
    8         <antcall target="compile-cdrom-installer"/> <!-- from init --> 
    98    </target> 
    109