Changeset 20337

Timestamp:

2009-08-19T16:44:08+12:00 (15 years ago)

Author:

oranfry

Message:

changes accompanying new rk3 release kit

Location:

release-kits/shared

Files:

• core/ant-scripts/init.xml (modified) (2 diffs)
• greenstone3/ant-scripts/rk3-targets.xml (modified) (3 diffs)

release-kits/shared/core/ant-scripts/init.xml

@@ -129 +129 @@
         <property name="app.version" value="${version}"/>
 
+        <!-- work out rk.os -->
+        <if>
+            <bool>
+                <or>
+                    <equals arg1="${rk.os}" arg2="linux"/>
+                    <equals arg1="${rk.os}" arg2="mac"/>
+                    <equals arg1="${rk.os}" arg2="windows"/>
+                </or>
+            </bool>
+            <echo>Using user-specified value for rk.os: '${rk.os}'</echo>
+
+        <else><if>
+            <bool><equals arg1="${os.name}" arg2="Linux"/></bool>
+            <property name="rk.os" value="linux"/>
+
+        <else><if>
+            <bool><equals arg1="${os.name}" arg2="Mac OS X"/></bool>
+            <property name="rk.os" value="mac"/>
+
+        <else><if>
+            <bool>
+                <or>
+                    <equals arg1="${os.name}" arg2="Windows 95"/>
+                    <equals arg1="${os.name}" arg2="Windows 98"/>
+                    <equals arg1="${os.name}" arg2="Windows 2000"/>
+                    <equals arg1="${os.name}" arg2="Windows XP"/>
+                    <equals arg1="${os.name}" arg2="Windows NT"/>
+                    <equals arg1="${os.name}" arg2="Windows ME"/>
+                    <equals arg1="${os.name}" arg2="Windows Vista"/>
+                </or>
+            </bool>
+            <property name="rk.os" value="windows"/>
+
+        <else>
+            <fail>Can't work out what to set rk.os to. Please report this to [email protected] . In the mean time, manually set rk.os to 'windows', 'mac', or 'linux' by reinvoking the release kit with, for example, '-Drk.os=windows'</fail>
+
+        </else></if></else></if></else></if></else></if>
+
+        <!-- set os.suffix -->
+        <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
+            <property name="os.suffix" value="MacOS-intel"/>
+        </if>
+        <property name="os.suffix" value="${rk.os}"/>
+
         <!-- show important properties -->
         <echo level="info">Version (version): ${version}</echo>
@@ -135 +179 @@
         <echo level="info">Current Month (current.month): ${current.month}</echo>
         <echo level="info">Current Year (current.year): ${current.year}</echo>
+        <echo level="info">Operating System (rk.os): ${rk.os}</echo>
+        <echo level="info">Operating System Suffix (os.suffix): ${os.suffix}</echo>
 
     </target>

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

@@ -191 +191 @@
     </target>
 
-    <target name="copy-greenstone3-installer-files">
-
-        <!-- the installer descriptors -->
-        <copy todir="installer" file="${rk.home}/greenstone3/installer/antinstall-config.xml" overwrite="true"/>
-        <copy todir="installer" file="${rk.home}/greenstone3/installer/build.xml" overwrite="true"/>
-
-    </target>
-
     <target name="clean-user-manual">
         <copy file="distributions/web/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/>
@@ -213 +205 @@
         <mkdir dir="components"/>
         <zip destfile="components/${component}.comp" compress="false">
-                        <zipfileset dir="distributions/web">
-                                <patternset refid="greenstone3.${component}.component"/>
-                        </zipfileset>
+            <zipfileset dir="distributions/web">
+                <patternset refid="greenstone3.${component}.component"/>
+            </zipfileset>
         </zip>
     </target>   
@@ -234 +226 @@
         </else></if></else></if>
     </target>
-    
-    <target name="greenstone3-compile">
-        <antcall target="checkout-greenstone3" />
-        <ant dir="compiled" inheritAll="false">
-            <target name="prepare"/>
-            <propertyset refid="forward.properties"/>
-        </ant>
-        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="compiled"/></antcall>
-        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="compiled/gli" /></antcall>
-        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="compiled/gs2build" /></antcall>
-        <ant dir="compiled" inheritAll="false">
-            <target name="install"/>
-            <target name="dist-tidy"/>
-            <propertyset refid="forward.properties"/>
-        </ant>
-        <antcall target="insert-xml-parser"/>
-        <antcall target="insert-ant"/>
-        <antcall target="insert-documented-examples"/>
-        <antcall target="compile-uninstaller" /> <!-- from rk3-targets -->
-        <antcall target="prepare-documentation"/> <!-- from rk3-targets -->
-    </target>
-
-    <target name="greenstone3-create-distribution">
-        <!-- create distribution -->
-        <antcall target="copy-compiled-to-dist"/> <!-- from init -->
-        <antcall target="insert-uninstaller"/>
-        <antcall target="clean-user-manual"/>
-        <antcall target="clean-uninstaller"/>
-        <antcall target="strip-svn-dirs"><param name="dir" value="distributions"/></antcall> <!-- from init -->
-    </target>
+
+    <target name="insert-windows-icon">
+        <copy
+            file="${rk3.home}/greenstone3/icon/icon.ico"
+            tofile="compiled/resources/images/gs3.ico"/>
+    </target>
+
+