dion 2003/10/09 21:01:59 Modified: src/installer/nsis maven_setup.nsi Added: src/installer/nsis JDK.nsh BrandingImage.nsh Log: Extract common bits Add JAVA_HOME check Revision Changes Path 1.3 +5 -24 maven/src/installer/nsis/maven_setup.nsi Index: maven_setup.nsi =================================================================== RCS file: /home/cvs/maven/src/installer/nsis/maven_setup.nsi,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- maven_setup.nsi 10 Oct 2003 02:39:56 -0000 1.2 +++ maven_setup.nsi 10 Oct 2003 04:01:59 -0000 1.3 @@ -4,14 +4,8 @@ ; http://maven.apache.org/ ; macro for the image on the install screen -!macro BIMAGE IMAGE PARMS - Push $0 - GetTempFileName $0 - File /oname=$0 "${IMAGE}" - SetBrandingImage ${PARMS} $0 - Delete $0 - Pop $0 -!macroend +!include "BrandingImage.nsh" +!include "JDK.nsh" !define MAVEN_SRC_HOME "..\..\.." !define MAVEN_VERSION "1.0-rc1" @@ -126,28 +120,15 @@ ; -------------------------------------------------------------- Add Images to the Installer / UnInstaller Function .onGUIInit - !insertmacro BIMAGE "maven.bmp" "" + !insertmacro BrandingImage "maven.bmp" "" ; TODO Check for a JAVA_HOME environment variable - ClearErrors - ReadEnvStr $0 "JAVA_HOME" - - IfErrors 0 Found - ClearErrors - MessageBox MB_OK|MB_ICONSTOP "Maven Requires a JAVA_HOME environment variable set. Please set JAVA_HOME and try installing again" - Abort - ; If it doesn't exist - ; check the registry for one - ; if that exists - ; set that as JAVA_HOME - ; else - ; MessageBox about maven needing java home set to run? - Found: + Call AssertJavaHome FunctionEnd ; add the maven logo to the un-installer Function un.onGUIInit - !insertmacro BIMAGE "maven.bmp" "" + !insertmacro BrandingImage "maven.bmp" "" FunctionEnd ; -------------------------------------------------------------- End of File 1.1 maven/src/installer/nsis/JDK.nsh Index: JDK.nsh =================================================================== Function AssertJavaHome ClearErrors ReadEnvStr $0 "JAVA_HOME" IfErrors 0 Found ClearErrors MessageBox MB_OK|MB_ICONSTOP "The JAVA_HOME environment variable must be set. Please set JAVA_HOME to the location of your JDK and try installing again" Abort Found: FunctionEnd 1.1 maven/src/installer/nsis/BrandingImage.nsh Index: BrandingImage.nsh =================================================================== ; macro for the image on the install screen !macro BrandingImage IMAGE PARMS Push $0 GetTempFileName $0 File /oname=$0 "${IMAGE}" SetBrandingImage ${PARMS} $0 Delete $0 Pop $0 !macroend
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
