Changeset 17596 for release-kits/lirk3

Timestamp:

2008-10-24T10:59:47+13:00 (15 years ago)

Author:

oranfry

Message:

changes to exclude sourcecode from the binary release, use nicer target names and icons

Location:

release-kits/lirk3

Files:

• ant-scripts/build.xml (modified) (1 diff)
• ant-scripts/create-installer.xml (modified) (2 diffs)
• ant-scripts/wrap.xml (modified) (2 diffs)
• installer/antinstall-config.xml (modified) (4 diffs)
• installer/build.xml (modified) (5 diffs)

release-kits/lirk3/ant-scripts/build.xml

@@ -15 +15 @@
     <property name="rk.home" value="${lirk3.home}" />
     <property name="rk.os" value="linux" />
-
+    <property name="os.suffix" value="linux"/>
 
     <!-- IMPORT OTHER ANT SCRIPTS -->

release-kits/lirk3/ant-scripts/create-installer.xml

@@ -5 +5 @@
         <antcall target="copy-installer-files"/>
         <antcall target="make-installer-files-concrete"><param name="java.os" value="linux"/></antcall> <!-- from rk3-targets -->
-        <antcall target="compile-installer"/>
+        <antcall target="compile-binary-installer"/> <!-- from init -->
+        <antcall target="compile-minimal-installer"/> <!-- from init -->
+        <antcall target="compile-source-installer"/> <!-- from init -->
+
     </target>
 
     <target name="copy-installer-files">
-        <echo>Getting things ready to compile the installer</echo>
+
         <mkdir dir="${basedir}/installer/resources"/>
         <copy todir="${basedir}/installer" file="${lirk3.home}/installer/antinstall-config.xml" overwrite="true" />
@@ -26 +29 @@
     </target>
 
-    <target name="compile-installer">
-
-        <installer file="${basedir}/installer/greenstone3.jar"
-                compress="true"
-                extractType="NonExtractor"
-                installConfig="${basedir}/installer/antinstall-config.xml"
-                buildFile="${basedir}/installer/build.xml"
-                antInstallLib="${lirk3.home}/packages/ant-installer/lib"
-                antLib="${lirk3.home}/packages/ant/lib"
-                validateConfig="true"
-                icons="bluecurve">
-
-            <zipfileset dir="${basedir}/installer/classes" includes="**/*"/>
-            <zipfileset dir="${basedir}/components" includes="*.lzma"/>
-        </installer>
-
-        <dcff
-            file="${basedir}/installer/antinstall-config.xml"
-            startTag=".*&lt;!-- start full --&gt;"
-            endTag=".*&lt;!-- end full --&gt;"/>
-
-        <installer file="${basedir}/installer/Greenstone-${version}-linux-minimal.jar"
-                compress="true"
-                extractType="NonExtractor"
-                installConfig="${basedir}/installer/antinstall-config.xml"
-                buildFile="${basedir}/installer/build.xml"
-                antInstallLib="${lirk3.home}/packages/ant-installer/lib"
-                antLib="${lirk3.home}/packages/ant/lib"
-                validateConfig="true"
-                icons="bluecurve">
-
-            <zipfileset dir="${basedir}/installer/classes" includes="**/*"/>
-            <zipfileset dir="${basedir}/components" includes="core.lzma"/>
-        </installer>
-
-
-    </target>
-
 </project>

release-kits/lirk3/ant-scripts/wrap.xml

@@ -17 +17 @@
         <!-- copy bundled files -->
         <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/${linux-java.installer}"/>
-        <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3.jar"/>
+        <copy tofile="${basedir}/wrapped-installer/build/greenstone3.jar" file="${basedir}/installer/Greenstone-${version}-${os.suffix}.jar"/>
 
         <!-- substitute the real java installer filename and min version into various files -->
@@ -62 +62 @@
         <echo level="info">relink, bundling the files to be bundled</echo>
         <exec executable="g++" dir="${basedir}/wrapped-installer/build">
-            <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone3.jar.o java.o"/>
+            <arg line="-static -static-libgcc -o  ../Greenstone-${version}-${os.suffix}.bin wrapper.o libsearch4j.o greenstone3.jar.o java.o"/>
         </exec>
 

release-kits/lirk3/installer/antinstall-config.xml

@@ -46 +46 @@
 
         <target
-            target="install-core-components"
+            target="Installing Core System"
             diskRequirement="@component.size.core@"
             defaultValue="true"
@@ -52 +52 @@
             force="true"/>
 
-        <!-- start full -->
+        <!-- start bundled components -->
         <target
-            target="install-tomcat"
+            target="Installing Tomcat"
             diskRequirement="@component.size.tomcat@"
             defaultValue="true"
@@ -60 +60 @@
 
         <target
-            target="install-ant"
+            target="Installing Ant"
             diskRequirement="@component.size.ant@"
             defaultValue="true"
             displayText=""/>
-        <!-- end full -->
+        <!-- end bundled components -->
 
+        <!-- start sourcecode -->
         <target
-            target="install-source-code"
+            target="Installing Source Code"
             diskRequirement="@component.size.sourcecode@"
             defaultValue="false"
             displayText=""/>
+        <!-- end sourcecode -->
 
     </page>
 
-    <page type="input" name="tomcat-config" ifProperty="(${install-tomcat}==true)" displayText="">
+    <page type="input" name="tomcat-config" ifProperty="(${Installing Tomcat}==true)" displayText="">
 
         <text property="tomcat.server" defaultValue="localhost" displayText=""/>
@@ -82 +84 @@
     </page>
 
-    <page type="progress" name="progress" showTargets="false" target="cleanuptarget" displayText="">
-    </page>
+    <page type="progress" name="progress" showTargets="true" displayText=""/>
 
 </installer>

release-kits/lirk3/installer/build.xml

@@ -17 +17 @@
     <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/>
 
-    <target name="install-core-components" depends="">
+    <target name="Installing Core System" depends="">
 
         <!-- create the installation directory -->
@@ -81 +81 @@
 
     <!-- Source -->
-    <target name="install-source-code" depends="">
+    <target name="Installing Source Code" depends="">
 
         <echo>Installing Source Code</echo>
@@ -93 +93 @@
     </target>
 
-    <target name="install-tomcat">
+    <target name="Installing Tomcat">
         <echo>Installing Tomcat (packages/tomcat)</echo>
         <mkdir dir="packages"/>
@@ -116 +116 @@
     </target>
 
-    <target name="install-ant">
+    <target name="Installing Ant">
         <echo>Installing Ant (packages/ant)</echo>
         <mkdir dir="packages"/>
@@ -130 +130 @@
     </target>
 
-    <target name="cleanuptarget"></target>
-    
 </project>