Changeset 17540 for release-kits/shared

Timestamp:

2008-10-15T15:02:43+13:00 (16 years ago)

Author:

oranfry

Message:

getting the language selector page going in all installers

Location:

release-kits/shared/greenstone3

Files:

• ant-scripts/rk3-targets.xml (modified) (4 diffs)
• installer-classes/resources/LanguagePack_zh.properties (moved) (moved from release-kits/shared/greenstone3/installer-classes/resources/LanguagePack_zh_CN.properties )

release-kits/shared/greenstone3/ant-scripts/rk3-targets.xml

@@ -15 +15 @@
         <echo>Calculating the size of some components</echo>
 
-        <!-- core greenstone3 system (keep in sync with installer build.xml files) -->
-        <length property="component.bytesize.core" mode="all"><fileset file="${basedir}/components/core.comp"/></length>
+        <!-- core greenstone3 system -->
+        <length property="component.bytesize.core-without-jre" mode="all"><fileset file="${basedir}/components/core.comp"/></length>
+        <if><bool><equals arg1="${java.os}" arg2="windows"/></bool>
+            <math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.windows-java}" datatype="int"/>
+        <else><if><bool><equals arg1="${java.os}" arg2="linux"/></bool>
+            <math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.linux-java}" datatype="int"/>
+        <else>
+            <property name="component.bytesize.core" value1="${component.bytesize.core-without-jre}"/>
+        </else></if></else></if>
         <math result="component.megabytesize.core" operand1="${component.bytesize.core}" operation="/" operand2="1048576" datatype="int"/>
         <property name="component.size.core" value="${component.megabytesize.core} MB"/>
 
-        <!-- source code (keep in sync with installer build.xml files) -->
+        <!-- source code -->
         <length property="component.bytesize.sourcecode" mode="all"><fileset file="${basedir}/components/sourcecode.comp"/></length>
         <math result="component.megabytesize.sourcecode" operand1="${component.bytesize.sourcecode}" operation="/" operand2="1048576" datatype="int"/>
@@ -97 +104 @@
 
         <!-- chinese -->
-        <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties">
+        <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh.properties">
             <job pattern="@version@" replacement="${version}"/>
             <job pattern="@java.min.version@" replacement="${java.min.version}"/>
@@ -110 +117 @@
     </target>
 
+<!--
     <target name="compile-search4j-unix">
         <copy todir="${basedir}/greenstone3"><fileset dir="${rk.home}/packages" includes="search4j/**/*"/></copy>
@@ -123 +131 @@
         <move file="${basedir}/greenstone3/search4j/search4j.exe" todir="${basedir}/greenstone3/bin"/>
     </target>
+-->
 
     <target name="compile-uninstaller">