Changeset 17422

Show
Ignore:
Timestamp:
01.10.2008 11:58:04 (11 years ago)
Author:
oranfry
Message:

made the create-components targets more stable

Location:
release-kits
Files:
1 added
11 modified

Legend:

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

    r17268 r17422  
    2020 
    2121        <!-- search4j --> 
    22         <antcall target="compile-search4j" /> <!-- from rk2-targets --> 
     22        <antcall target="compile-search4j-unix" /> <!-- from rk2-targets --> 
    2323 
    2424        <!-- uninstaller --> 
  • release-kits/lirk2/ant-scripts/create-components.xml

    r17396 r17422  
    2828        <copy todir="components/tmp/core" overwrite="true"> 
    2929            <fileset dir="distributions/web"> 
    30                 <include name="gli/**/*"/> 
    31                 <include name="bin/**/*"/> 
    32                 <include name="cgi-bin/**/*"/> 
    33                 <include name="etc/**/*"/> 
    34                 <include name="mappings/**/*"/> 
    35                 <include name="images/**/*"/> 
    36                 <include name="perllib/**/*"/> 
    37                 <include name="indexers/**/*"/> 
    38                 <include name="macros/**/*"/> 
    39                 <include name="collect/**/*"/> 
    40                 <include name="*"/> 
     30                <include name="**/*"/> 
     31 
     32                <!-- sourcecode --> 
     33                <exclude name="common-src/**/*"/> 
     34                <exclude name="runtime-src/**/*"/> 
     35                <exclude name="build-src/**/*"/> 
     36 
    4137            </fileset> 
    4238        </copy> 
  • release-kits/lirk3/ant-scripts/compile.xml

    r17345 r17422  
    2828 
    2929        <!-- search4j --> 
    30         <antcall target="compile-search4j" /> <!-- from rk3-targets --> 
     30        <antcall target="compile-search4j-unix" /> <!-- from rk3-targets --> 
    3131 
    3232        <!-- uninstaller --> 
  • release-kits/lirk3/ant-scripts/create-installer.xml

    r17281 r17422  
    1515        <copy todir="${basedir}/installer/classes" overwrite="true"> 
    1616            <fileset dir="${lirk3.home}/greenstone3/installer-classes"/> 
     17            <fileset dir="${lirk3.home}/distribution/greenstone3/LICENSE.txt"/> 
    1718        </copy> 
     19 
    1820        <unjar src="${lirk3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/> 
    1921        <delete dir="${basedir}/installer/classes/META-INF"/> 
     22 
     23        <unjar src="${lirk3.home}/ant-scripts/tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/> 
     24        <delete dir="${basedir}/installer/classes/META-INF"/> 
     25 
    2026    </target> 
    2127 
    2228    <target name="compile-installer"> 
    23  
    24         <installer file="${basedir}/installer/greenstone3-with-java.jar" 
    25                 compress="true" 
    26                 extractType="NonExtractor" 
    27                 installConfig="${basedir}/installer/antinstall-config.xml" 
    28                 buildFile="${basedir}/installer/build.xml" 
    29                 antInstallLib="${lirk3.home}/packages/ant-installer/lib" 
    30                 antLib="${lirk3.home}/packages/ant/lib" 
    31                 validateConfig="true" 
    32                 icons="bluecurve"> 
    33  
    34             <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> <!-- installer classes --> 
    35             <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*"/> 
    36  
    37         </installer> 
    38  
    39         <!-- delete the bundled java lines from the installer config --> 
    40         <dcff 
    41             file="${basedir}/installer/antinstall-config.xml" 
    42             startTag=".*&lt;!-- start bundled java only --&gt;" 
    43             endTag=".*&lt;!-- end bundled java only --&gt;"/> 
    4429 
    4530        <installer file="${basedir}/installer/greenstone3.jar" 
     
    5439 
    5540            <zipfileset dir="${basedir}/installer/classes" includes="**/*"/> 
    56             <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*"/> 
     41            <zipfileset dir="${basedir}/components" includes="*.lzma"/> 
    5742        </installer> 
     43 
     44        <dcff 
     45            file="${basedir}/installer/antinstall-config.xml" 
     46            startTag=".*&lt;!-- start full --&gt;" 
     47            endTag=".*&lt;!-- end full --&gt;"/> 
     48 
     49        <installer file="${basedir}/installer/Greenstone-${version}-linux-minimal.jar" 
     50                compress="true" 
     51                extractType="NonExtractor" 
     52                installConfig="${basedir}/installer/antinstall-config.xml" 
     53                buildFile="${basedir}/installer/build.xml" 
     54                antInstallLib="${lirk3.home}/packages/ant-installer/lib" 
     55                antLib="${lirk3.home}/packages/ant/lib" 
     56                validateConfig="true" 
     57                icons="bluecurve"> 
     58 
     59            <zipfileset dir="${basedir}/installer/classes" includes="**/*"/> 
     60            <zipfileset dir="${basedir}/components" includes="core.lzma"/> 
     61        </installer> 
     62 
    5863 
    5964    </target> 
  • release-kits/lirk3/installer/antinstall-config.xml

    r17281 r17422  
    4040            force="true"/> 
    4141 
    42         <!-- start bundled java only --> 
     42        <!-- start full --> 
    4343        <target 
    44             target="install-java" 
     44            target="install-linux-java" 
    4545            diskRequirement="@component.size.linux-java@" 
    4646            defaultValue="true" 
    4747            displayText=""/> 
    48         <!-- end bundled java only --> 
    4948 
    5049        <target 
     
    5958            defaultValue="true" 
    6059            displayText=""/> 
     60        <!-- end full --> 
    6161 
    6262        <target 
  • release-kits/lirk3/installer/build.xml

    r17257 r17422  
    105105    </target> 
    106106 
    107     <target name="install-java"> 
     107    <target name="install-linux-java"> 
    108108        <echo>Installing bundled java</echo> 
    109109        <copy todir="${installDir}/packages/jre"> 
    110             <fileset dir="../@java.extracted@"/> 
     110            <fileset dir="../@linux-java.extracted@"/> 
    111111        </copy> 
    112112        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>        
  • release-kits/mark2/ant-scripts/compile.xml

    r17268 r17422  
    1818 
    1919        <!-- search4j --> 
    20         <antcall target="compile-search4j" /> <!-- from rk2-targets --> 
     20        <antcall target="compile-search4j-unix" /> <!-- from rk2-targets --> 
    2121 
    2222        <!-- uninstaller --> 
  • release-kits/mark2/installer/build.xml

    r17257 r17422  
    117117    </target> 
    118118 
    119     <target name="install-java"> 
    120         <echo message="Installing bundled java"/> 
    121         <copy todir="${installDir}/packages/jre"> 
    122             <fileset dir="../@java.extracted@"/> 
    123         </copy> 
    124         <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>        
    125     </target> 
    126  
    127     <target name="cleanuptarget"> 
    128     </target> 
     119    <target name="cleanuptarget"></target> 
    129120     
    130121 
  • release-kits/mark3/ant-scripts/compile.xml

    r17348 r17422  
    2626 
    2727        <!-- search4j --> 
    28         <antcall target="compile-search4j" /> <!-- from rk3-targets --> 
     28        <antcall target="compile-search4j-unix" /> <!-- from rk3-targets --> 
    2929 
    3030        <!-- uninstaller --> 
  • release-kits/wirk2/ant-scripts/create-components.xml

    r17414 r17422  
    11<?xml version="1.0" encoding="utf-8" ?> 
    2 <project name="wirk3-create-components" default="create-components"> 
     2<project name="wirk2-create-components" default="create-components"> 
    33 
    44    <!-- create components from the distribution folder --> 
     
    4242        <copy todir="components/tmp/core" overwrite="true"> 
    4343                <fileset dir="distributions/web"> 
    44                     <include name="gli/**/*"/> 
    45                     <include name="bin/**/*"/> 
     44                    <include name="/**/*"/> 
     45                 
     46                    <!-- imagemagick --> 
     47                    <exclude name="bin/windows/imagemagick/**/*"/> 
     48 
     49                    <!-- ghostscript --> 
     50                    <exclude name="bin/windows/ghostscript/**/*"/> 
     51 
     52                    <!-- sourcecode --> 
     53                    <exclude name="common-src/**/*"/> 
     54                    <exclude name="runtime-src/**/*"/> 
     55                    <exclude name="build-src/**/*"/> 
    4656                     
    47                     <exclude name="bin/windows/imagemagick/**/*"/> 
    48                     <exclude name="bin/windows/ghostscript/**/*"/> 
    49                      
    50                     <include name="cgi-bin/**/*"/> 
    51                     <include name="etc/**/*"/> 
    52                     <include name="mappings/**/*"/> 
    53                     <include name="images/**/*"/> 
    54                     <include name="perllib/**/*"/> 
    55                     <include name="indexers/**/*"/> 
    56                     <include name="macros/**/*"/> 
    57                     <include name="collect/**/*"/> 
    58  
    59                     <include name="LICENSE.txt"/> 
    60                     <include name="READMEar.txt"/> 
    61                     <include name="READMEes.txt"/> 
    62                     <include name="READMEen.txt"/> 
    63                     <include name="READMEfr.txt"/> 
    64                     <include name="READMEru.txt"/> 
    65                     <include name="setup.bat"/> 
    66                     <include name="server.exe"/> 
    67                     <include name="Uninstall.jar"/> 
    68                     <include name="gsdlsite.cfg"/> 
    6957                </fileset> 
    7058        </copy> 
  • release-kits/wirk3/ant-scripts/create-components.xml

    r17419 r17422  
    5555                 
    5656        <copy todir="components/tmp/core" overwrite="true"> 
    57                 <fileset dir="distribution/greenstone3"> 
    58                     <include name="bin/**/*"/> 
    59                     <include name="docs/**/*"/> 
    60                     <include name="gli/**/*"/> 
    61                     <include name="gs2build/**/*"/> 
    62                      
    63                     <exclude name="gs2build/common-src/**/*"/> 
    64                     <exclude name="gs2build/build-src/**/*"/> 
    65                     <exclude name="gs2build/runtime-src/**/*"/> 
    66                     <exclude name="gs2build/bin/windows/imagemagick/**/*"/> 
    67                     <exclude name="gs2build/bin/windows/ghostscript/**/*"/> 
    68                      
    69                     <include name="lib/**/*"/> 
    70                     <include name="web/**/*"/> 
    71                     <include name="resources/**/*"/> 
    72                     <include name="winutil/**/*"/> 
     57            <fileset dir="distribution/greenstone3"> 
     58                <include name="**/*"/> 
    7359 
    74                     <include name="greenstone3-build.xml"/> 
    75                     <include name="build.properties"/> 
    76                     <include name="gs3-server.bat"/> 
    77                     <include name="gs3-setup.bat"/> 
    78                     <include name="LICENSE.txt"/> 
    79                     <include name="README.txt"/> 
    80                     <include name="server.jar"/> 
    81                     <include name="Uninstall.jar"/> 
    82                 </fileset> 
     60                <!-- exclude ghostscript --> 
     61                <exclude name="gs2build/bin/windows/ghostscript/**/*"/> 
     62 
     63                <!-- exclude imagemagick --> 
     64                <exclude name="gs2build/bin/windows/imagemagick/**/*"/> 
     65 
     66                <!-- exclude sourcecode --> 
     67                <include name="src/**/*"/> 
     68                <exclude name="gs2build/common-src/**/*"/> 
     69                <exclude name="gs2build/build-src/**/*"/> 
     70                <exclude name="gs2build/runtime-src/**/*"/> 
     71                 
     72                <!-- exclude ant --> 
     73                <exclude name="packages/ant/**/*"/> 
     74 
     75                <!-- exclude tomcat --> 
     76                <exclude name="packages/tomcat/**/*"/> 
     77 
     78            </fileset> 
    8379        </copy> 
    8480