dion        2003/10/14 07:50:16

  Modified:    nsis/src/plugin-resources/templates project.jelly
                        setup.jelly
  Log:
  Conditionally include license. If no license file is found, no license page is 
generated in the installer
  
  Revision  Changes    Path
  1.4       +2 -0      maven-plugins/nsis/src/plugin-resources/templates/project.jelly
  
  Index: project.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/nsis/src/plugin-resources/templates/project.jelly,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.jelly     14 Oct 2003 07:33:04 -0000      1.3
  +++ project.jelly     14 Oct 2003 14:50:16 -0000      1.4
  @@ -17,8 +17,10 @@
   !define ORGANIZATION "${pom.organization}"
   !define PROJECT_BUILD_DIR "${build}"
   !define PROJECT_FINAL_NAME "${maven.final.name}"
  +<util:available file="${license}">
   !define PROJECT_LICENSE_FILE "${license}"
   !define PROJECT_LICENSE_TEXT "${maven.nsis.license.text}"
  +</util:available>
   !define PROJECT_NAME "${pom.name}"
   !define PROJECT_REG_KEY 
"SOFTWARE\${pom.organization}\${pom.name}\${pom.currentVersion}"
   !define PROJECT_REG_UNINSTALL_KEY 
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${pom.name} ${pom.version}"
  
  
  
  1.8       +5 -3      maven-plugins/nsis/src/plugin-resources/templates/setup.jelly
  
  Index: setup.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/nsis/src/plugin-resources/templates/setup.jelly,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- setup.jelly       14 Oct 2003 07:30:09 -0000      1.7
  +++ setup.jelly       14 Oct 2003 14:50:16 -0000      1.8
  @@ -51,9 +51,11 @@
   ; Sets the font of the installer
   SetFont "Arial" 8
   
  -; License Information
  -LicenseText "$${PROJECT_LICENSE_TEXT}"
  -LicenseData "$${PROJECT_LICENSE_FILE}"
  +!ifdef PROJECT_LICENSE_FILE
  +  ; License Information
  +  LicenseText "$${PROJECT_LICENSE_TEXT}"
  +  LicenseData "$${PROJECT_LICENSE_FILE}"
  +!endif
   
   ; The default installation directory
   InstallDir "$$PROGRAMFILES\$${ORGANIZATION}\$${PROJECT_NAME} $${PROJECT_VERSION}"
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to