greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 17663

Show
Ignore:
Timestamp:
2008-10-31 17:00:47 (2 months ago)
Author:
oranfry
Message:

fixes to lirk and mark

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • release-kits/lirk2/installer/build.xml

    r17650 r17663  
    5353                <chmod dir="${installDir}" includes="*.sh,*.bash" perm="775"/> 
    5454                <chmod dir="${installDir}/bin/linux" includes="*" perm="775"/> 
     55                <chmod dir="${installDir}/bin/linux/imagemagick" includes="*" perm="775"/> 
    5556                <chmod dir="${installDir}/bin" includes="*" perm="775"/> 
    5657                <chmod dir="${installDir}/cgi-bin" includes="*" perm="775"/> 

  • release-kits/lirk3/installer/build.xml

    r17652 r17663  
    4747                <chmod dir="${installDir}/bin" includes="*" perm="775"/> 
    4848                <chmod dir="${installDir}/gs2build/bin/linux" includes="*" perm="775"/> 
     49                <chmod dir="${installDir}/gs2build/bin/linux/imagemagick" includes="*" perm="775"/> 
    4950                <chmod dir="${installDir}/gs2build/bin/script" includes="**/*" perm="775"/> 
    5051                <chmod dir="${installDir}/gli" includes="*.sh" perm="775"/> 

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

    r17660 r17663  
    1313        <target name="prepare-components"> 
    1414                <antcall target="prepare-core-component" /> 
     15                <antcall target="prepare-imagemagick-component" /> 
     16                <antcall target="prepare-ghostscript-component" /> 
    1517                <antcall target="prepare-sourcecode-component" /> 
    1618                <antcall target="prepare-sourcecode-core-component" /> 
    …… 
    1921        <target name="compress-components"> 
    2022                <antcall target="compress-core-component" /> 
     23                <antcall target="compress-imagemagick-component" /> 
     24                <antcall target="compress-ghostscript-component" /> 
    2125                <antcall target="compress-sourcecode-component" /> 
    2226                <antcall target="compress-sourcecode-core-component" /> 
    …… 
    126130        </target> 
    127131 
     132        <!-- ghostscript --> 
     133        <target name="prepare-ghostscript-component"> 
     134 
     135                <delete dir="components/tmp/ghostscript"/> 
     136                <mkdir dir="components/tmp/ghostscript"/> 
     137 
     138                <copy todir="components/tmp/ghostscript" overwrite="true"> 
     139                        <fileset dir="distributions/web/bin/darwin"> 
     140                                <include name="ghostscript/**/*"/> 
     141                        </fileset> 
     142                </copy> 
     143                                 
     144                <zip destfile="components/ghostscript.comp" basedir="components/tmp/ghostscript" compress="false" includes="**/*"/> 
     145        </target> 
     146                 
     147        <target name="compress-ghostscript-component"> 
     148                <sevenzip task="encode" input="components/ghostscript.comp" output="components/ghostscript.lzma" dictionnary="26"/> 
     149        </target> 
     150 
    128151</project> 

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

    r17661 r17663  
    1717                <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk2-targets --> 
    1818                <antcall target="insert-export-to-cd-package"/>         <!-- from rk2-targets --> 
    19                 <antcall target="export-imagemagick-linux-binaries" /> 
    2019                <antcall target="export-imagemagick-darwin-binaries" /> 
    2120                <antcall target="export-ghostscript-darwin-binaries" /> 

  • release-kits/mark2/installer/build.xml

    r17652 r17663  
    4848                <chmod dir="${installDir}" includes="*.sh,*.bash" perm="775"/> 
    4949                <chmod dir="${installDir}/bin/darwin" includes="*" perm="775"/> 
     50                <chmod dir="${installDir}/bin/darwin/imagemagick" includes="*" perm="775"/> 
     51                <chmod dir="${installDir}/bin/darwin/ghostscript" includes="*" perm="775"/> 
    5052                <chmod dir="${installDir}/bin" includes="*" perm="775"/> 
    5153                <chmod dir="${installDir}/cgi-bin" includes="*" perm="775"/> 

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

    r17660 r17663  
    1616                <antcall target="prepare-ant-component" /> 
    1717                <antcall target="prepare-tomcat-component" /> 
     18                <antcall target="prepare-imagemagick-component" /> 
     19                <antcall target="prepare-ghostscript-component" /> 
    1820                <antcall target="prepare-sourcecode-core-component" /> 
    1921        </target> 
    …… 
    2426                <antcall target="compress-ant-component" /> 
    2527                <antcall target="compress-tomcat-component" /> 
     28                <antcall target="compress-imagemagick-component" /> 
     29                <antcall target="compress-ghostscript-component" /> 
    2630                <antcall target="compress-sourcecode-core-component" /> 
    2731        </target> 
    …… 
    6165 
    6266                        </fileset> 
    63                 </copy> 
     67                </copy>         
    6468                                 
    6569                <zip destfile="components/core.comp" basedir="components/tmp/core" compress="false" /> 
    …… 
    176180        </target> 
    177181 
     182        <!-- ghostscript --> 
     183        <target name="prepare-ghostscript-component"> 
     184 
     185                <delete dir="components/tmp/ghostscript"/> 
     186                <mkdir dir="components/tmp/ghostscript"/> 
     187 
     188                <copy todir="components/tmp/ghostscript" overwrite="true"> 
     189                        <fileset dir="distribution/greenstone3/gs2build/bin/darwin"> 
     190                                <include name="ghostscript/**/*"/> 
     191                        </fileset> 
     192                </copy> 
     193                                 
     194                <zip destfile="components/ghostscript.comp" basedir="components/tmp/ghostscript" compress="false" includes="**/*"/> 
     195        </target> 
     196                 
     197        <target name="compress-ghostscript-component"> 
     198                <sevenzip task="encode" input="components/ghostscript.comp" output="components/ghostscript.lzma" dictionnary="26"/> 
     199        </target> 
     200 
     201 
    178202</project> 

  • release-kits/mark3/installer/build.xml

    r17652 r17663  
    3838                <chmod dir="${installDir}/bin/script" includes="*" perm="775"/> 
    3939                <chmod dir="${installDir}/bin" includes="*" perm="775"/> 
    40                 <chmod dir="${installDir}/gs2build/bin/linux" includes="*" perm="775"/> 
     40                <chmod dir="${installDir}/gs2build/bin/darwin" includes="*" perm="775"/> 
     41                <chmod dir="${installDir}/gs2build/bin/darwin/imagemagick" includes="*" perm="775"/> 
     42                <chmod dir="${installDir}/gs2build/bin/darwin/ghostscript" includes="*" perm="775"/> 
    4143                <chmod dir="${installDir}/gs2build/bin/script" includes="**/*" perm="775"/> 
    4244                <chmod dir="${installDir}/gli" includes="*.sh" perm="775"/>