Changeset 15356 for release-kits
- Timestamp:
- 2008-05-07T15:58:52+12:00 (16 years ago)
- Location:
- release-kits/wirk3
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
release-kits/wirk3/ant-scripts/create-installer.xml
r15053 r15356 19 19 <target name="setup-for-installer-creation"> 20 20 <if><bool><istrue value="${execute}"/></bool> 21 21 22 22 <echo>Project Path: ${project.path}</echo> 23 23 <mkdir dir="${basedir}/installer"/> 24 24 <copy todir="${basedir}/installer" file="${wirk3.home}/installer/antinstall-config.xml"/> 25 <copy todir="${basedir}/installer" file="${wirk3.home}/installer/build.xml"/> 26 <copy todir="${basedir}/installer/cp"><fileset dir="${wirk3.home}/installer/cp"/></copy> 27 28 <!-- put the concrete values of things in the config --> 25 29 <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/> 30 <rsr file="${basedir}/installer/build.xml" pattern="@version@" replacement="${version}"/> 31 32 <!-- put the concrete values of things in the text --> 33 <!-- default --> 34 <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/> 35 <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/> 36 <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/> 37 <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/> 38 <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/> 39 40 <!-- chinese --> 41 <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@version@" replacement="${version}"/> 42 <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@java.min.version@" replacement="${java.min.version}"/> 43 <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/> 44 <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/> 45 <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/> 46 26 47 27 48 </if> … … 31 52 <if><bool><istrue value="${execute}"/></bool> 32 53 54 <taskdef name="installer" classname="org.tp23.antinstaller.taskdefs.Installer" classpathref="project.classpath"/> 55 33 56 <installer file="${basedir}/installer/greenstone-${version}-win32.jar" 34 57 compress="true" … … 41 64 icons="bluecurve"> 42 65 43 <zipfileset dir="${ project.installer.path}/cp" includes="resources/*"/>66 <zipfileset dir="${basedir}/installer/cp" includes="resources/*"/> 44 67 <zipfileset dir="${wirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset> 45 68 … … 55 78 <zipfileset dir="${project.path}/winutil" prefix="winutil"><include name="**/*"/></zipfileset> 56 79 <zipfileset dir="${project.path}/src" prefix="src"><include name="**/*"/></zipfileset> 80 57 81 </installer> 82 58 83 59 84 </if> -
release-kits/wirk3/ant-scripts/init.xml
r15181 r15356 24 24 <!-- antinstaller --> 25 25 <pathelement path="${wirk3.home}/bin/ant-installer/lib/ant-installer-ext.jar"/> 26 <pathelement path="${wirk3.home}/bin/ant-installer/lib/ant-installer.jar"/> 26 27 27 28 </path> … … 41 42 <taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="project.classpath"/> 42 43 <taskdef name="setloglevel" classname="SetLogLevel" classpathref="project.classpath"/> 43 <taskdef name="installer" classname="org.tp23.antinstaller.taskdefs.Installer" classpathref="project.classpath"/>44 45 44 <typedef name="addressedcall" classname="TreeCallTarget" classpathref="project.classpath"/> 46 45 <typedef name="rsr" classname="RegexSearchReplace" classpathref="project.classpath"/> … … 49 48 <!-- load in static properties from build.properties --> 50 49 <property file="build.properties" /> 50 51 <!-- the version numbers of bundled things --> 52 <property name="bundled.version.java" value="1.6.0_05"/> 53 <property name="bundled.version.tomcat" value="5.5.25"/> 54 <property name="bundled.version.ant" value="1.6.5"/> 51 55 52 56 <!-- project details (for ant-installer) --> -
release-kits/wirk3/installer/antinstall-config.xml
r15146 r15356 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <!DOCTYPE installer PUBLIC "-//tp23 //DTD Ant Installer Config//EN" "http://antinstaller.sf.net/dtd/antinstall-config-0.8.dtd"> 3 3 4 <installer 4 5 ui="swing,text" … … 6 7 debug="false" 7 8 lookAndFeel="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel" 8 name="Greenstone3 Installer"9 windowIcon="/resources/g kmain_inv.png"9 name="Greenstone3 @version@ Installer" 10 windowIcon="/resources/gs3-small.png" 10 11 defaultImageResource="/resources/makewavesdawn.png" 11 12 minJavaVersion="1.4"> 12 13 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"> 14 <!-- simple intro page --> 15 <page type="input" name="intro" displayText=""> 16 <comment name="welcome-message"/> 18 17 </page> 19 18 20 19 <!-- 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> 20 <page type="license" name="license" resource="/LICENSE.txt" displayText="" /> 27 21 28 <!-- type="input" shows a list of editable options for the installer --> 29 <page 30 type="input" 31 name="destination" 32 displayText="Install Destination"> 22 <!-- install destination page --> 23 <page type="input" name="destination" displayText=""> 33 24 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"/> 25 <directory property="installDir" 26 defaultValue="/usr/local/Greenstone-@version@" 27 defaultValueWin="${env.ProgramFiles}\Greenstone-@version@" 28 create="true" 29 displayText="" /> 40 30 41 31 </page> 42 32 43 <page type="input" name=" tomcatports" displayText="Tomcat Ports">33 <page type="input" name="selector" displayText=""> 44 34 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."/>35 <comment name="choose-components"/> 46 36 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"/> 37 <target target="install-core-components" defaultValue="true" force="true" displayText="" /> 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="" /> 41 50 42 </page> 51 43 44 <page type="input" name="tomcat-config" ifProperty="(${install-tomcat}==true)" displayText=""> 52 45 53 <page 54 type="input" 55 name="selector" 56 displayText="Components to install"> 57 <comment 58 name="choosecomponents" 59 displayText="Choose the components you want to install" 60 bold="true"/> 61 <target 62 displayText="Core components" 63 target="default" 64 defaultValue="true" 65 force="true"/> 66 67 <target 68 displayText="Source code" 69 target="tgsrc" 70 defaultValue="false"/> 71 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=""/> 49 72 50 </page> 73 51 74 <page 75 type="progress" 76 name="progress" 77 displayText="Installation progress" 78 showTargets="false" 79 target="cleanuptarget"> 52 <page type="progress" name="progress" showTargets="false" target="cleanuptarget" displayText=""> 80 53 </page> 81 54 -
release-kits/wirk3/installer/build.xml
r15146 r15356 23 23 24 24 25 <target name=" default" depends="">25 <target name="install-core-components"> 26 26 27 27 <!-- create the installation directory --> … … 57 57 <echo/> 58 58 59 <!-- 59 60 <echo message="Installing Packages (packages)"/> 60 61 <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/**/*"/></patternset></unzip> 61 62 <echo/> 63 --> 62 64 63 65 <echo message="Installing Resources (resources)"/> … … 88 90 <rsr file="${installDir}/build.properties" pattern="(tomcat.port[=:]).*" replacement="$1${tomcat.port}" /> 89 91 <rsr file="${installDir}/build.properties" pattern="(tomcat.shutdown.port[=:]).*" replacement="$1${tomcat.shutdown.port}" /> 92 <echo message="Changing tomcat ports in resources/tomcat/server.xml"/> 93 <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir.local}/packages/tomcat/conf/server.xml" overwrite="true"/> 90 94 91 <!-- change the tomcat ports in tomcats server.xml -->92 <echo message="Changing tomcat ports tomcat's server.xml"/>93 <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir.local}/packages/tomcat/conf/server.xml" overwrite="true"/>94 <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@server@" replacement="${tomcat.server}" />95 <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@port@" replacement="${tomcat.port}" />96 <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@shutdown-port@" replacement="${tomcat.shutdown.port}" />97 98 95 <!-- copy the greenstone3.xml file to tomcat --> 99 96 <echo message="Copying greenstone3.xml to tomcat directory"/> … … 132 129 133 130 <!-- Source --> 134 <target name=" tgsrc" depends="">131 <target name="install-source-code"> 135 132 <echo message="Installing Source Code (src)"/> 136 133 <mkdir dir="${installDir}/src"/> … … 142 139 </target> 143 140 141 <target name="install-tomcat"> 142 143 <echo message="Installing Apache Tomcat"/> 144 <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/tomcat/**/*"/></patternset></unzip> 145 146 <!-- change the tomcat ports in tomcats server.xml --> 147 <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@server@" replacement="${tomcat.server}" /> 148 <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@port@" replacement="${tomcat.port}" /> 149 <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@shutdown-port@" replacement="${tomcat.shutdown.port}" /> 150 151 </target> 152 <target name="install-ant"> 153 <echo message="Installing Apache Ant"/> 154 <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/ant/**/*"/></patternset></unzip> 155 </target> 156 144 157 <target name="cleanuptarget"> 145 158 </target> -
release-kits/wirk3/src/wirk3.cpp
r15095 r15356 26 26 string WIRK3_HOME = getenv( "WIRK3_HOME" ); 27 27 //string PWD = getenv( "CD" ); 28 29 //get the pwd 30 string pwd; 31 system( "CD > cd.dat" ); 32 ifstream file( "cd.dat" ) ; 33 getline(file, pwd); 34 file.close(); 35 system( "del cd.dat" ); 36 28 37 29 38 //set the classpath 30 classpath = JAVA_HOME + "\\lib\\tools.jar;" + WIRK3_HOME + "\\lib\\serializer.jar;" + WIRK3_HOME + "\\lib\\xalan.jar;" + WIRK3_HOME + "\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-antlr.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-bcel.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-bsf.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-log4j.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-oro.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-regexp.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-resolver.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-commons-logging.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-commons-net.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-icontract.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jai.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-javamail.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jdepend.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jmf.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jsch.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-junit.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-launcher.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-netrexx.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-nodeps.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-starteam.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-stylebook.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-swing.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-trax.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-vaj.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-weblogic.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-xalan1.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-xslp.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ant-installer.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\classes";39 classpath = pwd + "\\installer\\cp;" + JAVA_HOME + "\\lib\\tools.jar;" + WIRK3_HOME + "\\lib\\serializer.jar;" + WIRK3_HOME + "\\lib\\xalan.jar;" + WIRK3_HOME + "\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-antlr.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-bcel.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-bsf.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-log4j.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-oro.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-regexp.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-resolver.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-commons-logging.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-commons-net.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-icontract.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jai.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-javamail.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jdepend.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jmf.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jsch.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-junit.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-launcher.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-netrexx.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-nodeps.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-starteam.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-stylebook.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-swing.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-trax.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-vaj.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-weblogic.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-xalan1.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-xslp.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ant-installer.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\classes"; 31 40 putenv( ("CLASSPATH=" + classpath).c_str() ); 32 41 … … 37 46 //create the command 38 47 command = WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\bin\\ant.bat -f " + WIRK3_HOME + "\\ant-scripts\\build.xml -Dwirk3.home=" + WIRK3_HOME; 39 40 48 //pass on the arguments 41 49 string a; … … 70 78 71 79 } 72 //get the pwd 73 string pwd; 74 system( "CD > cd.dat" ); 75 ifstream file( "cd.dat" ) ; 76 getline(file, pwd); 77 file.close(); 78 system( "del cd.dat" ); 79 replace_all( pwd, "\\", "/" ); 80 81 82 //use forward slashes for everything else 83 //replace_all( pwd, "\\", "/" ); 80 84 81 85 //set the basedir in the command 82 86 command = command + " -Dbasedir="; 83 87 command = command + pwd; 88 89 90 84 91 //command = command + "."; 85 92
Note:
See TracChangeset
for help on using the changeset viewer.