Ignore:
Timestamp:
03/24/11 11:21:42 (10 years ago)
Author:
sjm84
Message:

Several changes to integrate FLAX release building as an option in the release kits

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

Legend:

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

    r23644 r23811  
    1111            <arg value="-r"/><arg value="${branch.revision}"/>
    1212        </exec>
     13
     14        <if><bool><equals arg1="${with.jni}" arg2="false"/></bool>
     15            <rsr file="${basedir}/compiled/build.properties.in" pattern="with.jni=true" replacement="#with.jni=true"/>
     16        </if>
     17
     18        <if><bool><equals arg1="${with.gli.and.gems}" arg2="false"/></bool>
     19            <rsr file="${basedir}/compiled/build.properties.in" pattern="with.gli.and.gems=true" replacement="#with.gli.and.gems=true"/>
     20        </if>
    1321
    1422        <!-- make sure all c++ compilation is done statically on linux -->
  • main/trunk/release-kits/kits/rk3/installer/build.xml

    r23667 r23811  
    214214        </rsr>
    215215
     216        <!-- FLAX START -->
     217        <echo>Copying over FlaxWebService.wsdl and changing tomcat server/ports</echo>
     218        <copy file="${installDir}/flax-resources/FlaxWebService.wsdl" tofile="${installDir}/web/FlaxWebService.wsdl" overwrite="true"/>
     219        <rsr file="${installDir}/web/FlaxWebService.wsdl">
     220            <job pattern="@flaxpublicserver@" replacement="${tomcat.server}"/>
     221            <job pattern="@flaxpublicport@" replacement="${tomcat.port}"/>
     222        </rsr>
     223        <!-- FLAX END -->
     224
    216225        <echo>Copying greenstone3.xml to tomcat directory</echo>
    217226        <copy file="${installDir}/resources/tomcat/greenstone3.xml" tofile="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"/>
     
    228237
    229238        <mkdir dir="${startmenu.path}\Documentation"/>
    230        
     239
     240        <!-- NO FLAX START -->
     241
    231242        <shortcut
    232243            file="${startmenu.path}\Greenstone3 Server.lnk"
     
    277288            url="http://www.greenstone.org" />
    278289       
     290        <!-- NO FLAX END -->
     291
     292        <!-- FLAX START-->
     293
     294        <shortcut
     295            file="${startmenu.path}\Start FLAX Server.lnk"
     296            execute="${installDir}\gs3-server.bat"
     297            workingDirectory="${installDir}"
     298            iconFile="${installDir}\resources\images\server.ico"
     299            iconIndex="0" />
     300
     301        <shortcut
     302            file="${startmenu.path}\Uninstall.lnk"
     303            execute="${installDir}\Uninstall.bat"
     304            workingDirectory="${installDir}"
     305            iconFile="${installDir}\resources\images\uninstall.ico"
     306            iconIndex="0" />
     307
     308        <!-- FLAX END -->
    279309    </target>
    280310
  • main/trunk/release-kits/shared/core/ant-scripts/create-installer.xml

    r23493 r23811  
    130130        </rsr>
    131131
     132        <!-- If this is a FLAX installer then we need to change a few things -->
     133        <if><bool><equals arg1="${forward.install.flax}" arg2="true"/></bool>
     134            <dcff file="installer/build.xml" startTag="&lt;!-- NO FLAX START --&gt;" endTag="&lt;!-- NO FLAX END --&gt;" />
     135        <else>
     136            <dcff file="installer/build.xml" startTag="&lt;!-- FLAX START --&gt;" endTag="&lt;!-- FLAX END --&gt;" />
     137        </else>
     138        </if>
     139
    132140        <!-- EXT -->
    133141        <if><bool><equals arg1="${amp.enabled}" arg2="true"/></bool>
  • main/trunk/release-kits/shared/core/ant-scripts/shared.xml

    r23641 r23811  
    6161
    6262        <!-- the extra space for the dmg image in KB (mac wrapper) -->
    63             <property name="dmg.overhead" value="2048"/>
     63            <property name="dmg.overhead" value="4096"/>
    6464
    6565        <!-- current date and time -->
     
    347347    <!-- target to set version numbers in gli -->
    348348    <target name="gli-set-version-numbers">
    349 
     349        <if><bool><not><equals arg1="${with.gli.and.gems}" arg2="false"/></not></bool>
    350350            <!-- DICTIOANRY FILES (AboutDialog.Date) -->
    351351            <echo level="info">Changing AboutDialog.Date in all dictionaries</echo>
     
    374374            <echo level="info">Changing configuration version in gli/classes/xml/configRemote.xml</echo>
    375375            <rsr file="${glibasedir}/classes/xml/configRemote.xml" pattern="^(\s*&lt;Configuration.* version=&quot;)[^&quot;]*(&quot;.*&gt;)" replacement="$1${version}${version-extra}$2"/>
    376 
     376        </if>
    377377    </target>
    378378
Note: See TracChangeset for help on using the changeset viewer.