Changeset 16631
- Timestamp:
- 2008-08-01 15:41:30 (5 months ago)
- Files:
-
- release-kits/wirk3/ant-scripts/operations-on-gs3home.xml (modified) (5 diffs)
- release-kits/wirk3/installer/build.xml (modified) (3 diffs)
- release-kits/wirk3/src/wirk3.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
release-kits/wirk3/ant-scripts/operations-on-gs3home.xml
r16523 r16631 35 35 <antcall target="update-winbin"/> 36 36 <antcall target="get-windows-binaries"/> 37 <antcall target="rename-gs2build-files-windows"/>38 37 <antcall target="compile-gs2build"/> 39 38 <antcall target="compile-packages"/> … … 49 48 <delete file="${gli.home}/gems.bat"/> 50 49 <delete file="${gli.home}/gems.sh"/> 51 <antcall target="rename-gs2build-files-dist"/> 52 <delete dir="${gs2build-extra.home}"/> 53 50 54 51 <!-- <antcall target="unzip-windows-packages"/> do we need this? --> 55 52 <antcall target="prepare-tomcat"/> … … 84 81 <!-- compile the java stuff --> 85 82 <antcall target="compile-web"/> 86 87 <!-- we can get this from the main greenstone3 directory88 <antcall target="compile-packages-and-indexers"/>-->89 83 <antcall target="compile-packages-and-indexers-javaonly"/> 90 84 <antcall target="distclean-packages"/> 91 85 <antcall target="compile-core"/> 92 86 <antcall target="compile-gli"/> … … 102 96 <move file="${gs2build.home}/win32.mak" tofile="${gs2build.home}/source/win32.mak"/> 103 97 <!--<move file="${gs2build.home}/setup.bat" tofile="${gs2build.home}/source/setup.bat"/>--> 104 < move file="${gs2build.home}/WIN32cfg.h" tofile="${gs2build.home}/source/WIN32cfg.h"/>98 <!--<move file="${gs2build.home}/win32cfg.h" tofile="${gs2build.home}/source/win32cfg.h"/>--> 105 99 106 100 <!-- clean up --> … … 147 141 <xslt in="${basedir}/build.xml" out="${basedir}/modified-build.xml" style="${wirk3.home}/greenstone3/xsl/convert-build-xml.xsl"/> 148 142 </target> 149 150 <target name="rename-gs2build-files-dist" depends="init">151 <mkdir dir="${gs2build.home}/gs2build-extra/lib"/>152 <copy file="${gs2build.home}/gs2build-extra/lib.win32.mak" tofile="${gs2build.home}/lib/win32.mak"/>153 <copy file="${gs2build.home}/gs2build-extra/win32.mak" tofile="${gs2build.home}/win32.mak"/>154 <copy file="${gs2build.home}/gs2build-extra/setup.bat" tofile="${gs2build.home}/setup.bat"/>155 </target>156 143 157 144 <target name="compile-packages-and-indexers-javaonly" depends="init"> 158 145 <echo>Getting Indexer Jars</echo> 159 146 <!-- install the jar files --> 160 <copy file="${basedir}/../../greenstone3/gs2build/ indexers/mg/mg.jar" todir="${lib.jni}"/>161 <copy file="${basedir}/../../greenstone3/gs2build/ indexers/mgpp/mgpp.jar" todir="${lib.jni}"/>162 <copy file="${basedir}/../../greenstone3/gs2build/ indexers/lucene-gs/LuceneWrapper.jar" todir="${web.lib}"/>147 <copy file="${basedir}/../../greenstone3/gs2build/common-src/indexers/mg/mg.jar" todir="${lib.jni}"/> 148 <copy file="${basedir}/../../greenstone3/gs2build/common-src/indexers/mgpp/mgpp.jar" todir="${lib.jni}"/> 149 <copy file="${basedir}/../../greenstone3/gs2build/common-src/indexers/lucene-gs/LuceneWrapper.jar" todir="${web.lib}"/> 163 150 <!-- javagdbm --> 164 151 <!-- install the jar file --> 165 <copy file="${basedir}/../../greenstone3/src/packages/javagdbm/javagdbm.jar" todir="${lib.jni}" />152 <copy file="${basedir}/../../greenstone3/src/packages/javagdbm/javagdbm.jar" todir="${lib.jni}" /> 166 153 </target> 167 154 release-kits/wirk3/installer/build.xml
r16284 r16631 23 23 </path> 24 24 <property name="installDir.local" refid="installDir.path"/> 25 26 <!-- load windows properties --> 27 <winprops/> 25 28 26 29 27 30 <target name="install-core-components"> 28 <!-- load windows properties -->29 <winprops/>30 31 31 32 <!-- create the installation directory --> … … 154 155 <target name="install-start-menu-shortcuts"> 155 156 156 <mkdir dir="${win32.personal.programs_menu}\Greenstone-@version@\documentation"/> 157 157 <mkdir dir="${win32.personal.programs_menu}\Greenstone-@version@\Documentation"/> 158 158 159 159 <shortcut … … 179 179 180 180 <shortcut 181 file="${win32.personal.programs_menu}\Greenstone-@version@\ documentation\README.lnk"181 file="${win32.personal.programs_menu}\Greenstone-@version@\Documentation\README.lnk" 182 182 execute="${installDir}\README.txt" /> 183 183 184 184 <shortcut 185 file="${win32.personal.programs_menu}\Greenstone-@version@\ documentation\Greenstone3 Users' Guide.lnk"185 file="${win32.personal.programs_menu}\Greenstone-@version@\Documentation\Greenstone3 Users' Guide.lnk" 186 186 execute="${installDir}\documentation\manual\manual.pdf" /> 187 187 188 188 <shortcut 189 file="${win32.personal.programs_menu}\Greenstone-@version@\ documentation\Greenstone2 Users' Guide.lnk"189 file="${win32.personal.programs_menu}\Greenstone-@version@\Documentation\Greenstone2 Users' Guide.lnk" 190 190 execute="${installDir}\documentation\manual\gs2_user_en.pdf" /> 191 191 release-kits/wirk3/src/wirk3.cpp
r16198 r16631 59 59 60 60 } else if ( a.compare("-descend") == 0 ) { 61 command += " -Dresume.mode=descend"; 62 61 command = command + " -Dresume.descend=" + argv[++i]; 63 62 } else if ( a.compare("-from") == 0 ) { 64 63 command = command + " -Dresume.from=" + argv[++i]; 65 //from=`echo $2 | sed 's/compile/1/g' | sed 's/create-distributions/2/g' | sed 's/create-installer/3/g' | sed 's/wrap/4/g'`66 //toexec=$toexec$from67 64 } else if ( a.compare("-to") == 0 ) { 68 65 command = command + " -Dresume.to=" + argv[++i]; 69 //to=`echo $2 | sed 's/compile/1/g' | sed 's/create-distributions/2/g' | sed 's/create-installer/3/g' | sed 's/wrap/4/g'`70 //toexec=$toexec$to71 66 } else { 72 67 command = command + " " + a;
