directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r571043 - in /directory/apacheds/trunk/server-installers: pom.xml src/main/installers/apacheds-server-win.nsi src/main/installers/apacheds-studio-win.nsi src/main/installers/apacheds-suite-win.nsi
Date Thu, 30 Aug 2007 05:21:32 GMT
Author: ccustine
Date: Wed Aug 29 22:21:31 2007
New Revision: 571043

URL: http://svn.apache.org/viewvc?rev=571043&view=rev
Log:
- Stand alone Windows installer for Studio

Added:
    directory/apacheds/trunk/server-installers/src/main/installers/apacheds-studio-win.nsi
Modified:
    directory/apacheds/trunk/server-installers/pom.xml
    directory/apacheds/trunk/server-installers/src/main/installers/apacheds-server-win.nsi
    directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi

Modified: directory/apacheds/trunk/server-installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/pom.xml?rev=571043&r1=571042&r2=571043&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/pom.xml (original)
+++ directory/apacheds/trunk/server-installers/pom.xml Wed Aug 29 22:21:31 2007
@@ -143,7 +143,8 @@
                      dest="ApacheDirectoryStudio.zip"
                 />
                 <touch file="ApacheDirectoryStudio.zip"/>
-                <unzip src="ApacheDirectoryStudio.zip" dest="target/images/win32" overwrite="false"
/>
+                <unzip src="ApacheDirectoryStudio.zip" dest="target/images/suite-win32"
overwrite="false" />
+                <unzip src="ApacheDirectoryStudio.zip" dest="target/images/studio-win32"
overwrite="false" />
               </tasks>
             </configuration>
             <goals>
@@ -358,7 +359,7 @@
                 </packagedFile>
               </packagedFiles>
 
-              <id>win32</id>
+              <id>server-win32</id>
               <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
               <nsisConfigurationFile>src/main/installers/apacheds-server-win.nsi</nsisConfigurationFile>
               <finalName>
@@ -398,11 +399,33 @@
                 </packagedFile>
               </packagedFiles>
 
-              <id>win32</id>
+              <id>suite-win32</id>
               <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
               <nsisConfigurationFile>src/main/installers/apacheds-suite-win.nsi</nsisConfigurationFile>
               <finalName>
                 apacheds-suite-${pom.version}-setup
+              </finalName>
+              <osName>Windows XP</osName>
+              <osFamily>windows</osFamily>
+              <osVersion>5.1</osVersion>
+              <osArch>x86</osArch>
+              <daemonFramework>tanuki</daemonFramework>
+            </nsisTarget>
+            <nsisTarget>
+              <packagedFiles>
+                <packagedFile>
+                  <source>../resources/suite-installer.ico</source>
+                  <destinationPath>studio-installer.ico</destinationPath>
+                  <executable>false</executable>
+                  <filtered>false</filtered>
+                </packagedFile>
+              </packagedFiles>
+
+              <id>studio-win32</id>
+              <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
+              <nsisConfigurationFile>src/main/installers/apacheds-studio-win.nsi</nsisConfigurationFile>
+              <finalName>
+                apacheds-studio-${pom.version}-setup
               </finalName>
               <osName>Windows XP</osName>
               <osFamily>windows</osFamily>

Modified: directory/apacheds/trunk/server-installers/src/main/installers/apacheds-server-win.nsi
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/src/main/installers/apacheds-server-win.nsi?rev=571043&r1=571042&r2=571043&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/src/main/installers/apacheds-server-win.nsi
(original)
+++ directory/apacheds/trunk/server-installers/src/main/installers/apacheds-server-win.nsi
Wed Aug 29 22:21:31 2007
@@ -73,7 +73,7 @@
 
   ; License page
   !insertmacro MUI_PAGE_WELCOME
-  !insertmacro MUI_PAGE_LICENSE "win32\LICENSE"
+  !insertmacro MUI_PAGE_LICENSE "server-win32\LICENSE"
 
   ; This page checks for JRE. It displays a dialog based on JRE.ini if it needs to install
JRE
   ; Otherwise you won't see it.
@@ -121,7 +121,7 @@
   !insertmacro MUI_UNPAGE_CONFIRM
   !insertmacro MUI_UNPAGE_INSTFILES
 
-!cd win32
+!cd server-win32
 
 
 ;--------------------------------

Added: directory/apacheds/trunk/server-installers/src/main/installers/apacheds-studio-win.nsi
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/src/main/installers/apacheds-studio-win.nsi?rev=571043&view=auto
==============================================================================
--- directory/apacheds/trunk/server-installers/src/main/installers/apacheds-studio-win.nsi
(added)
+++ directory/apacheds/trunk/server-installers/src/main/installers/apacheds-studio-win.nsi
Wed Aug 29 22:21:31 2007
@@ -0,0 +1,210 @@
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
+!define AppName "${app.description}"
+!define AppVersion "${app.version}"
+!define OutFile "${app.final.name}"
+!define ShortName "${app}"
+!define SourceDir "${app.base.dir}\src"
+!define JRE_VERSION "1.5.0"
+!define Vendor "Apache Software Foundation"
+!define Project "Apache Directory"
+!define Suite "Apache Directory Suite"
+
+!define JAVA_URL "http://java.sun.com/javase/downloads/index_jdk5.jsp"
+
+!macro CreateInternetShortcut FILENAME URL ;ICONFILE ICONINDEX
+WriteINIStr "${FILENAME}.url" "InternetShortcut" "URL" "${URL}"
+!macroend
+
+!include "MUI.nsh"
+!include "Sections.nsh"
+
+;--------------------------------
+;Configuration
+
+  ;General
+  Name "${AppName}"
+  OutFile "..\${OutFile}.exe"
+
+  ;Folder selection page
+  InstallDir "$PROGRAMFILES\${AppName}"
+
+  ;Get install folder from registry if available
+  InstallDirRegKey HKLM "SOFTWARE\${Vendor}\${ShortName}" ""
+
+; Installation types
+;InstType "Studio Only"
+
+BrandingText "${AppName} - ${AppVersion}"
+XPStyle on
+
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "${SourceDir}\main\resources\header_studio.bmp"
+!define MUI_COMPONENTSPAGE_SMALLDESC
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${SourceDir}\main\resources\welcome_studio.bmp"
+!define iconfile "${SourceDir}\main\resources\studio-installer.ico"
+!define MUI_ICON "${iconfile}"
+!define MUI_UNICON "${iconfile}"
+
+;--------------------------------
+;Pages
+
+  ; License page
+  !insertmacro MUI_PAGE_WELCOME
+  !insertmacro MUI_PAGE_LICENSE "studio-win32\LICENSE"
+
+  !define MUI_INSTFILESPAGE_FINISHHEADER_TEXT "Installation complete"
+  !define MUI_PAGE_HEADER_TEXT "Installing"
+  !define MUI_PAGE_HEADER_SUBTEXT "Please wait while ${AppName} is being installed."
+
+  !insertmacro MUI_PAGE_COMPONENTS
+
+  # The main installation directory
+
+  Var STUDIO_HOME_DIR
+  !define MUI_DIRECTORYPAGE_VARIABLE          $STUDIO_HOME_DIR  ;selected by user
+  !define MUI_DIRECTORYPAGE_TEXT_DESTINATION  "Apache Directory Studio Install Directory"
    ;descriptive text
+  !define MUI_DIRECTORYPAGE_TEXT_TOP          "This is the location where you would like
to install Apache Directory Studio."
+  !insertmacro MUI_PAGE_DIRECTORY  ; this pops-up the GUI page
+
+  !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_PAGE_FINISH
+
+; Uninstall  
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_INSTFILES
+
+!cd studio-win32
+
+
+;--------------------------------
+;Modern UI Configuration
+
+  !define MUI_ABORTWARNING
+
+;--------------------------------
+;Languages
+
+!insertmacro MUI_LANGUAGE "English"
+
+
+;--------------------------------
+;Language Strings
+
+  ;Description
+  LangString DESC_SecServerFiles ${LANG_ENGLISH} "Apache Directory Server Application Files"
+  LangString DESC_SecStudioFiles ${LANG_ENGLISH} "Apache Directory Studio Application Files"
+  LangString DESC_SecStudioConnections ${LANG_ENGLISH} "Example connections to locally installed
server"
+  LangString DESC_SecInstanceFiles ${LANG_ENGLISH} "Example server instance"
+
+  ;Header
+  LangString TEXT_JRE_TITLE ${LANG_ENGLISH} "Java Runtime Environment"
+  LangString TEXT_JRE_SUBTITLE ${LANG_ENGLISH} "Installation"
+  LangString TEXT_PRODVER_TITLE ${LANG_ENGLISH} "Installed version of ${AppName}"
+  LangString TEXT_PRODVER_SUBTITLE ${LANG_ENGLISH} "Installation cancelled"
+
+;--------------------------------
+;Installer Sections
+
+
+SectionGroup "Apache Directory Studio"
+Section "Application Files" SecStudioFiles
+  SectionIn 1 3
+  SetOutPath "$STUDIO_HOME_DIR"
+  File /r "ApacheDirectoryStudio\*"
+
+  ;Store install folder
+  WriteRegStr HKLM "SOFTWARE\${Vendor}\${Project}\Studio" "InstallDir" "$STUDIO_HOME_DIR"
+
+  CreateDirectory "$SMPROGRAMS\Apache Directory Suite\Studio"
+  CreateShortCut "$SMPROGRAMS\Apache Directory Suite\Studio\Studio.lnk" "$STUDIO_HOME_DIR\Apache
Directory Studio.exe" "" "$STUDIO_HOME_DIR\Apache Directory Studio.exe" 0
+
+  # Probably need to filter the file here (put in instance home)
+
+  ;Store install folder
+  WriteRegStr HKLM "SOFTWARE\${Vendor}\${Project}\Studio" "InstallDir" $STUDIO_HOME_DIR
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "DisplayName"
"${Studio} - (remove only)"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "DisplayIcon"
"$STUDIO_HOME_DIR\uninstall.exe"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "UninstallString"
'"$STUDIO_HOME_DIR\uninstall.exe"'
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "NoModify"
"1"
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}" "NoRepair"
"1"
+
+  ;Create uninstaller
+  WriteUninstaller "$STUDIO_HOME_DIR\Uninstall.exe"
+
+  CreateDirectory "$SMPROGRAMS\Apache Directory Suite\Studio"
+
+  CreateShortCut "$SMPROGRAMS\Apache Directory Suite\Studio\Uninstall.lnk" "$STUDIO_HOME_DIR\uninstall.exe"
"" "$STUDIO_HOME_DIR\uninstall.exe" 0
+
+
+SectionEnd
+Section "Example Connections" SecStudioConnections
+  SectionIn 1 3
+
+  IfFileExists "$PROFILE\.ApacheDirectoryStudio\.metadata\.plugins\org.apache.directory.studio.ldapbrowser.core\browserconnections.xml"
End 0
+  SetOutPath "$PROFILE\.ApacheDirectoryStudio\.metadata\.plugins\org.apache.directory.studio.ldapbrowser.core"
+  File "${SourceDir}\main\resources\browserconnections.xml"
+
+  IfFileExists "$PROFILE\.ApacheDirectoryStudio\.metadata\.plugins\org.apache.directory.studio.connection.core\connections.xml"
End 0
+  SetOutPath "$PROFILE\.ApacheDirectoryStudio\.metadata\.plugins\org.apache.directory.studio.connection.core"
+  File "${SourceDir}\main\resources\connections.xml"
+End:
+
+SectionEnd
+SectionGroupEnd
+
+;--------------------------------
+;Descriptions
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecStudioFiles} $(DESC_SecStudioFiles)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecStudioConnections} $(DESC_SecStudioConnections)
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+;---------------------------------
+; Functions
+
+;--------------------------------
+;Installer Functions
+
+Function .onInit
+    SetCurInstType 0
+    SetAutoClose false
+    StrCpy $STUDIO_HOME_DIR "$PROGRAMFILES\Apache Directory Studio"
+FunctionEnd
+
+;--------------------------------
+;Uninstaller Section
+
+Section "Uninstall"
+  ReadRegStr $STUDIO_HOME_DIR HKLM "SOFTWARE\${Vendor}\${Project}\Studio" "InstallDir"
+
+  ; remove registry keys
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project}"
+  DeleteRegKey HKLM  "SOFTWARE\${Vendor}\${Project}"
+
+  ; remove shortcuts, if any.
+  RMDir /r "$SMPROGRAMS\Apache Directory Suite"
+
+  ; remove files in root, then all dirs created by the installer.... leave user added or
instance dirs.
+  RMDir /r "$STUDIO_HOME_DIR"  ;Studio install dir
+
+SectionEnd
+

Modified: directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi?rev=571043&r1=571042&r2=571043&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi
(original)
+++ directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi
Wed Aug 29 22:21:31 2007
@@ -75,7 +75,7 @@
 
   ; License page
   !insertmacro MUI_PAGE_WELCOME
-  !insertmacro MUI_PAGE_LICENSE "win32\LICENSE"
+  !insertmacro MUI_PAGE_LICENSE "suite-win32\LICENSE"
 
   ; This page checks for JRE. It displays a dialog based on JRE.ini if it needs to install
JRE
   ; Otherwise you won't see it.
@@ -129,7 +129,7 @@
   !insertmacro MUI_UNPAGE_CONFIRM
   !insertmacro MUI_UNPAGE_INSTFILES
 
-!cd win32
+!cd suite-win32
 
 
 ;--------------------------------



Mime
View raw message