From 4b51b7e353ded800b092e7c4c9e04647ad4604ff Mon Sep 17 00:00:00 2001 From: dion Date: Tue, 14 Oct 2003 06:49:48 +0000 Subject: [PATCH] Add some directories on the include list Conditionally add the logo in git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114194 13f79535-47bb-0310-9956-ffa450edef68 --- .../plugin-resources/templates/setup.jelly | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/nsis/src/plugin-resources/templates/setup.jelly b/nsis/src/plugin-resources/templates/setup.jelly index e407d8d3..ccab1ae7 100644 --- a/nsis/src/plugin-resources/templates/setup.jelly +++ b/nsis/src/plugin-resources/templates/setup.jelly @@ -16,7 +16,9 @@ ; add project source onto the include list !addincludedir "${maven.nsis.src}" +; add generated files onto the include list !addincludedir "${maven.build.dir}" +; add plugin supplied files onto the include list !addincludedir "${plugin.resources}" ; macro for the image on the install screen @@ -39,14 +41,15 @@ OutFile "${PROJECT_BUILD_DIR}\${PROJECT_FINAL_NAME}.exe" ; Adds an XP manifest to the installer XPStyle on -; branding with maven logo +; branding with logo +; FIXME: position and size need to be properties AddBrandingImage left 70|267 ; Sets the font of the installer SetFont "Arial" 8 ; License Information -LicenseText "This program is Licensed under The Apache Software License, Version 1.1." +LicenseText "${PROJECT_LICENSE_TEXT}" LicenseData "${PROJECT_LICENSE_FILE}" ; The default installation directory @@ -89,8 +92,9 @@ SectionEnd ; -------------------------------------------------------------- Create Shortcuts Section "Create Start Menu Shortcut(s)" -; it would be nice to get all this from navigation.xml :-) CreateDirectory "${PROJECT_STARTMENU_FOLDER}" +; it would be nice to get all this from navigation.xml :-) +; FIXME: need to use an include for this. CreateShortCut "${PROJECT_STARTMENU_FOLDER}\Maven.lnk" "$INSTDIR\bin\maven.bat" "" "$INSTDIR\bin\maven.bat" 0 CreateShortCut "${PROJECT_STARTMENU_FOLDER}\Install Maven Repository.lnk" "$INSTDIR\bin\install_repo.bat" "" "$INSTDIR\install_repo.bat" 0 CreateShortCut "${PROJECT_STARTMENU_FOLDER}\Uninstall.lnk" "$INSTDIR\Uninst.exe" "" "$INSTDIR\Uninst.exe" 0 @@ -142,15 +146,21 @@ SectionEnd ; -------------------------------------------------------------- Add Images to the Installer / UnInstaller Function .onGUIInit - !insertmacro BrandingImage "maven.bmp" "" - ; TODO Check for a JAVA_HOME environment variable - Call AssertJavaHome + !ifdef PROJECT_LOGO + !insertmacro BrandingImage "${PROJECT_LOGO}" "" + ; FIXME: Make an include + ; TODO Check for a JAVA_HOME environment variable + Call AssertJavaHome + !endif FunctionEnd -; add the maven logo to the un-installer +; add the logo to the un-installer Function un.onGUIInit - !insertmacro BrandingImage "maven.bmp" "" + !ifdef PROJECT_LOGO + !insertmacro BrandingImage "${PROJECT_LOGO}" "" + ; FIXME: Make an include + !endif FunctionEnd ; -------------------------------------------------------------- End of File