Changeset 23843

Show
Ignore:
Timestamp:
04.04.2011 09:31:59 (8 years ago)
Author:
sjm84
Message:

More flax-specific modifications (no ghostscript, no component selection screen in the installer

Location:
main/trunk/release-kits/kits/rk3
Files:
3 modified

Legend:

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

    r23811 r23843  
    158158            </exec> 
    159159 
    160             <!-- grab ghostscript binaries --> 
    161             <delete dir="compiled/gs2build/bin/darwin/ghostscript"/> 
    162             <exec executable="svn"> 
    163                 <arg value="export"/> 
    164                 <arg value="${svn.root}/main/${branch.path}/binaries/mac/intel/ghostscript"/> 
    165                 <arg value="compiled/gs2build/bin/darwin/ghostscript"/> 
    166             </exec> 
     160            <if><bool><not><equals arg1="${forward.install.flax}" arg2="true"/></not></bool> 
     161                <!-- grab ghostscript binaries --> 
     162                <delete dir="compiled/gs2build/bin/darwin/ghostscript"/> 
     163                <exec executable="svn"> 
     164                    <arg value="export"/> 
     165                    <arg value="${svn.root}/main/${branch.path}/binaries/mac/intel/ghostscript"/> 
     166                    <arg value="compiled/gs2build/bin/darwin/ghostscript"/> 
     167                </exec> 
     168            </if> 
    167169        </if></else></if> 
    168170 
  • main/trunk/release-kits/kits/rk3/installer/antinstall-config.xml

    r23816 r23843  
    9090    </page> 
    9191 
     92    <!-- NO FLAX START --> 
     93 
    9294    <!-- page to choose components --> 
    9395    <page type="input" name="selector" displayText=""> 
     
    147149    </page> 
    148150 
     151    <!-- NO FLAX END --> 
     152 
    149153    <!-- page to setup tomcat --> 
    150154    <page type="input" name="tomcat-config" ifProperty="(${Installing Tomcat}==true)" displayText=""> 
  • main/trunk/release-kits/kits/rk3/installer/build.xml

    r23836 r23843  
    161161    </target> 
    162162 
     163    <!-- NO FLAX START --> 
     164 
    163165    <target name="Installing Ghostscript"> 
    164166 
     
    180182 
    181183    </target> 
     184 
     185    <!-- NO FLAX END --> 
    182186 
    183187    <!-- start amp -->