Changeset 15205 for release-kits
- Timestamp:
- 2008-04-23T17:26:48+12:00 (16 years ago)
- Location:
- release-kits/lirk3
- Files:
-
- 2 added
- 1 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
release-kits/lirk3/ant-scripts/create-installer.xml
r15142 r15205 24 24 <copy todir="${basedir}/installer" file="${lirk3.home}/installer/antinstall-config.xml"/> 25 25 <copy todir="${basedir}/installer" file="${lirk3.home}/installer/build.xml"/> 26 <copy todir="${basedir}/installer/cp"><fileset dir="${lirk3.home}/installer/cp"/></copy> 27 28 <!-- put the concrete values of things in the config --> 26 29 <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/> 30 <rsr file="${basedir}/installer/build.xml" pattern="@java.min.version@" replacement="${java.min.version}"/> 27 31 <rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${java.extracted}"/> 28 32 33 34 <!-- put the concrete values of things in the text --> 35 <!-- default --> 36 <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/> 37 <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/> 38 <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/> 39 <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/> 40 <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/> 41 42 <!-- chinese --> 43 <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@version@" replacement="${version}"/> 44 <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@java.min.version@" replacement="${java.min.version}"/> 45 <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/> 46 <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/> 47 <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/> 48 29 49 </if> 30 50 </target> … … 32 52 <target name="compile-installer"> 33 53 <if><bool><istrue value="${execute}"/></bool> 54 55 <installer file="${basedir}/installer/greenstone3-with-java.jar" 56 compress="true" 57 extractType="NonExtractor" 58 installConfig="${basedir}/installer/antinstall-config.xml" 59 buildFile="${basedir}/installer/build.xml" 60 antInstallLib="${lirk3.home}/bin/ant-installer/lib" 61 antLib="${lirk3.home}/bin/ant-installer/antlib" 62 validateConfig="true" 63 icons="bluecurve"> 64 65 <!-- copy all the important files into the archive to be extracted for install --> 66 <zipfileset dir="${basedir}/installer/cp" includes="resources/*"/> 67 <zipfileset dir="${lirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset> 68 69 <!-- 70 <zipfileset dir="${basedir}/distribution/greenstone3" includes="*"/> 71 <zipfileset dir="${basedir}/distribution/greenstone3/bin" prefix="bin"><include name="**/*"/></zipfileset> 72 <zipfileset dir="${basedir}/distribution/greenstone3/docs" prefix="docs"><include name="**/*"/></zipfileset> 73 <zipfileset dir="${basedir}/distribution/greenstone3/gli" prefix="gli"><include name="**/*"/></zipfileset> 74 <zipfileset dir="${basedir}/distribution/greenstone3/gs2build" prefix="gs2build"><include name="**/*"/></zipfileset> 75 <zipfileset dir="${basedir}/distribution/greenstone3/lib" prefix="lib"><include name="**/*"/></zipfileset> 76 <zipfileset dir="${basedir}/distribution/greenstone3/web" prefix="web"><include name="**/*"/></zipfileset> 77 <zipfileset dir="${basedir}/distribution/greenstone3/packages" prefix="packages"><include name="**/*"/></zipfileset> 78 <zipfileset dir="${basedir}/distribution/greenstone3/resources" prefix="resources"><include name="**/*"/></zipfileset> 79 <zipfileset dir="${basedir}/distribution/greenstone3/src" prefix="src"><include name="**/*"/></zipfileset> 80 --> 81 82 </installer> 83 84 <!-- delete the 'bundled java only' lines from the installer config --> 85 <rsr file="${basedir}/installer/antinstall-config.xml" pattern=".*<!-- bundled java only -->" replacement=""/> 34 86 35 87 <installer file="${basedir}/installer/greenstone3.jar" … … 47 99 <zipfileset dir="${lirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset> 48 100 101 <!-- 49 102 <zipfileset dir="${basedir}/distribution/greenstone3" includes="*"/> 50 103 <zipfileset dir="${basedir}/distribution/greenstone3/bin" prefix="bin"><include name="**/*"/></zipfileset> … … 57 110 <zipfileset dir="${basedir}/distribution/greenstone3/resources" prefix="resources"><include name="**/*"/></zipfileset> 58 111 <zipfileset dir="${basedir}/distribution/greenstone3/src" prefix="src"><include name="**/*"/></zipfileset> 112 --> 59 113 </installer> 60 114 -
release-kits/lirk3/ant-scripts/init.xml
r15142 r15205 43 43 <!-- bundled java strings --> 44 44 <!-- java.installer: use a filename which has only letters numbers and underscores --> 45 <property name="java.installer" value="jre_6u5_linux_i586"/> 45 46 <!-- the version numbers of bundled things --> 47 <property name="bundled.version.java" value="1.6.0_05"/> 48 <property name="bundled.version.tomcat" value="5.5.25"/> 49 <property name="bundled.version.ant" value="1.6.5"/> 50 51 <!--<property name="java.installer" value="jre_6u5_linux_i586"/>--> 52 <property name="java.installer" value="jre_6u5_tar_gz"/> 46 53 <property name="java.extracted" value="jre1.6.0_05"/> 47 54 <property name="java.min.version" value="1.5.0_00"/> -
release-kits/lirk3/ant-scripts/wrap.xml
r15142 r15205 29 29 <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/wrapper/${java.installer}"/> 30 30 <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3.jar"/> 31 <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3-with-java.jar"/> 31 32 32 33 <!-- substitute the real java installer filename and min version into various files --> … … 46 47 </exec> 47 48 <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build"> 49 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone3_with_java_jar_start=greenstone3jar --readonly-text greenstone3-with-java.jar greenstone3-with-java.jar.o"/> 50 </exec> 51 <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build"> 48 52 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_search4j_start=search4j --readonly-text search4j search4j.o"/> 49 53 </exec> … … 53 57 54 58 55 <echo level="info">create a header file declaring bundled greenstone.jar and search4j</echo> 56 <delete file="mywrapper.h"/> 57 58 <!-- greenstone.jar --> 59 <!-- get size of greenstone.jar --> 59 60 <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3.jar.ls"><arg line="-l greenstone3.jar"/></exec> 60 61 <exec executable="sed" inputstring="${greenstone3.jar.ls}" outputproperty="greenstone3.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 61 <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h"><arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/></exec>62 62 63 <!-- search4j --> 63 <!-- get size of greenstone-with-java.jar --> 64 <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3-with-java.jar.ls"><arg line="-l greenstone3-with-java.jar"/></exec> 65 <exec executable="sed" inputstring="${greenstone3-with-java.jar.ls}" outputproperty="greenstone3-with-java.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 66 67 <!-- get size of search4j --> 64 68 <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="search4j.ls"><arg line="-l search4j"/></exec> 65 69 <exec executable="sed" inputstring="${search4j.ls}" outputproperty="search4j.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 70 71 <!-- get size of java --> 72 <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${java.installer}"/></exec> 73 <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 74 75 76 <echo level="info">creating the header file for no java version</echo> 77 <delete file="mywrapper.h"/> 78 <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h"><arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/></exec> 66 79 <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec> 67 68 80 69 81 <echo level="info">compile the wrapper program</echo> … … 78 90 79 91 80 <echo level="info"> add java to the header file</echo>81 < !-- java -->82 <exec executable=" ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${java.installer}"/></exec>83 <exec executable=" sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>92 <echo level="info">creating the header file for bundled java version</echo> 93 <delete file="mywrapper.h"/> 94 <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h"><arg line="extern const char greenstone3jar[${greenstone3-with-java.jar.size}];"/></exec> 95 <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec> 84 96 <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec> 85 97 <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec> … … 92 104 <echo level="info">relink, bundling the files to be bundled</echo> 93 105 <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 94 <arg line="-static -static-libgcc -o ../greenstone-${version}-linux-with-j re.bin mywrapper.o greenstone3.jar.o search4j.o java.o"/>106 <arg line="-static -static-libgcc -o ../greenstone-${version}-linux-with-java.bin mywrapper.o greenstone3-with-java.jar.o search4j.o java.o"/> 95 107 </exec> 96 108 -
release-kits/lirk3/installer/antinstall-config.xml
r15142 r15205 6 6 debug="false" 7 7 lookAndFeel="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel" 8 name="Greenstone3 Installer"9 windowIcon="/resources/g kmain_inv.png"8 name="Greenstone3 Installer" 9 windowIcon="/resources/gs3-small.png" 10 10 defaultImageResource="/resources/makewavesdawn.png" 11 11 minJavaVersion="1.4"> 12 12 13 <!-- each page element represents a page of the installer --> 14 <page 15 type="input" 16 name="intro" 17 displayText="Welcome to the Greenstone3 installer"> 13 <!-- simple intro page --> 14 <page type="input" name="intro" displayText=""> 15 <comment name="welcome-message"/> 18 16 </page> 19 17 20 18 <!-- type="license" shows a license page to click through --> 21 <page 22 type="license" 23 name="license" 24 displayText="License conditions" 25 resource="/LICENSE.txt"> 26 </page> 19 <page type="license" name="license" resource="/LICENSE.txt" displayText="" /> 27 20 28 <!-- type="input" shows a list of editable options for the installer --> 29 <page 30 type="input" 31 name="destination" 32 displayText="Install Destination"> 21 <!-- install destination page --> 22 <page type="input" name="destination"> 33 23 34 <directory 35 property="installDir" 36 defaultValue="/usr/local/Greenstone-@version@" 37 defaultValueWin="${env.ProgramFiles}\Greenstone-@version@" 38 displayText="Select an installation directory" 39 create="true"/> 24 <directory property="installDir" 25 defaultValue="/usr/local/Greenstone-@version@" 26 defaultValueWin="${env.ProgramFiles}\Greenstone-@version@" 27 create="true" 28 displayText="" /> 40 29 41 30 </page> 42 31 43 <page type="input" name=" tomcatports" displayText="Tomcat Ports">32 <page type="input" name="selector"> 44 33 45 <comment name=" tomcatportsdescription" displayText="Please select the ports which the web server (Apache Tomcat) will use will use. It is usually safe to accept the defaults by just clicking Next. The exception is when you are running other services on these ports - if this is the case, select some free ports and click Next."/>34 <comment name="choose-components"/> 46 35 47 <text property="tomcat.server" defaultValue="localhost" displayText="Tomcat Server"/> 48 <text property="tomcat.port" defaultValue="8080" displayText="Tomcat Port"/> 49 <text property="tomcat.shutdown.port" defaultValue="8005" displayText="Tomcat Shutdown Port"/> 36 <target target="install-core-components" defaultValue="true" force="true" displayText="" /> 37 <target target="install-java" defaultValue="true" displayText="" /> <!-- bundled java only --> 38 <target target="install-tomcat" defaultValue="true" displayText="" /> 39 <target target="install-ant" defaultValue="true" displayText="" /> 40 <target target="install-source-code" defaultValue="false" displayText="" /> 50 41 51 42 </page> 52 43 44 <page type="input" name="tomcat-config" ifProperty="(${install-tomcat}==true)"> 53 45 54 <page 55 type="input" 56 name="selector" 57 displayText="Components to install"> 58 59 <comment name="choosecomponents" displayText="Choose the components you want to install" bold="true"/> 60 <target displayText="Core components" target="default" defaultValue="true" force="true"/> 61 <target displayText="Source code" target="tgsrc" defaultValue="false"/> 46 <text property="tomcat.server" defaultValue="localhost" displayText=""/> 47 <text property="tomcat.port" defaultValue="8080" displayText=""/> 48 <text property="tomcat.shutdown.port" defaultValue="8005" displayText=""/> 62 49 63 50 </page> … … 66 53 type="progress" 67 54 name="progress" 68 displayText="Installation progress"69 55 showTargets="false" 70 56 target="cleanuptarget"> -
release-kits/lirk3/installer/build.xml
r15142 r15205 4 4 --> 5 5 6 <project name="Installation" default="">6 <project name="Installation"> 7 7 8 8 <!-- this is required to pick up the properties generated during the install pages --> … … 21 21 22 22 23 <target name=" default" depends="">23 <target name="install-core-components" depends=""> 24 24 25 25 <!-- create the installation directory --> … … 134 134 135 135 <!-- Source --> 136 <target name=" tgsrc" depends="">136 <target name="install-source-code" depends=""> 137 137 <echo message="Installing Source Code (src)"/> 138 138 <mkdir dir="${installDir}/src"/> … … 144 144 </target> 145 145 146 <target name="install- bundled-java" depends="" if="bundled.java.exists">146 <target name="install-java"> 147 147 <echo message="Installing bundled java"/> 148 148 <copy todir="${installDir}/packages/jre"> … … 152 152 </target> 153 153 154 <target name="cleanuptarget" depends="install-bundled-java"> 154 <target name="install-tomcat"> 155 <echo message="Installing Tomcat"/> 156 </target> 157 158 <target name="install-ant"> 159 <echo message="Installing Ant"/> 160 </target> 161 162 163 164 <target name="cleanuptarget"> 155 165 </target> 156 166 -
release-kits/lirk3/wrapper/mywrapper.c
r15142 r15205 66 66 cout << "Your java is too old." << endl; 67 67 } else { 68 cout << "Could not find java ." << endl;68 cout << "Could not find java on your system." << endl; 69 69 } 70 70 … … 73 73 #ifdef java_is_bundled 74 74 //yes, JRE is bundled 75 /* 75 76 cout 76 77 << "This installer comes bundled with a suitible version of java: " << endl … … 79 80 char r[1024]; cin >> r; 80 81 if ( strcmp( r, "y" ) == 0 || strcmp( r, "Y" ) == 0) { 81 extract_bundled_file( java, sizeof(java), (char*)"@java.installer@", true ); 82 system( "./@java.installer@" ); 83 jvmFound = true; //assume the java installation went well 84 } 82 */ 83 84 cout << "Using bundled java." << endl; 85 extract_bundled_file( java, sizeof(java), (char*)"@java.installer@", true ); 86 system( "tar -xzf @java.installer@" ); 87 jvmFound = true; //assume the java installation went well 88 89 /*}*/ 85 90 #endif 86 91
Note:
See TracChangeset
for help on using the changeset viewer.