Changeset 22325

Show
Ignore:
Timestamp:
30.06.2010 10:24:48 (9 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
Files:
10 modified

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 
  • main/trunk/release-kits/kits/rk3/installer/antinstall-config.xml

    r20060 r22325  
    102102            displayText=""/> 
    103103 
     104        <!-- start amp --> 
     105        <target 
     106           target="Installing AMP" 
     107           diskRequirement="@component.size.amp@" 
     108           defaultValue="true" 
     109           displayText=""/> 
     110        <!-- end amp --> 
     111 
    104112        <!-- if windows --> 
    105113        <target 
  • main/trunk/release-kits/kits/rk3/installer/build.xml

    r21890 r22325  
    175175 
    176176    </target> 
     177 
     178    <!-- start amp --> 
     179 
     180    <target name="Installing AMP"> 
     181      <echo>Installing Apache, MySQL and PHP</echo> 
     182      <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="amp.lzma"/></patternset></unzip> 
     183      <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x amp.lzma"/></exec><!-- /if --> 
     184      <!-- if linux|mac --><sevenzip task="decode" input="${basedir}/amp.lzma" output="${basedir}/amp.comp"/><!-- /if --> 
     185      <delete file="amp.lzma"/> 
     186      <unzip src="${basedir}/amp.comp" dest="${installDir}/ext/amp"/> 
     187      <delete file="amp.comp"/> 
     188       
     189      <!-- if linux|mac --> 
     190      <echo>Setting binaries to executable</echo> 
     191      <chmod dir="${installDir}/ext/amp" includes="*" perm="775"/> 
     192      <!-- /if --> 
     193    </target> 
     194 
     195    <!-- end amp --> 
    177196 
    178197    <target name="Installing Tomcat"> 
  • main/trunk/release-kits/shared/core/ant-scripts/create-installer.xml

    r22132 r22325  
    7878        <property name="component.size.imagemagick" value="${component.megabytesize.imagemagick} MB"/> 
    7979 
    80         <!-- calculate the size of: ghostscript --> 
    81         <length property="component.bytesize.ghostscript" mode="all"><fileset file="${basedir}/components/ghostscript.comp"/></length> 
    82         <math result="component.megabytesize.ghostscript" operand1="${component.bytesize.ghostscript}" operation="/" operand2="1048576" datatype="int"/> 
    83         <property name="component.size.ghostscript" value="${component.megabytesize.ghostscript} MB"/> 
    84  
     80        <!-- calculate the size of: apache httpd --> 
     81        <length property="component.bytesize.httpd" mode="all"><fileset file="${basedir}/components/apachehttpd.comp"/></length> 
     82        <math result="component.megabytesize.httpd" operand1="${component.bytesize.httpd}" operation="/" operand2="1048576" datatype="int"/> 
     83        <property name="component.size.httpd" value="${component.megabytesize.httpd} MB"/> 
     84         
    8585        <!-- calculate the size of: tomcat --> 
    8686        <length property="component.bytesize.tomcat" mode="all"><fileset file="${basedir}/components/tomcat.comp"/></length> 
     
    8888        <property name="component.size.tomcat" value="${component.megabytesize.tomcat} MB"/> 
    8989 
     90        <!-- EXT --> 
     91        <!-- calculate the size of: amp (and put it into the components directory) --> 
     92        <if><bool><and><equals arg1="${amp.enabled}" arg2="true"/><not><available file="${rk.home}/ext/amp.lzma"/></not></and></bool> 
     93          <fail>amp.lzma file not found in the release kit ext directory</fail> 
     94        </if> 
     95 
     96        <if><bool><and><equals arg1="${amp.enabled}" arg2="true"/></and></bool> 
     97          <echo>Copying amp.lzma to compontents directory</echo> 
     98          <copy file="${rk.home}/ext/amp.lzma" todir="${basedir}/components"/> 
     99          <property name="component.size.amp" value="257 MB"/> 
     100        </if> 
     101        <!-- /EXT --> 
     102 
    90103        <!-- make the installer descriptors relevant to the current os --> 
    91104        <dcff file="installer/antinstall-config.xml" startTag="&lt;!--\s*if\s*(?!.*${rk.os})[^ ]+\s*--&gt;" endTag="&lt;!--\s*/if\s*--&gt;" /> 
    92105        <dcff file="installer/build.xml" startTag="&lt;!--\s*if\s*(?!.*${rk.os})[^ ]+\s*--&gt;" endTag="&lt;!--\s*/if\s*--&gt;" /> 
     106 
     107        <!-- EXT --> 
     108        <if><bool><not><equals arg1="${amp.enabled}" arg2="true"/></not></bool> 
     109           
     110          <dcff file="installer/antinstall-config.xml" startTag="&lt;!-- start amp --&gt;" endTag="&lt;!-- end amp --&gt;" /> 
     111          <dcff file="installer/build.xml" startTag="&lt;!-- start amp --&gt;" endTag="&lt;!-- end amp --&gt;" /> 
     112        </if> 
     113        <!-- /EXT --> 
    93114 
    94115        <!-- put the concrete values of things in the config --> 
     
    100121            <job pattern="@component.size.imagemagick@" replacement="${component.size.imagemagick}"/> 
    101122            <job pattern="@component.size.ghostscript@" replacement="${component.size.ghostscript}"/> 
     123            <job pattern="@component.size.httpd@" replacement="${component.size.httpd}"/> 
    102124            <job pattern="@java.min.version@" replacement="${java.min.version}"/> 
    103125            <job pattern="@java.extracted@" replacement="${java.extracted}"/> 
    104126        </rsr> 
     127 
     128        <!-- EXT --> 
     129        <if><bool><equals arg1="${amp.enabled}" arg2="true"/></bool> 
     130          <rsr> 
     131            <fileset dir="${basedir}/installer" includes="*.xml"/> 
     132            <job pattern="@component.size.amp@" replacement="${component.size.amp}"/> 
     133          </rsr> 
     134        </if> 
     135        <!-- /EXT --> 
    105136 
    106137        <!-- put the concrete values of things in the text --> 
  • main/trunk/release-kits/shared/core/ant-scripts/shared.xml

    r22179 r22325  
    377377    <target name="create-component"> 
    378378      <mkdir dir="components"/> 
    379       <if> 
    380         <bool> 
    381           <equals arg1="${version.major}" arg2="2"/> 
    382         </bool> 
    383          
    384         <if> 
    385           <bool> 
    386         <or> 
    387           <equals arg1="${component}" arg2="imagemagick"/> 
    388           <equals arg1="${component}" arg2="ghostscript"/> 
    389         </or> 
    390           </bool> 
    391            
    392           <zip destfile="components/${component}.comp" compress="false"> 
    393         <zipfileset dir="compiled/bin/${os.shell}"> 
    394           <patternset refid="greenstone${version.major}.${component}.component"/> 
    395         </zipfileset> 
    396           </zip> 
    397            
    398           <else> 
    399         <zip destfile="components/${component}.comp" compress="false"> 
    400           <zipfileset dir="compiled"> 
    401             <patternset refid="greenstone${version.major}.${component}.component"/> 
    402           </zipfileset> 
    403         </zip> 
    404           </else> 
    405         </if> 
    406          
    407         <else> 
    408           <zip destfile="components/${component}.comp" compress="false"> 
    409         <zipfileset dir="compiled"> 
    410           <patternset refid="greenstone${version.major}.${component}.component"/> 
    411         </zipfileset> 
    412           </zip> 
    413         </else> 
    414       </if> 
     379       
     380      <zip destfile="components/${component}.comp" compress="false"> 
     381        <zipfileset dir="compiled"> 
     382          <patternset refid="greenstone${version.major}.${component}.component"/> 
     383        </zipfileset> 
     384      </zip> 
     385     
    415386      <!-- windows --> 
    416387      <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool> 
  • main/trunk/release-kits/shared/core/language-strings/LanguagePack.properties

    r20964 r22325  
    3333Looking_For_Previous_Installation.explanatoryText=If this is an over-install, load some properties of the existing installation to aid the installation process. 
    3434 
     35### EXT ### 
     36Installing_AMP.displayText=Apache HTTPD (2.2.15), MySQL (5.1.47) and PHP (5.3.2) 
     37Installing_AMP.explanatoryText=<html>This component will install the Apache HTTPD web server, complete with MySQL (a database system) and PHP (a scripting language used for server-side coding).</html> 
     38### /EXT ### 
     39 
    3540Installing_Core_System.displayText=Core System 
    3641Installing_Core_System.explanatoryText=<html>This is the core Greenstone@version.major@ system. It is a required component.</html> 
     
    4853Installing_Ghostscript.explanatoryText=Greenstone uses GhostScript to process PDF and PostScript files.\n\n If you have Ghostscript on your computer already, or if you don't wish to\ninclude PDF of PostScript files in Greenstone collections, then you may choose\nnot to install Ghostscript. 
    4954 
     55Installing_Apache_Web_Server.displayText=Apache Web Server 
     56Installing_Apache_Web_Server.explanatoryText=To serve Greenstone digital library content a web server is needed. \nThe open-source Apache web server is one such example, and as \npart of this installation process a pre-configured Apache web server \n-- ready to run out of the box -- is installed by selecting this option. \nIf you already have an existing web server installed then you can \nchoose to deselect this option to avoid having the pre-configured \nversion installed, however you will need to adjust the configuration settings of \nyour existing web server to link correctly to this Greenstone installation. \nIf you are unsure about this option it is recommended you leave it selected, \nas the configuration file it installs is a good starting place to learn \nwhat configuration options need to go into any existing web servers. 
     57 
    5058Installing_Start_Menu_Shortcuts.displayText=Start Menu Shortcuts 
    5159Installing_Start_Menu_Shortcuts.explanatoryText=Create shortcuts to Greenstone@version.major@ on your Start Menu 
     
    5967Installing_Documented_Examples.displayText=Documented Example Collections 
    6068Installing_Documented_Examples.explanatoryText=A set of example collections, whose 'about' pages describe how they were created.\n\nEven if you don't install the Documented Examples now, you can get them from\nhttp://www.greenstone.org/ or from the greenstone CD-ROM. 
    61  
    6269 
    6370### Admin password page