Changeset 17596

Timestamp:

2008-10-24 10:59:47 (3 months ago)

Author:

oranfry

Message:

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

Files:

• release-kits/lirk3/ant-scripts/build.xml (modified) (1 diff)
• release-kits/lirk3/ant-scripts/create-installer.xml (modified) (2 diffs)
• release-kits/lirk3/ant-scripts/wrap.xml (modified) (2 diffs)
• release-kits/lirk3/installer/antinstall-config.xml (modified) (4 diffs)
• release-kits/lirk3/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" />
-
+
-
-        <!-- 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 -->
-
+
+
+
+
-        </target>
-
-        <target name="copy-installer-files">
-
+
-                <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}"/>
-dir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3
+file="${basedir}/wrapped-installer/build/greenstone3.jar" file="${basedir}/installer/Greenstone-${version}-${os.suffix}
-
-                <!-- 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">
-greenstone-${version}-linux
+Greenstone-${version}-${os.suffix}
-                </exec>
-

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

@@ -46 +46 @@
-
-                <target
-install-core-components
+Installing Core System
-                        diskRequirement="@component.size.core@"
-                        defaultValue="true"
@@ -52 +52 @@
-                        force="true"/>
-
-full
+bundled components
-                <target
-install-t
+Installing T
-                        diskRequirement="@component.size.tomcat@"
-                        defaultValue="true"
@@ -60 +60 @@
-
-                <target
-install-a
+Installing A
-                        diskRequirement="@component.size.ant@"
-                        defaultValue="true"
-                        displayText=""/>
-full
+bundled components
-
+                <!-- start sourcecode -->
-                <target
-install-source-c
+Installing Source C
-                        diskRequirement="@component.size.sourcecode@"
-                        defaultValue="false"
-                        displayText=""/>
+                <!-- end sourcecode -->
-
-        </page>
-
-install-t
+Installing T
-
-                <text property="tomcat.server" defaultValue="localhost" displayText=""/>
@@ -82 +84 @@
-        </page>
-
-
-
+
-
-</installer>

release-kits/lirk3/installer/build.xml

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