# HG changeset patch # User John D # Date 1520258705 18000 # Node ID 4d39ccb64c08e1631116047a1fa241a1d3cc1591 # Parent 56320dd51677e3bdab2156d55fd65be214f95aa5 nsis installer: remove jump into reg64 mode when compiled for win64 * tools/makeinst-script.sh.in: remove if ENABLE64 blocks in java detect diff -r 56320dd51677 -r 4d39ccb64c08 tools/makeinst-script.sh.in --- a/tools/makeinst-script.sh.in Sat Mar 03 19:42:43 2018 -0500 +++ b/tools/makeinst-script.sh.in Mon Mar 05 09:05:05 2018 -0500 @@ -642,10 +642,6 @@ ; 1 - JAVA_HOME environment variable ; 2 - the registry EOF - # use 64 bit reg to look for java - if [ "$ENABLE64" == "yes" ]; then - echo "SetRegView 64" >> $OUTFILE - fi cat >> $OUTFILE << EOF Push \$R0 @@ -675,10 +671,6 @@ Pop \$R1 Pop \$R0 EOF - # put reg back to 32 (our version of nsis is a 32 bit app) - if [ "$ENABLE64" == "yes" ]; then - echo "SetRegView 32" >> $OUTFILE - fi cat >> $OUTFILE << EOF FunctionEnd