Changeset 17339
- Timestamp:
- 2008-09-19 09:27:49 (4 months ago)
- Files:
-
- release-kits/wirk3/ant-scripts/build.xml (modified) (1 diff)
- release-kits/wirk3/ant-scripts/operations-on-gs3home.xml (modified) (3 diffs)
- release-kits/wirk3/bin/wirk3.exe (modified) (previous)
- release-kits/wirk3/installer/antinstall-config.xml (modified) (1 diff)
- release-kits/wirk3/installer/build.xml (modified) (2 diffs)
- release-kits/wirk3/src/wirk3.cpp (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
release-kits/wirk3/ant-scripts/build.xml
r17262 r17339 40 40 <antcall target="wrap"/> 41 41 </target> 42 42 43 43 </project> release-kits/wirk3/ant-scripts/operations-on-gs3home.xml
r17255 r17339 42 42 43 43 <antcall target="checkout-gs2build"/> 44 <antcall target="checkout-gli"/>45 44 <delete file="${gli.home}/gli.sh"/> 46 45 <delete file="${gli.home}/gems.sh"/> … … 96 95 97 96 <!-- clean up --> 98 <delete><fileset dir="${basedir}" includes="**/.svn"/></delete> 97 <delete includeemptydirs="true"> 98 <fileset dir="${basedir}" defaultexcludes="false"> 99 <include name="**/.svn/**" /> 100 <include name="**/.svn/" /> 101 <include name=".svn/**" /> 102 <include name=".svn/" /> 103 </fileset> 104 </delete> 99 105 <delete><fileset dir="${basedir}" includes="*.sh"/></delete> 100 106 <delete><fileset dir="${basedir}/gli" includes="*.sh"/></delete> … … 120 126 <antcall target="run-xslt-binary"/> 121 127 122 123 128 </target> 124 129 release-kits/wirk3/installer/antinstall-config.xml
r17281 r17339 48 48 <!-- start bundled java only --> 49 49 <target 50 target="install-j ava"50 target="install-jre" 51 51 diskRequirement="@component.size.windows-java@" 52 52 defaultValue="true" release-kits/wirk3/installer/build.xml
r17257 r17339 147 147 </target> 148 148 149 <target name="install-jre"> 150 <echo>Installing Java Runtime Environment</echo> 151 <mkdir dir="${installDir}/packages"/> 152 <copy todir="${installDir}/packages/jre"> 153 <fileset dir="../@java.extracted@"/> 154 </copy> 155 </target> 156 149 157 <target name="cleanuptarget"> 150 158 </target> … … 177 185 <shortcut 178 186 file="${startmenu.path}\Uninstall.lnk" 179 execute="${installDir}\winutil\search4j.exe -h packages\jre -l Uninstall er.jar"187 execute="${installDir}\winutil\search4j.exe -h packages\jre -l Uninstall.jar" 180 188 workingDirectory="${installDir}" 181 iconFile="${installDir}\images\icon.ico" 182 iconIndex="0" /> 183 184 189 iconFile="${installDir}\images\gs3.ico" 190 iconIndex="0" /> 191 185 192 <shortcut 186 193 file="${startmenu.path}\Documentation\README.lnk" release-kits/wirk3/src/wirk3.cpp
r17048 r17339 63 63 64 64 //set the classpath 65 classpath = pwd + "\\installer\\classes;" + 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 + "\\packages\\ant\\lib\\ant-antlr.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-bcel.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-bsf.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-log4j.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-oro.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-regexp.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-resolver.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-commons-logging.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-commons-net.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-icontract.jar;" + WIRK3_HOME + "\\packages\\ant-1.6.5\\lib\\ant-jai.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-javamail.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jdepend.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jmf.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jsch.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-junit.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-launcher.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-netrexx.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-nodeps.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-starteam.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-stylebook.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-swing.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-trax.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-vaj.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-weblogic.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-xalan1.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-xslp.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ant-installer.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\classes ";65 classpath = pwd + "\\installer\\classes;" + 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 + "\\packages\\ant\\lib\\ant-antlr.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-bcel.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-bsf.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-log4j.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-oro.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-regexp.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-resolver.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-commons-logging.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-commons-net.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-icontract.jar;" + WIRK3_HOME + "\\packages\\ant-1.6.5\\lib\\ant-jai.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-javamail.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jdepend.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jmf.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jsch.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-junit.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-launcher.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-netrexx.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-nodeps.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-starteam.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-stylebook.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-swing.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-trax.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-vaj.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-weblogic.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-xalan1.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-xslp.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ant-installer.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\classes;" + WIRK3_HOME + "\\ant-scripts\\tasks\\svnant\\lib\\svnjavahl.jar;" + WIRK3_HOME + "\\ant-scripts\\tasks\\svnant\\lib\\svnant.jar;" + WIRK3_HOME + "\\ant-scripts\\tasks\\svnant\\lib\\svnClientAdapter.jar"; 66 66 putenv( ("CLASSPATH=" + classpath).c_str() ); 67 putenv( ("SystemDrive=C:").c_str() ); 67 68 68 69 //create the command 69 command = WIRK3_HOME + "\\packages\\ant\\bin\\ant.bat -f " + WIRK3_HOME + "\\ant-scripts\\build.xml -addressing -Dwirk3.home=" + WIRK3_HOME;70 command = "\"\"" + WIRK3_HOME + "\\packages\\ant\\bin\\ant.bat\" -f \"" + WIRK3_HOME + "\\ant-scripts\\build.xml\" -addressing \"-Dwirk3.home=" + WIRK3_HOME + "\""; 70 71 //pass on the arguments 71 72 string a; … … 99 100 100 101 //set the basedir in the command 101 command = command + " -Dbasedir="; 102 command = command + pwd; 103 104 102 command = command + " \"-Dbasedir="; 103 command = command + pwd + "\"\""; 105 104 106 105 //command = command + "."; … … 116 115 117 116 cout << "pwd: " << pwd << endl; 118 cout << "command: " << command << endl;117 cout << "command: " << command.c_str() << endl; 119 118 120 119 system( command.c_str() );
