Changeset 36690 for main/trunk/release-kits

Timestamp:

2022-10-06T10:54:09+13:00 (19 months ago)

Author:

kjdon

Message:

added PERL_PERTURB_KEYS=0 into the environment for building the demo collection. this is currently set in setup.bat/gs3-setup.bat, but in the release kits, under windows, the setup files are not called. (which they are under linux). thi sflag is needed so that perl doesn't make keys come out of a hashmap in a random order each time, which was added for security reasons. we need this to happen so that each time we read in the archives inf db during the build process, we get the documents coming out in the same order. if not, the sections don't match up between each pass through. Also, we need to use the 14+ iconv zip, not the old pre14 version, to match the version of visual studio on the build machine.

File:

• main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml (modified) (3 diffs)

main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

@@ -110 +110 @@
             
             <unzip src="${basedir}/compiled/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/compiled/common-src/packages/windows/stlport"/>
-            <unzip src="${basedir}/compiled/common-src/indexers/packages/windows/iconv/iconv-PRE-VS14.zip" dest="${basedir}/compiled/common-src/indexers/packages/windows/iconv"/>
+            <unzip src="${basedir}/compiled/common-src/indexers/packages/windows/iconv/iconv-VS14-PLUS.zip" dest="${basedir}/compiled/common-src/indexers/packages/windows/iconv"/>
             <untar src="${basedir}/compiled/common-src/packages/sqlite/sqlite-autoconf-3070602.tar.gz" dest="${basedir}/compiled/common-src/packages/sqlite" compression="gzip"/>
 
@@ -522 +522 @@
                 <env key="GSDLCOLLECTDIR" path="${basedir}/compiled/collect"/>
                 <env key="GSDLOS" value="windows"/>
+                <env key="PERL_PERTURB_KEYS" value="0"/>
                 <env key="PATH" path="${basedir}/compiled/bin/windows/perl/bin:${basedir}/compiled/bin/windows:${basedir}/compiled/bin/script:${env.PATH}"/>
             </exec>
@@ -527 +528 @@
                 <arg line="-S"/>
                 <arg line="bin/script/buildcol.pl demo"/>
+                <env key="PERL_PERTURB_KEYS" value="0"/>
                 <env key="GSDLHOME" path="${basedir}/compiled"/>
                 <env key="GSDLCOLLECTDIR" path="${basedir}/compiled/collect"/>