Ignore:
Timestamp:
2010-06-30T10:24:48+12:00 (14 years ago)
Author:
sjm84
Message:

Several upgrades to the release kits have been made including: optional Apache and the ability to create installers with extensions

Location:
main/trunk/release-kits/kits/rk2
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/release-kits/kits/rk2/ant-scripts/components.xml

    r22110 r22325  
    11<!-- an ant project containing authoritative definitions of the components of greenstone3 -->
    22<project name="components">
     3 
     4  <!-- source component - files that get compiled and could be safely removed from a binary distribution -->
     5  <patternset id="greenstone2.source.component">
     6    <include name="gli/src"/>
     7    <include name="gli/src/**/*"/>
     8    <include name="common-src"/>
     9    <include name="common-src/**/*"/>
     10    <include name="build-src"/>
     11    <include name="build-src/**/*"/>
     12    <include name="runtime-src"/>
     13    <include name="runtime-src/**/*"/>
     14    <include name="aclocal.m4"/>
     15    <include name="config.guess"/>
     16    <include name="config.h.in"/>
     17    <include name="config.sub"/>
     18    <include name="configure"/>
     19    <include name="configure.in"/>
     20    <include name="install-sh"/>
     21    <include name="Makefile.in"/>
     22    <include name="win32.mak"/>
     23    <include name="win32cfg.h"/>
     24  </patternset>
     25 
     26  <!-- imagemagick -->
     27  <patternset id="greenstone2.imagemagick.component">
     28    <include name="bin/**/imagemagick"/>
     29    <include name="bin/**/imagemagick/**/*"/>
     30  </patternset>
     31 
     32  <!-- ghostscript -->
     33  <patternset id="greenstone2.ghostscript.component">
     34    <include name="bin/**/ghostscript"/>
     35    <include name="bin/**/ghostscript/**/*"/>
     36  </patternset>
    337
    4     <!-- source component - files that get compiled and could be safely removed from a binary distribution -->
    5     <patternset id="greenstone2.source.component">
    6         <include name="gli/src"/>
    7         <include name="gli/src/**/*"/>
    8         <include name="common-src"/>
    9         <include name="common-src/**/*"/>
    10         <include name="build-src"/>
    11         <include name="build-src/**/*"/>
    12         <include name="runtime-src"/>
    13         <include name="runtime-src/**/*"/>
    14         <include name="aclocal.m4"/>
    15         <include name="config.guess"/>
    16         <include name="config.h.in"/>
    17         <include name="config.sub"/>
    18         <include name="configure"/>
    19         <include name="configure.in"/>
    20         <include name="install-sh"/>
    21         <include name="Makefile.in"/>
    22         <include name="win32.mak"/>
    23         <include name="win32cfg.h"/>
    24     </patternset>
    25 
    26     <!-- imagemagick -->
    27     <patternset id="greenstone2.imagemagick.component">
    28         <include name="imagemagick"/>
    29         <include name="imagemagick/**/*"/>
    30     </patternset>
    31 
    32     <!-- ghostscript -->
    33     <patternset id="greenstone2.ghostscript.component">
    34         <include name="ghostscript"/>
    35         <include name="ghostscript/**/*"/>
    36     </patternset>
    37 
    38     <!-- the core component - defined by antithesis -->
    39     <patternset id="greenstone2.core.component">
    40         <invert>
    41             <patternset refid="greenstone2.source.component"/>
    42             <patternset refid="greenstone2.imagemagick.component"/>
    43             <patternset refid="greenstone2.ghostscript.component"/>
    44         </invert>
    45     </patternset>
    46 
     38  <!-- apache httpd --> 
     39  <patternset id="greenstone2.apachehttpd.component">
     40    <include name="apache-httpd"/>
     41    <include name="apache-httpd/**/*"/>
     42  </patternset>
     43 
     44  <!-- the core component - defined by antithesis -->
     45  <patternset id="greenstone2.core.component">
     46    <invert>
     47      <patternset refid="greenstone2.source.component"/>
     48      <patternset refid="greenstone2.imagemagick.component"/>
     49      <patternset refid="greenstone2.ghostscript.component"/>
     50      <patternset refid="greenstone2.apachehttpd.component"/>
     51    </invert>
     52  </patternset>
     53 
    4754</project>
    4855

  • main/trunk/release-kits/kits/rk2/ant-scripts/create-cdrom-components.xml

    r22161 r22325  
    3838                    <include name="cgi-bin/library.cgi"/>
    3939                    <include name="cgi-bin/oaiserver.cgi"/>
    40                     <include name="apache-httpd/**/*"/>
    4140                    <include name="*.sh"/>
    4241                    <include name="*.csh"/>
    … …  
    7372                    <include name="cgi-bin/library.cgi"/>
    7473                    <include name="cgi-bin/oaiserver.cgi"/>
    75                     <include name="apache-httpd"/>
    76                     <include name="apache-httpd/**/*"/>
    7774                    <include name="*.sh"/>
    7875                    <include name="*.csh"/>
    … …  
    9491            <unzip src="components/ghostscript.comp" dest="cdrom/dist/Software/ghostscript/${rk.os}" overwrite="true"/>
    9592        </if>
    96 
     93       
     94        <!-- apache httpd -->
     95        <unzip src="components/apachehttpd.comp" dest="cdrom/dist/Software" overwrite="true"/>
     96       
    9797        <!-- jre linux -->
    9898        <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>

  • main/trunk/release-kits/kits/rk2/ant-scripts/create-components.xml

    r21623 r22325  
    1010        <antcall target="create-component"><param name="component" value="imagemagick"/></antcall>
    1111
     12        <!-- apache httpd -->
     13        <antcall target="create-component"><param name="component" value="apachehttpd"/></antcall>
     14
    1215        <!-- windows and mac only -->
    1316        <if><bool><or><equals arg1="${rk.os}" arg2="windows"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>

  • main/trunk/release-kits/kits/rk2/installer/antinstall-config.xml

    r20056 r22325  
    6262    </page>
    6363
    64     <!-- conmponents -->
     64    <!-- components -->
    6565    <page type="input" name="selector" displayText="">
    6666        <comment name="choose-components"/>
    … …  
    8282            defaultValue="true"
    8383            force="true"/>
     84
     85        <target
     86                target="Installing Apache Web Server"
     87            diskRequirement="@component.size.httpd@"
     88            displayText=""
     89            defaultValue="true"/>
    8490
    8591        <target

  • main/trunk/release-kits/kits/rk2/installer/build.xml

    r22131 r22325  
    120120        <!-- if linux|mac -->
    121121        <chmod dir="${installDir}/bin/${shell.name}" includes="**/*" perm="775"/>
    122         <chmod dir="${installDir}/apache-httpd/${shell.name}/bin" includes="*" perm="775"/>
    123         <chmod dir="${installDir}/apache-httpd/${shell.name}" includes="*.sh" perm="775"/>
    124122        <!-- /if -->
    125123
    … …  
    155153            >cgiarg          shortname=l argdefault=${language}</echo>
    156154
    157         <!-- if linux|mac -->
    158         <echo>Setting up apache web server</echo>
    159         <exec dir="${installDir}" executable="${installDir}/apache-httpd/${shell.name}/install-bindist.sh">
    160             <arg value="${installDir}/apache-httpd/${shell.name}"/>
    161         </exec>
    162         <!-- /if -->
    163 
    164155        <echo message="Creating installation properties file"/>
    165156        <!-- if linux|mac -->
    … …  
    170161        <!-- /if -->
    171162       
     163    </target>
     164
     165    <!-- Apache HTTPD  -->
     166    <target name="Installing Apache Web Server">
     167      <echo>Installing the Apache Web Server</echo>
     168     
     169      <!-- start web -->
     170      <unzip src="${antinstaller.jar}" dest="${basedir}">
     171        <patternset>
     172          <include name="apachehttpd.lzma"/>
     173        </patternset>
     174      </unzip>
     175
     176      <!-- if linux|mac -->
     177      <sevenzip task="decode" input="${basedir}/apachehttpd.lzma" output="${basedir}/imagemagick.comp"/>
     178      <!-- /if -->
     179      <!-- if windows -->
     180      <exec dir="${basedir}" executable="${basedir}/7za.exe">
     181        <arg line="x apachehttpd.lzma"/>
     182      </exec>
     183      <!-- /if -->
     184      <!-- end web -->
     185
     186      <!-- start cdrom -->
     187      <copy todir="${installDir}">
     188        <fileset dir="${orig.dir}/Software/apache-httpd"/>
     189      </copy>
     190      <!-- end cdrom -->
     191
     192      <!-- if linux|mac -->
     193      <chmod dir="${installDir}/apache-httpd/${shell.name}/bin" includes="*" perm="775"/>
     194      <chmod dir="${installDir}/apache-httpd/${shell.name}" includes="*.sh" perm="775"/>
     195      <echo>Setting up apache web server</echo>
     196      <exec dir="${installDir}" executable="${installDir}/apache-httpd/${shell.name}/install-bindist.sh">
     197        <arg value="${installDir}/apache-httpd/${shell.name}"/>
     198      </exec>
     199      <!-- /if -->
    172200    </target>
    173201
Note: See TracChangeset for help on using the changeset viewer.