Changeset 19456


Ignore:
Timestamp:
2009-05-14T09:30:01+12:00 (15 years ago)
Author:
oranfry
Message:

readmes will now make it into distribution, also fixed mark2 to produce cdrom components, and removed unused code

Location:
release-kits
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r19396 r19456  
    3434                <include name="**/*"/>
    3535
    36                 <!-- exclude sourcecode + imagemagick + build files -->
    37                 <exclude name="common-src"/>
    38                 <exclude name="common-src/**/*"/>
    39                 <exclude name="runtime-src"/>
    40                 <exclude name="runtime-src/**/*"/>
    41                 <exclude name="build-src"/>
    42                 <exclude name="build-src/**/*"/>
     36                <!-- exclude imagemagick -->
    4337                <exclude name="bin/linux/imagemagick"/>
    4438                <exclude name="bin/linux/imagemagick/**/*"/>
    45 
    46                 <exclude name="acconfig.h"/>
    47                 <exclude name="aclocal.m4"/>
    48                 <exclude name="config.guess"/>
    49                 <exclude name="config.sub"/>
    50                 <exclude name="configtest.pl"/>
    51                 <exclude name="configure"/>
    52                 <exclude name="configure.in"/>
    53                 <exclude name="install-sh"/>
    54                 <exclude name="Makefile.in"/>
    55                 <exclude name="micotest.cpp"/>
    56                 <exclude name="config.h.in"/>
    57                 <exclude name="Install.txt"/>
    58 
    59                 <exclude name="README*.txt"/>
    60                 <include name="READMEen.txt"/>
    6139
    6240            </fileset>
    … …  
    6947    </target>
    7048
    71     <!-- sourcecode -->
    72     <target name="prepare-sourcecode-component">
    73 
    74         <delete dir="components/tmp/sourcecode"/>
    75         <mkdir dir="components/tmp/sourcecode"/>
    76 
    77         <exec dir="${basedir}" executable="cp">
    78             <arg line="-r distributions/web/common-src distributions/web/build-src distributions/web/runtime-src components/tmp/sourcecode"/>
    79         </exec>
    80         <exec dir="distributions/web" executable="cp">
    81             <arg line="acconfig.h aclocal.m4 config.guess config.sub configtest.pl configure configure.in install-sh Makefile.in micotest.cpp config.h.in Install.txt ${basedir}/components/tmp/sourcecode"/>
    82         </exec>
    83                
    84         <mkdir dir="products"/>
    85         <!-- create a script to create the tar -->
    86         <echo output="create-sourcecode-component.sh">
    87         tar -czf ../../../products/Greenstone-${version}-${os.suffix}-sourcecode-component.tar.gz *
    88         </echo>
    89         <chmod perm="+x" file="create-sourcecode-component.sh"/>
    90 
    91         <!-- run it -->
    92         <exec dir="components/tmp/sourcecode" executable="/bin/bash">
    93             <arg line="${basedir}/create-sourcecode-component.sh"/>
    94         </exec>
    95 
    96         <!-- remove it -->
    97         <delete file="create-sourcecode-component.sh"/>
    98 
    99     </target>
    100    
    101     <target name="compress-sourcecode-component">
    102         <sevenzip task="encode" input="components/sourcecode.comp" output="components/sourcecode.lzma" dictionnary="26"/>
    103     </target>
    104    
    10549    <!-- imagemagick -->
    10650    <target name="prepare-imagemagick-component">
    … …  
    15195        </move>
    15296
    153         <!-- imagemagick (all linux specific) -->
     97        <!-- imagemagick (completely linux specific) -->
    15498        <mkdir dir="components/tmp/cdrom/imagemagick/linux"/>
    15599        <copy todir="components/tmp/cdrom/imagemagick/linux" overwrite="true">
    … …  
    157101        </copy>
    158102
    159 
    160         <!-- sourcecode -->
    161         <mkdir dir="components/tmp/cdrom/sourcecode/all"/>
    162         <mkdir dir="components/tmp/cdrom/sourcecode/linux"/>
    163         <copy todir="components/tmp/cdrom/sourcecode/all" overwrite="true">
    164             <fileset dir="components/tmp/sourcecode"/>
    165         </copy>
    166         <move todir="components/tmp/cdrom/sourcecode/linux" overwrite="true">
    167             <fileset dir="components/tmp/cdrom/sourcecode/all">
    168                 <include name="acconfig.h"/>
    169                 <include name="aclocal.m4"/>
    170                 <include name="config.guess"/>
    171                 <include name="config.sub"/>
    172                 <include name="configtest.pl"/>
    173                 <include name="configure"/>
    174                 <include name="configure.in"/>
    175                 <include name="install-sh"/>
    176                 <include name="Makefile.in"/>
    177                 <include name="micotest.cpp"/>
    178                 <include name="config.h.in"/>
    179             </fileset>
    180         </move>
    181 
     103        <!-- archive the cd components -->
    182104        <tar destfile="products/cdrom-components-${version}-linux.tar.gz" basedir="components/tmp/cdrom" compression="gzip"/>
    183105       

  • release-kits/mark2/ant-scripts/create-components.xml

    r19396 r19456  
    88        <antcall target="prepare-components" />
    99        <antcall target="compress-components" />
     10        <antcall target="produce-cd-components"/>
    1011    </target>
    1112
    … …  
    4445                <include name="**/*"/>
    4546
    46                 <!-- exclude sourcecode + imagemagick + build files -->
    47                 <exclude name="common-src"/>
    48                 <exclude name="common-src/**/*"/>
    49                 <exclude name="runtime-src"/>
    50                 <exclude name="runtime-src/**/*"/>
    51                 <exclude name="build-src"/>
    52                 <exclude name="build-src/**/*"/>
     47                <!-- exclude imagemagick + ghostscript -->
    5348                <exclude name="bin/darwin/imagemagick"/>
    5449                <exclude name="bin/darwin/imagemagick/**/*"/>
    5550                <exclude name="bin/darwin/ghostscript"/>
    5651                <exclude name="bin/darwin/ghostscript/**/*"/>
    57 
    58                 <exclude name="acconfig.h"/>
    59                 <exclude name="aclocal.m4"/>
    60                 <exclude name="config.sub"/>
    61                 <exclude name="configtest.pl"/>
    62                 <exclude name="configure"/>
    63                 <exclude name="configure.in"/>
    64                 <exclude name="install-sh"/>
    65                 <exclude name="Makefile.in"/>
    66                 <exclude name="micotest.cpp"/>
    67                 <exclude name="config.h.in"/>
    68                 <exclude name="Install.txt"/>
    69 
    70                 <exclude name="README*.txt"/>
    71                 <include name="READMEen.txt"/>
    72 
    7352
    7453            </fileset>
    … …  
    7958    <target name="compress-core-component">
    8059        <sevenzip task="encode" input="components/core.comp" output="components/core.lzma" dictionnary="26"/>
    81     </target>
    82 
    83     <!-- sourcecode -->
    84     <target name="prepare-sourcecode-component">
    85 
    86         <delete dir="components/tmp/sourcecode"/>
    87         <mkdir dir="components/tmp/sourcecode"/>
    88 
    89         <exec dir="${basedir}" executable="cp">
    90             <arg line="-r distributions/web/common-src distributions/web/build-src distributions/web/runtime-src components/tmp/sourcecode"/>
    91         </exec>
    92         <exec dir="distributions/web" executable="cp">
    93             <arg line="acconfig.h aclocal.m4 config.guess config.sub configtest.pl configure configure.in install-sh Makefile.in micotest.cpp config.h.in Install.txt ${basedir}/components/tmp/sourcecode"/>
    94         </exec>
    95                
    96         <mkdir dir="products"/>
    97 
    98         <!-- create a script to create the tar -->
    99         <echo output="create-sourcecode-component.sh">
    100         tar -czf ../../../products/Greenstone-${version}-${os.suffix}-sourcecode-component.tar.gz *
    101         </echo>
    102         <chmod perm="+x" file="create-sourcecode-component.sh"/>
    103 
    104         <!-- run it -->
    105         <exec dir="components/tmp/sourcecode" executable="/bin/bash">
    106             <arg line="${basedir}/create-sourcecode-component.sh"/>
    107         </exec>
    108 
    109         <!-- remove it -->
    110         <delete file="create-sourcecode-component.sh"/>
    111 
    112     </target>
    113 
    114     <target name="compress-sourcecode-component">
    115         <sevenzip task="encode" input="components/sourcecode.comp" output="components/sourcecode.lzma" dictionnary="26"/>
    11660    </target>
    11761
    … …  
    15498    </target>
    15599
     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        <!-- archive the cd components -->
     142        <tar destfile="products/cdrom-components-${version}-mac.tar.gz" basedir="components/tmp/cdrom" compression="gzip"/>
     143       
     144    </target>
     145
     146
    156147</project>

  • release-kits/shared/greenstone2/ant-scripts/rk2-targets.xml

    r19439 r19456  
    2222    <target name="drop-in-docs">
    2323        <echo level="info">Dropping gsdl docs into distribution</echo>
     24        <!--
    2425        <copy todir="${gsdl.basedir}" overwrite="true">
    2526            <fileset dir="${rk.home}/greenstone2/docs"/>
    2627        </copy>
     28        -->
     29        <copy file="${rk.home}/greenstone2/docs/READMEen.txt" todir="${gsdl.basedir}" overwrite="true">
    2730    </target>
    2831
    … …  
    143146
    144147    <target name="dist-clean-sourcecode">
     148
     149        <!-- delete the sourcecode -->
    145150        <delete>
    146151            <fileset dir="distributions/web" includes="Makefile,config.cache,config.h,config.log,stamp-h,config.status"/>
    … …  
    149154        <delete dir="distributions/web/build-src"/>
    150155        <delete dir="distributions/web/runtime-src"/>
     156        <delete>
     157            <fileset dir="distributions/web" includes="acconfig.h,aclocal.m4,config.guess,config.sub,configtest.pl,configure,configure.in,install-sh,Makefile.in,micotest.cpp,config.h.in"/>
     158        </delete>
     159
    151160        <!--
    152161        <svn>

  • release-kits/wirk2/ant-scripts/create-components.xml

    r19396 r19456  
    4141                    <exclude name="bin/windows/ghostscript"/>
    4242                    <exclude name="bin/windows/ghostscript/**/*"/>
    43 
    44                     <!-- exclude sourcecode -->
    45                     <exclude name="common-src"/>
    46                     <exclude name="common-src/**/*"/>
    47                     <exclude name="runtime-src"/>
    48                     <exclude name="runtime-src/**/*"/>
    49                     <exclude name="build-src"/>
    50                     <exclude name="build-src/**/*"/>
    5143                   
    52                     <!-- exclude buildfiles -->
    53                     <exclude name="win32.mak"/>
    54                     <exclude name="win32cfg.h"/>
    55                     <exclude name="makegs2.bat"/>
    56                     <exclude name="Install.txt"/>
    57                    
    58                     <!-- exclude all readmes but the english one -->
    59                     <exclude name="READMEfr.txt"/>
    60                     <exclude name="READMEes.txt"/>
    61                     <exclude name="READMEru.txt"/>
    62                     <exclude name="READMEar.txt"/>
    63                    
    64                                        
    6544                </fileset>
    6645        </copy>
    … …  
    6948    </target>
    7049   
    71    
    7250    <target name="compress-core-component">
    7351        <!-- <sevenzip task="encode" input="${basedir}/components/core.comp" output="${basedir}/components/core.lzma" dictionnary="26"/> -->
    7452        <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 core.lzma core.comp"/></exec>
    7553    </target>
    76    
    77    
    7854   
    7955    <target name="prepare-imagemagick-component">
    … …  
    9470    </target>
    9571   
    96    
    97    
    9872    <target name="prepare-ghostscript-component">
    9973        <delete dir="components/tmp/ghostscript" quiet="true"/>
    … …  
    11185        <!-- <sevenzip task="encode" input="${basedir}/components/ghostscript.comp" output="${basedir}/components/ghostscript.lzma" dictionnary="26"/> -->
    11286        <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 ghostscript.lzma ghostscript.comp"/></exec>
    113     </target>
    114    
    115    
    116    
    117     <target name="prepare-sourcecode-component">
    118         <delete dir="components/tmp/sourcecode" quiet="true"/>
    119         <mkdir dir="components/tmp/sourcecode"/>
    120         <copy todir="components/tmp/sourcecode" overwrite="true">
    121                 <fileset dir="distributions/web">
    122                     <include name="common-src/**/*"/>
    123                     <include name="runtime-src/**/*"/>
    124                     <include name="build-src/**/*"/>
    125                     <include name="win32.mak"/>
    126                     <include name="win32cfg.h"/>
    127                     <include name="makegs2.bat"/>
    128                     <include name="Install.txt"/>
    129                 </fileset>
    130         </copy>
    131                
    132         <mkdir dir="products"/>
    133         <zip destfile="products/Greenstone-${version}-${os.suffix}-sourcecode-component.zip" basedir="components/tmp/sourcecode" compress="true"/>
    13487    </target>
    13588
    … …  
    165118        </copy>
    166119       
    167         <!-- sourcecode -->
    168         <mkdir dir="components/tmp/cdrom/sourcecode/windows"/>
    169         <copy todir="components/tmp/cdrom/sourcecode/windows" overwrite="true">
    170             <fileset dir="components/tmp/sourcecode">
    171                 <include name="win32.mak"/>
    172                 <include name="win32cfg.h"/>
    173                 <include name="makegs2.bat"/>
    174             </fileset>
    175         </copy>
     120        <tar destfile="products/cdrom-components-${version}-windows.tar.gz" basedir="components/tmp/cdrom" compression="gzip"/>
    176121
    177                 <tar destfile="products/cdrom-components-${version}-windows.tar.gz" basedir="components/tmp/cdrom" compression="gzip"/>
    178 
    179         </target>
     122    </target>
    180123       
    181124</project>
Note: See TracChangeset for help on using the changeset viewer.