Changeset 17786 for release-kits/wirk3

Show
Ignore:
Timestamp:
07.11.2008 14:36:58 (11 years ago)
Author:
oranfry
Message:

shifted the responsibility for the source release to the linux release kit. Made the source release contain a single component with the core and sourcecode mixed together

Location:
release-kits/wirk3
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • release-kits/wirk3/ant-scripts/create-components.xml

    r17721 r17786  
    1515        <antcall target="prepare-imagemagick-component" /> 
    1616        <antcall target="prepare-ghostscript-component" /> 
    17         <antcall target="prepare-sourcecode-component" /> 
    1817        <antcall target="prepare-ant-component" /> 
    1918        <antcall target="prepare-tomcat-component" /> 
    20         <antcall target="prepare-sourcecode-core-component" /> 
     19        <!--<antcall target="prepare-sourcecode-component" />--> 
    2120    </target> 
    2221     
     
    2524        <antcall target="compress-imagemagick-component" /> 
    2625        <antcall target="compress-ghostscript-component" /> 
    27         <antcall target="compress-sourcecode-component" /> 
    2826        <antcall target="compress-ant-component" /> 
    2927        <antcall target="compress-tomcat-component" /> 
    30         <antcall target="compress-sourcecode-core-component" /> 
     28        <!--<antcall target="compress-sourcecode-component" />--> 
    3129    </target> 
    3230     
     
    151149        <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 ant.lzma ant.comp"/></exec> 
    152150    </target> 
    153      
    154      
    155      
     151         
    156152    <target name="prepare-tomcat-component"> 
    157153        <delete dir="components/tmp/tomcat" quiet="true"/> 
     
    169165        <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 tomcat.lzma tomcat.comp"/></exec> 
    170166    </target>    
    171  
    172     <target name="prepare-sourcecode-core-component"> 
    173         <delete dir="components/tmp/sourcecode-core"/> 
    174         <mkdir dir="components/tmp/sourcecode-core"/> 
    175  
    176         <copy todir="components/tmp/sourcecode-core" overwrite="true"> 
    177             <fileset dir="distribution/source"> 
    178                 <include name="gli/**/*"/> 
    179                 <include name="docs/**/*"/> 
    180                 <include name="resources/**/*"/> 
    181                 <include name="web/**/*"/> 
    182                 <include name="gs2build/etc/**/*"/> 
    183                 <include name="gs2build/setup.bash"/> 
    184                 <include name="build.xml"/> 
    185                 <include name="build.properties"/> 
    186                 <include name="*.sh"/> 
    187                 <include name="*.txt"/> 
    188             </fileset> 
    189         </copy> 
    190         <zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false" includes="**/*"/> 
    191     </target> 
    192      
    193     <target name="compress-sourcecode-core-component"> 
    194         <!--<sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>--> 
    195         <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 sourcecode-core.lzma sourcecode-core.comp"/></exec> 
    196     </target> 
    197  
    198  
    199      
    200167     
    201168</project> 
  • release-kits/wirk3/ant-scripts/create-distribution.xml

    r17652 r17786  
    1010        <antcall target="insert-user-manual"/> 
    1111 
    12         <antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets --> 
    13  
    1412        <ant target="create-distribution-1" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false"> 
    1513            <property name="app.version" value="${version}"/> 
     
    1715            <property name="branch.revision" value="${branch.revision}"/> 
    1816        </ant> 
     17 
     18        <antcall target="insert-icon"/> 
     19        <antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk3-targets --> 
     20 
    1921        <ant target="create-distribution-2" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false"> 
    2022            <property name="app.version" value="${version}"/> 
     
    2931        <antcall target="copy-over-build-xml" /> 
    3032        <antcall target="insert-compiled-binaries"/> 
    31         <antcall target="insert-icon"/> 
    32         <antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk3-targets --> 
     33 
    3334    </target> 
    3435 
  • release-kits/wirk3/installer/antinstall-config.xml

    r17742 r17786  
    4242    </page> 
    4343 
     44    <!-- start binary release --> 
    4445    <page type="input" name="selector" displayText=""> 
    4546        <comment name="choose-components"/> 
     
    5354            hidden="true"/> 
    5455 
    55         <!-- start binary release core --> 
    5656        <target 
    5757            target="Installing Core System" 
     
    6060            defaultValue="true" 
    6161            force="true"/> 
    62         <!-- end binary release core --> 
    63  
    64         <!-- start source release core --> 
    65         <target 
    66             target="Installing Source Code Core" 
    67             diskRequirement="@component.size.sourcecode-core@" 
    68             displayText="" 
    69             defaultValue="true" 
    70             /> 
    71         <!-- end source release core --> 
    7262 
    7363        <target 
     
    10393        <!-- end bundled components --> 
    10494             
    105         <!-- start sourcecode --> 
    106         <target 
    107             target="Installing Source Code" 
    108             diskRequirement="@component.size.sourcecode@" 
    109             defaultValue="false" 
    110             displayText=""/> 
    111         <!-- end sourcecode --> 
    112  
    11395    </page> 
     96    <!-- end binary release --> 
    11497 
    11598    <!-- start bundled components --> 
  • release-kits/wirk3/installer/build.xml

    r17658 r17786  
    106106    </target> 
    107107 
    108     <target name="Installing Source Code Core"> 
    109  
    110         <!-- figure out the start menu path --> 
    111         <getfreepath path="${win32.personal.programs_menu}\Greenstone-@version@" property="startmenu.path"/> 
    112         <path id="startmenu.path.path" path="${startmenu.path}"/> 
    113         <pathconvert targetos="unix" property="startmenu.path.unix" refid="startmenu.path.path"/> 
    114                  
    115         <echo>basedir: ${basedir}</echo> 
    116         <echo>installDir: ${installDir}</echo> 
    117         <echo>antinstaller.jar: ${antinstaller.jar}</echo> 
    118         <echo>startmenu.path: ${startmenu.path}</echo> 
    119          
    120         <!-- create the installation directory --> 
    121         <echo message="Creating Installation directory"/> 
    122         <mkdir dir="${installDir}"/> 
    123  
    124         <!-- extract 7za tool --> 
    125         <unzip src="${antinstaller.jar}" dest="${basedir}"> 
    126             <patternset><include name="7za.exe"/></patternset> 
    127         </unzip> 
    128          
    129         <!-- install files --> 
    130         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip> 
    131         <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x sourcecode-core.lzma"/></exec> 
    132         <delete file="sourcecode-core.lzma"/> 
    133         <unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/> 
    134         <delete file="sourcecode-core.comp"/> 
    135  
    136         <!-- change the tomcat ports in build.properties --> 
    137         <echo message="Changing tomcat ports in build.properties"/> 
    138         <rsr file="${installDir}/build.properties" pattern="(tomcat.port[=:]).*" replacement="$1${tomcat.port}" /> 
    139         <rsr file="${installDir}/build.properties" pattern="(tomcat.shutdown.port[=:]).*" replacement="$1${tomcat.shutdown.port}" /> 
    140         <echo message="Changing tomcat ports in resources/tomcat/server.xml"/> 
    141         <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir.local}/packages/tomcat/conf/server.xml" overwrite="true"/> 
    142          
    143         <!-- set gsdlhome in gs2build setup.bat --> 
    144         <echo message="Setting %GSDLHOME% in gs2build\setup.bat"/> 
    145         <rsr file="${installDir}/gs2build/setup.bat" pattern="\*\*GSDLHOME\*\*" replacement="${installDir.local}\gs2build" /> 
    146         <!-- copy the greenstone3.xml file to tomcat --> 
    147         <echo message="Copying greenstone3.xml to tomcat directory"/> 
    148         <copy file="${installDir}/resources/tomcat/greenstone3.xml" tofile="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"/> 
    149         <rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="@gsdl3webhome@" replacement="${installDir.local}\web" /> 
    150  
    151         <!-- set up global properties --> 
    152         <echo message="Setting up global properties"/> 
    153         <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/> 
    154         <rsr file="${installDir}/web/WEB-INF/classes/global.properties"> 
    155             <job pattern="@gsdl3home@" replacement="${installDir.unix}/web" /> 
    156             <job pattern="@tomcat.server@" replacement="${tomcat.server}" /> 
    157             <job pattern="@tomcat.port@" replacement="${tomcat.port}" /> 
    158         </rsr> 
    159  
    160         <!-- set up log4j properties--> 
    161         <echo message="Setting up log4j properties"/> 
    162         <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/> 
    163         <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="@gsdl3home@" replacement="${installDir.unix}/web"/> 
    164  
    165         <!-- delete unneeded files -->       
    166         <delete dir="${installDir}/resources/icons"/> 
    167         <delete file="${installDir}/resources/*.png"/> 
    168          
    169         <echo message="Creating installation properties file"/> 
    170         <echo file="${installDir}\installation.properties">installed.startmenu.path:${startmenu.path.unix}</echo> 
    171          
    172     </target> 
    173  
    174  
    175     <!-- Source --> 
    176     <target name="Installing Source Code"> 
    177         <echo message="Installing Source Code (src)"/> 
    178         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip> 
    179         <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x sourcecode.lzma"/></exec> 
    180         <delete file="sourcecode.lzma"/> 
    181         <unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/> 
    182         <delete file="sourcecode.comp"/> 
    183     </target> 
    184108 
    185109    <target name="Installing Tomcat">