Changeset 21634

Show
Ignore:
Timestamp:
26.01.2010 15:30:09 (9 years ago)
Author:
oranfry
Message:

fixes

Location:
main/trunk/release-kits
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

    r21623 r21634  
    119119 
    120120        <!-- compile gli --> 
    121         <exec dir="compiled/gli" executable="compiled/gli/makegli.${os.script.format}"/> 
    122         <exec dir="compiled/gli" executable="compiled/gli/makejar.${os.script.format}"/> 
    123         <delete dir="${glibasedir}/jar"/> 
    124         <delete dir="${glibasedir}/classes/org"/> 
     121        <exec dir="compiled/gli" executable="/bin/bash"><arg value="-c"/><arg value="./makegli.${os.script.format}"/></exec> 
     122        <exec dir="compiled/gli" executable="/bin/bash"><arg value="-c"/><arg value="./makejar.${os.script.format}"/></exec> 
     123        <delete dir="compiled/gli/jar"/> 
     124        <delete dir="compiled/gli/classes/org"/> 
    125125        <move file="compiled/gli/GLIServer.jar" todir="compiled/bin/java"/> 
    126126 
  • main/trunk/release-kits/shared/core/ant-scripts/create-installer.xml

    r21630 r21634  
    22<project name="create-installer"> 
    33 
    4     <target name="create-installer" depends="init,gs${version.major}-init"> 
     4    <target name="create-installer" depends="init"> 
    55 
    66        <!-- create installer directory --> 
     
    88 
    99        <!-- insert the installer descriptors --> 
    10         <copy todir="installer"> 
    11             <fileset dir="${rk.home}/kits/${rk.name}/installer" includes="antinstall-config.xml,build.xml" overwrite="true"> 
     10        <copy todir="installer" overwrite="true"> 
     11            <fileset dir="${rk.home}/kits/${rk.name}/installer" includes="antinstall-config.xml,build.xml"/> 
    1212        </copy> 
    1313 
  • main/trunk/release-kits/shared/core/ant-scripts/init.xml

    r21630 r21634  
    8282        <taskdef name="try" classname="ise.antelope.tasks.TryTask" classpathref="project.classpath"/> 
    8383        <taskdef name="math" classname="ise.antelope.tasks.MathTask" classpathref="project.classpath"/> 
    84         <taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="project.classpath"/> 
    8584        <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/> 
    8685        <taskdef name="installer" classname="org.tp23.antinstaller.taskdefs.Installer" classpathref="project.classpath"/> 
     
    173172        <echo level="info">Operating System (rk.os): ${rk.os}</echo> 
    174173        <echo level="info">Operating System Suffix (os.suffix): ${os.suffix}</echo> 
     174        <echo level="info">Operating System Script format (os.script.format): ${os.script.format}</echo> 
     175        <echo level="info">Operating System Shell (os.shell): ${os.shell}</echo> 
    175176        <!-- 
    176177        <echo level="info">Current Date</echo> 
  • main/trunk/release-kits/shared/core/ant-scripts/wrap.xml

    r21630 r21634  
    22<project name="wrap" default="wrap"> 
    33 
    4     <target name="wrap" depends="init,gs${version.major}-init"> 
     4    <target name="wrap" depends="init"> 
    55 
    66        <!-- create products directory -->