avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/merlin/platform/installer/src/nsis merlin.nsi
Date Sun, 28 Dec 2003 22:04:18 GMT
mcconnell    2003/12/28 14:04:18

  Modified:    merlin/platform/installer izpack.xml maven.xml
  Added:       merlin/platform/installer/src LICENSE.txt
               merlin/platform/installer/src/etc LICENSE.txt
               merlin/platform/installer/src/izpack izpack.xml
               merlin/platform/installer/src/nsis merlin.nsi
  Log:
  Housekeeping.
  
  Revision  Changes    Path
  1.2       +1 -1      avalon/merlin/platform/installer/izpack.xml
  
  Index: izpack.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/installer/izpack.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- izpack.xml	28 Dec 2003 09:01:10 -0000	1.1
  +++ izpack.xml	28 Dec 2003 22:04:18 -0000	1.2
  @@ -21,7 +21,7 @@
   <!--  Add when an official Merlin image exists  
       res id="Installer.image" src="resources/merlin.gif" /
   -->
  -    <res id="InfoPanel.info" src="README.TXT" parse="yes" />
  +    <res id="InfoPanel.info" src="README.TXT" parse="no" />
       <res id="LicencePanel.licence" src="LICENSE.txt" />
     </resources>
     
  
  
  
  1.4       +1 -1      avalon/merlin/platform/installer/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/installer/maven.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- maven.xml	28 Dec 2003 10:26:08 -0000	1.3
  +++ maven.xml	28 Dec 2003 22:04:18 -0000	1.4
  @@ -18,7 +18,7 @@
       <filter token="VERSION" value="${pom.currentVersion}" />
       <copy 
           tofile="${maven.build.dir}/temp-installer.xml" 
  -        file="${basedir}/izpack.xml" 
  +        file="${basedir}/src/izpack/izpack.xml" 
           filtering="yes" 
       />
       <ant:izpack input="${maven.build.dir}/temp-installer.xml"
  
  
  
  1.1                  avalon/merlin/platform/installer/src/LICENSE.txt
  
  Index: LICENSE.txt
  ===================================================================
  
   The Apache Software License, Version 1.1
  
   Copyright (C) 1997-2003 The Apache Software Foundation.
   All rights reserved.
  
   Redistribution and use in source and binary forms, with or without modifica-
   tion, are permitted provided that the following conditions are met:
  
   1. Redistributions of  source code must  retain the above copyright  notice,
      this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
  
   3. The end-user documentation included with the redistribution, if any, must
      include  the following  acknowledgment:  "This product includes  software
      developed  by the  Apache Software Foundation  (http://www.apache.org/)."
      Alternately, this  acknowledgment may  appear in the software itself,  if
      and wherever such third-party acknowledgments normally appear.
  
   4. The  names   "Apache",   "Avalon",  "Excalibur",  "Fortress",  "Phoenix",
      "Merlin" and "Apache Software Foundation" must not be used  to endorse or
      promote  products  derived  from  this  software  without  prior  written
      permission.  For written permission, please contact apache@apache.org.
  
   5. Products  derived from this software may not  be called "Apache", nor may
      "Apache" appear  in their name,  without prior written permission  of the
      Apache Software Foundation.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
   APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
   INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
   DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
   OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
   ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
   (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
   This software  consists of voluntary contributions made  by many individuals
   on  behalf of the Apache Software  Foundation. For more  information on the
   Apache Software Foundation, please see http://www.apache.org/.
  
  
  
  
  1.1                  avalon/merlin/platform/installer/src/etc/LICENSE.txt
  
  Index: LICENSE.txt
  ===================================================================
  
   The Apache Software License, Version 1.1
  
   Copyright (C) 1997-2003 The Apache Software Foundation.
   All rights reserved.
  
   Redistribution and use in source and binary forms, with or without modifica-
   tion, are permitted provided that the following conditions are met:
  
   1. Redistributions of  source code must  retain the above copyright  notice,
      this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
  
   3. The end-user documentation included with the redistribution, if any, must
      include  the following  acknowledgment:  "This product includes  software
      developed  by the  Apache Software Foundation  (http://www.apache.org/)."
      Alternately, this  acknowledgment may  appear in the software itself,  if
      and wherever such third-party acknowledgments normally appear.
  
   4. The  names   "Apache",   "Avalon",  "Excalibur",  "Fortress",  "Phoenix",
      "Merlin" and "Apache Software Foundation" must not be used  to endorse or
      promote  products  derived  from  this  software  without  prior  written
      permission.  For written permission, please contact apache@apache.org.
  
   5. Products  derived from this software may not  be called "Apache", nor may
      "Apache" appear  in their name,  without prior written permission  of the
      Apache Software Foundation.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
   APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
   INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
   DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
   OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
   ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
   (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
   This software  consists of voluntary contributions made  by many individuals
   on  behalf of the Apache Software  Foundation. For more  information on the
   Apache Software Foundation, please see http://www.apache.org/.
  
  
  
  
  1.1                  avalon/merlin/platform/installer/src/izpack/izpack.xml
  
  Index: izpack.xml
  ===================================================================
  <?xml version="1.0 encoding="UTF-8" ?>
  
  <installation version="1.0" >
    <info>
      <appname>Avalon Merlin</appname>
      <appversion>@VERSION@</appversion>
      <url>http://avalon.apache.org/merlin</url>
      <authors> 
        <author name="Avalon Development Team" email="dev@avalon.apache.org" />
      </authors>
      <uninstaller write="yes" />
    </info>
    
    <guiprefs resizable="yes" width="700" height="350" />
    
    <locale>
      <langpack iso3="eng" />
    </locale>
    
    <resources>
  <!--  Add when an official Merlin image exists  
      res id="Installer.image" src="resources/merlin.gif" /
  -->
      <res id="InfoPanel.info" src="README.TXT" parse="no" />
      <res id="LicencePanel.licence" src="LICENSE.txt" />
    </resources>
    
    <panels>
      <panel classname="HelloPanel" />
      <panel classname="LicencePanel" />
      <panel classname="InfoPanel" />
      <panel classname="TargetPanel" />
      <panel classname="PacksPanel" />
      <panel classname="InstallPanel" />
      <panel classname="FinishPanel" />
    </panels>
    
    <packs>
      <pack name="merlin.distro" required="yes" preselected="yes">
        <description 
          align="left" 
          id="merlin.distro.description" 
          txt="This installs Avalon Merlin for command-line and embedded use." 
        />
        <file src="." targetdir="$INSTALL_PATH/" />
      </pack>
    </packs>
  </installation> 
  
  
  
  1.1                  avalon/merlin/platform/installer/src/nsis/merlin.nsi
  
  Index: merlin.nsi
  ===================================================================
  ;NSIS Modern User Interface version 1.63
  ;Welcome/Finish Page Example Script
  ;Written by Joost Verburg
  
  !define MUI_PRODUCT "Merlin"
  !define MUI_VERSION "3.2"
  
  !include "MUI.nsh"
    
  ;--------------------------------
  ;Configuration
  
    ;General
    OutFile "..\..\target\merlin-install-3.2.exe"
  
    ;Folder selection page
    InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
    
    ;Remember install folder
    InstallDirRegKey HKCU "Software\${MUI_PRODUCT}" ""
  
  ;--------------------------------
  ;Modern UI Configuration
  
    !define MUI_WELCOMEPAGE
    !define MUI_LICENSEPAGE
    !define MUI_COMPONENTSPAGE
    !define MUI_DIRECTORYPAGE
    !define MUI_FINISHPAGE
    
    !define MUI_ABORTWARNING
    
    !define MUI_UNINSTALLER
    !define MUI_UNCONFIRMPAGE
  
    
  ;--------------------------------
  ;Languages
   
    !insertmacro MUI_LANGUAGE "English"
    
  ;--------------------------------
  ;Language Strings
  
    ;Description
    LangString DESC_SecCopyUI ${LANG_ENGLISH} "Merlin core system resources."
  
  ;--------------------------------
  ;Data
    
    LicenseData "./../etc/license.txt"
    
  ;--------------------------------
  ;Reserve Files
  
    ;Things that need to be extracted on first (keep these lines before any File command!)
    ;Only useful for BZIP2 compression
    !insertmacro MUI_RESERVEFILE_WELCOMEFINISHPAGE
  
  ;--------------------------------
  ;Installer Sections
  
  Section "Merlin Kernel" SecCopyUI
  
    SectionIn RO
  
    ;Add your stuff here
  
    SetOutPath "$INSTDIR"
    File /r "..\..\..\..\target\merlin\**"
  
    ;Store install folder
    WriteRegStr HKCU "Software\${MUI_PRODUCT}" "" $INSTDIR
      
    ;Create uninstaller
    WriteUninstaller "$INSTDIR\Uninstall.exe"
  
  SectionEnd
  
  Section "Start Menu Shortcuts"
  
    CreateDirectory "$SMPROGRAMS\${MUI_PRODUCT}"
    CreateShortCut "$SMPROGRAMS\${MUI_PRODUCT}\Uninstall.lnk" "$INSTDIR\uninstall.exe" ""
"$INSTDIR\uninstall.exe" 0
    
    CreateShortCut "$SMPROGRAMS\${MUI_PRODUCT}\Readme.lnk" "$INSTDIR\README.txt" "" "$INSTDIR\README.txt"
0
  
  SectionEnd
  
  
  ;--------------------------------
  ;Descriptions
  
  !insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN
    !insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI)
  !insertmacro MUI_FUNCTIONS_DESCRIPTION_END
  
  ;--------------------------------
  ;Uninstaller Section
  
  Section "Uninstall"
  
    ;Add your stuff here
  
    Delete "$INSTDIR\Uninstall.exe"
    Delete "$INSTDIR\INSTALL.TXT"
    Delete "$INSTDIR\LICENSE.TXT"
    Delete "$INSTDIR\README.TXT"
  
    RMDir /r "$INSTDIR\bin"
    RMDir /r "$INSTDIR\config"
    RMDir /r "$INSTDIR\system"
    RMDir "$INSTDIR"
  
    ; remove shortcuts, if any
    Delete "$SMPROGRAMS\${MUI_PRODUCT}\*.*"
    RMDir "$SMPROGRAMS\${MUI_PRODUCT}"
  
    DeleteRegKey /ifempty HKCU "Software\${MUI_PRODUCT}"
  
    !insertmacro MUI_UNFINISHHEADER
  
  SectionEnd
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message