From: Bdale Garbee Date: Wed, 25 Jun 2014 03:56:25 +0000 (-0600) Subject: Merge branch 'branch-1.4' into debian X-Git-Tag: debian/1.4.1-1~1 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=27dbfb4f01f30457fccb22cfe2aba2b3b022a020;hp=5d0af8e108b5b8dc39779e80bb76e04a54dcb5ea Merge branch 'branch-1.4' into debian --- diff --git a/ChangeLog b/ChangeLog index e8d53477..a15dbfa5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,105 @@ +commit 1517ad263ba4c0b8c9251a726cce1ed8a86a634c +Author: Bdale Garbee +Date: Tue Jun 24 21:54:30 2014 -0600 + + releasing 1.4.1 + +commit 6986da4407ac53e267b95abb1848211ea9d32b41 +Merge: 5f6059a 237472e +Author: Bdale Garbee +Date: Tue Jun 24 21:31:53 2014 -0600 + + Merge branch 'branch-1.4' of ssh://git.gag.com/scm/git/fw/altos into branch-1.4 + +commit 5f6059a9273dfe557145a9f620db81693f3bc27e +Author: Bdale Garbee +Date: Tue Jun 24 21:22:26 2014 -0600 + + need the api key in Bdale's root too + +commit 42fd93b67af396b0478e9e795026cf1a5312e5c9 +Author: Bdale Garbee +Date: Tue Jun 24 21:12:59 2014 -0600 + + make sure to use Google Maps API key for official builds + +commit 9a78df4ea121d1d3c14da2abae1a82c34121e13c +Author: Bdale Garbee +Date: Sun Jun 15 18:41:25 2014 -0600 + + notes updated for TeleGPS and 1.4 release learnings + +commit 237472e1b98283a82c674bb48c0347189d9d37bf +Author: Keith Packard +Date: Tue Jun 24 20:15:38 2014 -0700 + + altosuilib: Mark 'Configure AltosUI' window with maps key status + + This lets us check a build to make sure it has a maps key + + Signed-off-by: Keith Packard + +commit 0da9cdfbeacbaed13615ca2daade372920299c4a +Author: Keith Packard +Date: Fri Jun 20 11:56:58 2014 -0700 + + Add note about including Google maps API key + + Signed-off-by: Keith Packard + +commit 2bbbd2c22e32d4c40782a9f12657f1a385cc6bc7 +Author: Keith Packard +Date: Fri Jun 20 11:51:11 2014 -0700 + + Add 1.4.1 release notes + + Signed-off-by: Keith Packard + +commit 9dbd752150875f1f9fc93063f66d2153ec15d935 +Author: Keith Packard +Date: Wed Jun 18 14:16:36 2014 -0700 + + altosui: Ship TeleMetrum v2.0 firmware with AltosUI + + Signed-off-by: Keith Packard + +commit 44f60782d73bf5fdb6e1e54a3fdbe50808b7d7f5 +Author: Keith Packard +Date: Tue Jun 17 20:46:33 2014 -0700 + + Fix java version detection and downloading + + Move java stuff to a common include file, java.nsh + + Let any version no older than 1.6 serve by using ${VersionCompare} + + Use version 6 downloads as those don't require a click-through agreement. + + Signed-off-by: Keith Packard + +commit 7140ca8a4bc0be8386f8edacadb7ac5d88c6f1b1 +Author: Keith Packard +Date: Tue Jun 17 00:08:03 2014 -0700 + + Sign our .inf file with the comodo key. Update signing-driver + + I've tested this on Windows 7 and it appears to work. No idea if it + works on Windows 8 yet. + + Signed-off-by: Keith Packard + +commit 9ab3a1de95b705783c31a7e16447f52c10b6b480 +Author: Bdale Garbee +Date: Sun Jun 15 17:44:42 2014 -0600 + + turn-on support for TeleGPS + +commit b40351d5cb9802133f443d4f5150958b03b9e8f0 +Author: Bdale Garbee +Date: Sun Jun 15 17:43:50 2014 -0600 + + tagging 1.4 release + commit 97a7cbaee806965ca7c696fb02f6e1d24b026b9b Author: Bdale Garbee Date: Sun Jun 15 17:43:06 2014 -0600 diff --git a/Releasing b/Releasing index 1822efbe..c04a1de8 100644 --- a/Releasing +++ b/Releasing @@ -2,34 +2,35 @@ These are Bdale's notes on how to do a release. git checkout master - - make sure there is a doc/release-notes-.xsl - - make sure that doc/altusmetrum.xsl has the right copyright year, - and add release to the revision history at the front (release notes - will be pulled in automatically) + - make sure the Google Maps API key is in the build chroot and root + sudo mkdir -p /var/cache/pbuilder/base.cow/opt/google /opt/google + sudo cp ~/altusmetrumllc/google-maps-api-key \ + /var/cache/pbuilder/base.cow/opt/google/maps-api-key + sudo ln -sf /home/bdale/altusmetrumllc/google-maps-api-key \ + /opt/google/maps-api-key - - get a Google Maps API key and install it in - ~/altusmetrumllc/google-maps-api-key. If you don't have a - key, the app will still work, but downloading map tiles will - be slow, and you will only be able to download a limited - number per day. + - if this is an x.y release, then: + git checkout -b branch- + - if this is an x.y.z release, then: + git checkout branch- # the x.y parts only + - cherry-pick or merge appropriate content from master + - update the version in configure.ac - git log > ChangeLog - git commit -a + - make sure there is a doc/release-notes-.xsl + - make sure that doc/altusmetrum.xsl has the right copyright year, + and add release to the revision history at the front (release notes + will be pulled in automatically) - make absolutely sure checked-out tree is "clean" - make absolutely sure the pdclib/ submodule is on the master branch, up to date, and "clean" - - if this is an x.y release, then: - git checkout -b branch- - git tag -a - - edit .git/gbp.conf to use branch- as upstream + git log > ChangeLog + git commit -a + git tag -a # full x.y.z version - - if this is an x.y.z release, then: - git checkout branch- # the x.y parts only - git merge master - git tag -a # full x.y.z version + - make sure .git/gbp.conf set to use branch- as upstream git checkout debian git merge branch- @@ -73,7 +74,7 @@ These are Bdale's notes on how to do a release. src/telemega-v1.0/flash-loader/*.elf \ src/telemetrum-v2.0/flash-loader/*.elf \ ~/altusmetrumllc/Binaries/loaders/ - (cd ~/altusmetrumllc ; git commit -a) + (cd ~/altusmetrumllc ; git add Binaries ; git commit -a) - copy the relevant release notes file from doc/ to /home/bdale/web/altusmetrum/AltOS/releases/ @@ -81,8 +82,12 @@ These are Bdale's notes on how to do a release. - create /home/bdale/web/altusmetrum/MicroPeak/releases/, and move the MicroPeak installers from AltOS/releases to there - - go edit ~/web/altusmetrum/AltOS/releases/.mdwn and - /home/bdale/web/altusmetrum/MicroPeak/releases/.mdwn, to + - create /home/bdale/web/altusmetrum/TeleGPS/releases/, + and move the MicroPeak installers from AltOS/releases to there + + - go edit ~/web/altusmetrum/AltOS/releases/.mdwn, + /home/bdale/web/altusmetrum/MicroPeak/releases/.mdwn, and + /home/bdale/web/altusmetrum/TeleGPS/releases/.mdwn, to include release date and explicit ref to dir contents so the web pages shows versioned links, commit and push diff --git a/altosui/Instdrv/NSIS/Includes/java.nsh b/altosui/Instdrv/NSIS/Includes/java.nsh new file mode 100644 index 00000000..ebf1c5b9 --- /dev/null +++ b/altosui/Instdrv/NSIS/Includes/java.nsh @@ -0,0 +1,50 @@ +!include WordFunc.nsh + +; Definitions for Java Detection + +!define JRE_VERSION "1.6" +!define JRE32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=52247&/jre-6u27-windows-i586.exe" +!define JRE64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=52249&/jre-6u27-windows-x64.exe" + +Var JavaDownload +Var JavaBits + +Function GetJRE + ${If} ${RunningX64} + StrCpy $JavaDownload ${JRE64_URL} + StrCpy $JavaBits "64" + ${Else} + StrCpy $JavaDownload ${JRE32_URL} + StrCpy $JavaBits "32" + ${EndIf} + + MessageBox MB_OK "This product uses Java ${JRE_VERSION}, \ + $JavaBits bits, it will now \ + be downloaded and installed" + + StrCpy $2 "$TEMP\Java Runtime Environment.exe" + nsisdl::download /TIMEOUT=30000 $JavaDownload $2 + Pop $R0 ;Get the return value + StrCmp $R0 "success" +3 + MessageBox MB_OK "Download failed: $R0" + Quit + ExecWait $2 + Delete $2 +FunctionEnd + +Function DetectJRE + ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" \ + "CurrentVersion" + + DetailPrint "Desired Java version ${JRE_VERSION}" + DetailPrint "Actual Java version $2" + + ${VersionCompare} $2 ${JRE_VERSION} $3 + + IntCmp $3 1 done done + + Call GetJRE + +done: + +FunctionEnd diff --git a/altosui/Makefile.am b/altosui/Makefile.am index 98a5e193..4cb5df58 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -100,7 +100,8 @@ FIRMWARE_TD=$(FIRMWARE_TD_0_2) FIRMWARE_TM_1_0=$(top_srcdir)/src/telemetrum-v1.0/telemetrum-v1.0-$(VERSION).ihx FIRMWARE_TM_1_1=$(top_srcdir)/src/telemetrum-v1.1/telemetrum-v1.1-$(VERSION).ihx FIRMWARE_TM_1_2=$(top_srcdir)/src/telemetrum-v1.2/telemetrum-v1.2-$(VERSION).ihx -FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_2) +FIRMWARE_TM_2_0=$(top_srcdir)/src/telemetrum-v2.0/telemetrum-v2.0-$(VERSION).ihx +FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_2) $(FIRMWARE_TM_2_0) FIRMWARE_TELEMINI_1_0=$(top_srcdir)/src/telemini-v1.0/telemini-v1.0-$(VERSION).ihx FIRMWARE_TELEMINI=$(FIRMWARE_TELEMINI_1_0) diff --git a/altosui/altos-windows.nsi.in b/altosui/altos-windows.nsi.in index b72772e2..2e2a46f1 100644 --- a/altosui/altos-windows.nsi.in +++ b/altosui/altos-windows.nsi.in @@ -1,10 +1,8 @@ !addplugindir Instdrv/NSIS/Plugins +!addincludedir Instdrv/NSIS/Includes !include x64.nsh -; Definitions for Java 1.7 Detection -!define JRE_VERSION "1.7" -!define JRE_ALTERNATE "1.6" -!define JRE32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=83383&/jre-7u51-windows-i586.exe" -!define JRE64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=83385&/jre-7u51-windows-x64.exe" +!include java.nsh + !define PRODUCT_NAME "Altus Metrum Windows Software" Name "Altus Metrum Installer" @@ -35,45 +33,6 @@ Function .onInit ${EndIf} FunctionEnd -Var JavaDownload -Var JavaBits - -Function GetJRE - ${If} ${RunningX64} - StrCpy $JavaDownload ${JRE64_URL} - StrCpy $JavaBits "64" - ${Else} - StrCpy $JavaDownload ${JRE32_URL} - StrCpy $JavaBits "32" - ${EndIf} - - MessageBox MB_OK "${PRODUCT_NAME} uses Java ${JRE_VERSION}, \ - $JavaBits bits, it will now \ - be downloaded and installed" - - StrCpy $2 "$TEMP\Java Runtime Environment.exe" - nsisdl::download /TIMEOUT=30000 $JavaDownload $2 - Pop $R0 ;Get the return value - StrCmp $R0 "success" +3 - MessageBox MB_OK "Download failed: $R0" - Quit - ExecWait $2 - Delete $2 -FunctionEnd - -Function DetectJRE - ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" \ - "CurrentVersion" - - StrCmp $2 ${JRE_VERSION} done - - StrCmp $2 ${JRE_ALTERNATE} done - - Call GetJRE - - done: -FunctionEnd - ; Pages to present Page license @@ -145,6 +104,7 @@ Section "TeleMetrum, TeleDongle and TeleBT Firmware" File "../src/telemetrum-v1.0/telemetrum-v1.0-${VERSION}.ihx" File "../src/telemetrum-v1.1/telemetrum-v1.1-${VERSION}.ihx" File "../src/telemetrum-v1.2/telemetrum-v1.2-${VERSION}.ihx" + File "../src/telemetrum-v2.0/telemetrum-v2.0-${VERSION}.ihx" File "../src/telemini-v1.0/telemini-v1.0-${VERSION}.ihx" File "../src/telegps-v1.0/telegps-v1.0-${VERSION}.ihx" File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx" diff --git a/altosuilib/AltosUIConfigure.java b/altosuilib/AltosUIConfigure.java index 920ed8e2..0e82cacb 100644 --- a/altosuilib/AltosUIConfigure.java +++ b/altosuilib/AltosUIConfigure.java @@ -243,7 +243,9 @@ public class AltosUIConfigure constraints(0, 3)); row++; - pane.add(new JLabel (String.format("AltOS version %s", AltosUIVersion.version)), + pane.add(new JLabel (String.format("AltOS version %s (%smaps key)", + AltosUIVersion.version, + AltosUIVersion.has_google_maps_api_key() ? "" : "no ")), constraints(0, 3)); row++; diff --git a/altusmetrum.cat b/altusmetrum.cat index 2d7e8b26..eb5dff98 100644 Binary files a/altusmetrum.cat and b/altusmetrum.cat differ diff --git a/configure.ac b/configure.ac index 23dc9d82..fdae9b6f 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) -AC_INIT([altos], 1.4) +AC_INIT([altos], 1.4.1) AC_CONFIG_SRCDIR([src/kernel/ao.h]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE diff --git a/debian/rules b/debian/rules index 57c7e742..c1c9a0f8 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,8 @@ prebuild: configure: configure-stamp configure-stamp: dh_testdir - PKG_CONFIG_PATH=/opt/stlink/lib/pkgconfig ./autogen.sh --prefix=/usr + PKG_CONFIG_PATH=/opt/stlink/lib/pkgconfig ./autogen.sh \ + --prefix=/usr --with-google-key=/opt/google/maps-api-key touch configure-stamp build: build-arch build-indep diff --git a/doc/Makefile b/doc/Makefile index 254e63c4..c39450c7 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -15,7 +15,8 @@ RELNOTES=\ release-notes-1.3.html \ release-notes-1.3.1.html \ release-notes-1.3.2.html \ - release-notes-1.4.html + release-notes-1.4.html \ + release-notes-1.4.1.html PICTURES=\ altosui.png \ @@ -107,6 +108,9 @@ distclean: altusmetrum.html: $(RELNOTES_XSL) $(IMAGES) altusmetrum.pdf: $(RELNOTES_XSL) $(IMAGES) +telegps.html: $(RELNOTES_XSL) $(IMAGES) +telegps.pdf: $(RELNOTES_XSL) $(IMAGES) + $(PDF): $(FOSTYLE) $(TEMPLATES) indent: altusmetrum.xsl diff --git a/doc/altusmetrum.xsl b/doc/altusmetrum.xsl index 5ccbee9f..c68bbac9 100644 --- a/doc/altusmetrum.xsl +++ b/doc/altusmetrum.xsl @@ -40,6 +40,13 @@ + + 1.4.1 + 24 June 2014 + + Minor release fixing some installation bugs. + + 1.4 15 June 2014 @@ -5413,6 +5420,13 @@ NAR #88757, TRA #12200 Release Notes + + Version 1.41 + + Version 1.4 + + +
+ + Version 1.4.1 is a minor release. It fixes install issues on + Windows and provides the missing TeleMetrum V2.0 firmware. There + aren't any changes to the firmware or host applications at + all. All Windows users will want to upgrade to get the signed + driver, but Mac and Linux users who do not need the TeleMetrum + V2.0 firmware image will not need to upgrade. + + + Windows Install Fixes + + + + Provide signed Windows driver files. This should avoid any need to + disable driver signature checking on Windows 7 or 8. + + + + + Fix Java version detection and download. Previously, the + installer would only look for Java 6 or 7 and insist on + downloading its own Java bits if there was something else + installed. Furthermore, the 64-bit Java link provided didn't + work for anyone other than Keith, making it impossible to + install AltOS on any machine with Java SE 8 installed. + + + + + + Other Fixes + + + + Include 1.4 firmware for TeleMetrum V2.0. None of the + installers shipped this file. Now it's included in the AltOS + packages for Linux, Mac and Windows. + + + + + Include Google Application Key for map downloading. The 1.4 + release didn't have this key in the released version of the + software, making map downloading fail for most people. + + + + +
diff --git a/doc/telegps.xsl b/doc/telegps.xsl index 836c3d9a..bf7eec5a 100644 --- a/doc/telegps.xsl +++ b/doc/telegps.xsl @@ -28,6 +28,13 @@ + + 1.4.1 + 20 June 2014 + + Minor release fixing some installation bugs. + + 1.4 13 June 2014 @@ -1295,6 +1302,23 @@ NAR #88757, TRA #12200 + + Release Notes + + Version 1.41 + + + + Version 1.4 + + + diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am index 216874df..39ebc43a 100644 --- a/micropeak/Makefile.am +++ b/micropeak/Makefile.am @@ -272,7 +272,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(WINDOWS_DIST): $(WINDOWS_FILES) micropeak-windows.nsi -rm -f $@ - makensis -Omicropeak-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" micropeak-windows.nsi + makensis -Omicropeak-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" micropeak-windows.nsi || (cat micropeak-windows.log && exit 1) Manifest.txt: Makefile echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@ diff --git a/micropeak/micropeak-windows.nsi.in b/micropeak/micropeak-windows.nsi.in index 6dc9d8c1..bb5da1bb 100644 --- a/micropeak/micropeak-windows.nsi.in +++ b/micropeak/micropeak-windows.nsi.in @@ -1,11 +1,7 @@ !addplugindir Instdrv/NSIS/Plugins +!addincludedir ../altosui/Instdrv/NSIS/Includes !include x64.nsh -; Definitions for Java 1.7 Detection -!define JRE_VERSION "1.7" -!define JRE_ALTERNATE "1.6" -!define JRE32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=83383&/jre-7u51-windows-i586.exe" -!define JRE64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=83385&/jre-7u51-windows-x64.exe" -!define PRODUCT_NAME "Altus Metrum Windows Software" +!include java.nsh Name "Altus Metrum MicroPeak Installer" @@ -35,44 +31,6 @@ Function .onInit ${EndIf} FunctionEnd -Var JavaDownload -Var JavaBits - -Function GetJRE - ${If} ${RunningX64} - StrCpy $JavaDownload ${JRE64_URL} - StrCpy $JavaBits "64" - ${Else} - StrCpy $JavaDownload ${JRE32_URL} - StrCpy $JavaBits "32" - ${EndIf} - - MessageBox MB_OK "${PRODUCT_NAME} uses Java ${JRE_VERSION}, \ - $JavaBits bits, it will now \ - be downloaded and installed" - - StrCpy $2 "$TEMP\Java Runtime Environment.exe" - nsisdl::download /TIMEOUT=30000 $JavaDownload $2 - Pop $R0 ;Get the return value - StrCmp $R0 "success" +3 - MessageBox MB_OK "Download failed: $R0" - Quit - ExecWait $2 - Delete $2 -FunctionEnd - -Function DetectJRE - ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" \ - "CurrentVersion" - StrCmp $2 ${JRE_VERSION} done - - StrCmp $2 ${JRE_ALTERNATE} done - - Call GetJRE - - done: -FunctionEnd - ; Pages to present Page license diff --git a/signing-driver b/signing-driver index 177c5079..240609c4 100644 --- a/signing-driver +++ b/signing-driver @@ -2,19 +2,25 @@ Notes on getting a signing key for driver signing http://technet.microsoft.com/en-us/library/dd919238%28v=ws.10%29.aspx -# use MMC to add the certificates snap-in for ComputerAccount on Local computer +Start MMC as administrator (start a console as administrator, launch +mmc from there). -Run console as Administrator: +Use MMC to add the certificates snap-in for ComputerAccount on Local computer -makecert -r -n "CN=AltusMetrum" -ss AltusMetrumCertStore -sr LocalMachine +Create a key store for our keys called AltusMetrumCertStore + +Add our key from ~/altusmetrumllc/altusmetrum-key.p12 + +# Our cert is now called "Altus Metrum, LLC" + +Create a new directory with a simple path. Copy altusmetrum.inf to +that directory # contains the altusmetrum.inf file we ship. Make sure # is otherwise empty or inf2cat will get confused inf2cat /driver: /os:7_X86,7_X64,8_X86,8_X64 -signtool sign /s AltusMetrumCertStore /n “AltusMetrum" +signtool sign /s AltusMetrumCertStore /n “Altus Metrum, LLC" /t http://timestamp.verisign.com/scripts/timestamp.dll altusmetrum.cat - -pnputil -i -a altusmetrum.inf diff --git a/telegps/telegps-windows.nsi.in b/telegps/telegps-windows.nsi.in index e6798c46..b4145520 100644 --- a/telegps/telegps-windows.nsi.in +++ b/telegps/telegps-windows.nsi.in @@ -1,11 +1,7 @@ !addplugindir ../altosui/Instdrv/NSIS/Plugins +!addincludedir ../altosui/Instdrv/NSIS/Includes !include x64.nsh -; Definitions for Java 1.7 Detection -!define JRE_VERSION "1.7" -!define JRE_ALTERNATE "1.6" -!define JRE32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=83383&/jre-7u51-windows-i586.exe" -!define JRE64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=83385&/jre-7u51-windows-x64.exe" -!define PRODUCT_NAME "TeleGPS Windows Software" +!include java.nsh Name "TeleGPS Installer" @@ -35,45 +31,6 @@ Function .onInit ${EndIf} FunctionEnd -Var JavaDownload -Var JavaBits - -Function GetJRE - ${If} ${RunningX64} - StrCpy $JavaDownload ${JRE64_URL} - StrCpy $JavaBits "64" - ${Else} - StrCpy $JavaDownload ${JRE32_URL} - StrCpy $JavaBits "32" - ${EndIf} - - MessageBox MB_OK "${PRODUCT_NAME} uses Java ${JRE_VERSION}, \ - $JavaBits bits, it will now \ - be downloaded and installed" - - StrCpy $2 "$TEMP\Java Runtime Environment.exe" - nsisdl::download /TIMEOUT=30000 $JavaDownload $2 - Pop $R0 ;Get the return value - StrCmp $R0 "success" +3 - MessageBox MB_OK "Download failed: $R0" - Quit - ExecWait $2 - Delete $2 -FunctionEnd - -Function DetectJRE - ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" \ - "CurrentVersion" - - StrCmp $2 ${JRE_VERSION} done - - StrCmp $2 ${JRE_ALTERNATE} done - - Call GetJRE - - done: -FunctionEnd - ; Pages to present Page license