directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1000826 - in /directory/apacheds/branches/apacheds-apacheds-2.0: apacheds-installers/ installers-plugin/src/main/java/org/apache/directory/daemon/installers/nsis/ installers-plugin/src/main/resources/org/apache/directory/daemon/installers/...
Date Fri, 24 Sep 2010 12:13:40 GMT
Author: pamarcelot
Date: Fri Sep 24 12:13:40 2010
New Revision: 1000826

URL: http://svn.apache.org/viewvc?rev=1000826&view=rev
Log:
Added a new Uninstaller icon and a 'Manage ApacheDS' executable utility which launches the
'Services' control panel where the ApacheDS service can be started/stopped.

Added:
    directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/nsis/Manage
ApacheDS.exe   (with props)
    directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/nsis/uninstaller.ico
  (with props)
Modified:
    directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/pom.xml
    directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java
    directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/nsis/installer.nsi

Modified: directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/pom.xml?rev=1000826&r1=1000825&r2=1000826&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/pom.xml (original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/pom.xml Fri Sep
24 12:13:40 2010
@@ -77,7 +77,7 @@
               <nsisTargets>
                 <nsisTarget>
                   <id>apacheds-win32</id>
-                  <finalName>apacheds-${version}-setup.exe</finalName>
+                  <finalName>apacheds-${version}.exe</finalName>
                   <osName>Windows</osName>
                   <osArch>x86</osArch>
                 </nsisTarget>
@@ -101,7 +101,7 @@
       <id>deploy-installer-server-win32</id>
       <activation>
         <file>
-          <exists>target/images/apacheds-${server.version}-setup.exe</exists>
+          <exists>target/images/apacheds-${server.version}.exe</exists>
         </file>
       </activation>
       <build>

Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java?rev=1000826&r1=1000825&r2=1000826&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java
(original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java
Fri Sep 24 12:13:40 2010
@@ -86,17 +86,23 @@ public class NsisInstallerCommand extend
         {
             copyCommonFiles( mojo );
 
-            // Copying the 'installer.nsi' file
-            MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream(
-                "installer.nsi" ), installerFile, true );
+            // Copying the 'Manage ApacheDS' utility
+            MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "Manage ApacheDS.exe"
), new File(
+                getInstallationDirectory(), "Manage ApacheDS.exe" ) );
 
-            // Copying the images and icon
-            MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "installer.ico"
), new File(
-                targetDirectory, "installer.ico" ) );
+            // Copying the images and icons
             MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "header.bmp"
), new File(
                 targetDirectory, "header.bmp" ) );
             MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "welcome.bmp"
), new File(
                 targetDirectory, "welcome.bmp" ) );
+            MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "installer.ico"
), new File(
+                targetDirectory, "installer.ico" ) );
+            MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "uninstaller.ico"
), new File(
+                targetDirectory, "uninstaller.ico" ) );
+
+            // Copying the 'installer.nsi' file
+            MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream(
+                "installer.nsi" ), installerFile, true );
         }
         catch ( Exception e )
         {

Added: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/nsis/Manage
ApacheDS.exe
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/nsis/Manage%20ApacheDS.exe?rev=1000826&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/nsis/Manage
ApacheDS.exe
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/nsis/installer.nsi
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/nsis/installer.nsi?rev=1000826&r1=1000825&r2=1000826&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/nsis/installer.nsi
(original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/nsis/installer.nsi
Fri Sep 24 12:13:40 2010
@@ -22,7 +22,8 @@
 #
     !define Application "ApacheDS"
     !define Version "${version}"
-    !define Icon "installer.ico"
+    !define InstallerIcon "installer.ico"
+    !define UninstallerIcon "uninstaller.ico"
     !define WelcomeImage "welcome.bmp"
     !define HeaderImage "header.bmp"
     !define OutFile "${finalname}"
@@ -71,10 +72,10 @@
     XPStyle on
 
     # Installer icon
-    !define MUI_ICON "${Icon}"
+    !define MUI_ICON "${InstallerIcon}"
     
     # Uninstaller icon
-    !define MUI_UNICON "${Icon}"
+    !define MUI_UNICON "${UninstallerIcon}"
     
     # Welcome image
     !define MUI_WELCOMEFINISHPAGE_BITMAP "${WelcomeImage}"
@@ -173,15 +174,7 @@
         Push $R0
         Push "$SERVER_HOME_DIR\conf\wrapper.conf" # file to replace in
         Call ReplaceInFile
-    
-        # Creating directory in start menu
-        CreateDirectory "$SMPROGRAMS\${Application}"
         
-        # Creating links in start menu
-        !insertmacro CreateInternetShortcut "$SMPROGRAMS\${Application}\Basic Users Guide"
"http://directory.apache.org/apacheds/1.5/apacheds-v15-basic-users-guide.html"
-        !insertmacro CreateInternetShortcut "$SMPROGRAMS\${Application}\Advanced Users Guide"
"http://directory.apache.org/apacheds/1.5/apacheds-v15-advanced-users-guide.html"
-        !insertmacro CreateInternetShortcut "$SMPROGRAMS\${Application}\Developers Guide"
"http://directory.apache.org/apacheds/1.5/apacheds-v15-developers-guide.html"
-
         # Configuring registries for the uninstaller
         WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ApacheDS" "DisplayName"
"${Application} - (remove only)"
         WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ApacheDS" "DisplayIcon"
"$SERVER_HOME_DIR\uninstall.exe"
@@ -192,8 +185,20 @@
         # Creating the uninstaller
         WriteUninstaller "$INSTDIR\Uninstall.exe"
         
+    
+        # Creating directory in start menu
+        CreateDirectory "$SMPROGRAMS\${Application}"
+        
+        # Creating links in start menu
+        !insertmacro CreateInternetShortcut "$SMPROGRAMS\${Application}\Basic Users Guide"
"http://directory.apache.org/apacheds/1.5/apacheds-v15-basic-users-guide.html"
+        !insertmacro CreateInternetShortcut "$SMPROGRAMS\${Application}\Advanced Users Guide"
"http://directory.apache.org/apacheds/1.5/apacheds-v15-advanced-users-guide.html"
+        !insertmacro CreateInternetShortcut "$SMPROGRAMS\${Application}\Developers Guide"
"http://directory.apache.org/apacheds/1.5/apacheds-v15-developers-guide.html"
+        
+        # Creating a shortcut to the 'Manage ApacheDS' utility
+        CreateShortCut "$SMPROGRAMS\${Application}\Manage ApacheDS.lnk" "$SERVER_HOME_DIR\Manage
ApacheDS.exe" "" "$SERVER_HOME_DIR\Manage ApacheDS.exe" 0
+        
         # Creating a shortcut to the uninstaller
-        CreateShortCut "$SMPROGRAMS\${Application}\Uninstall.lnk" "$SERVER_HOME_DIR\Uninstall.exe"
"" "$SERVER_HOME_DIR\Uninstall.exe" 0
+        CreateShortCut "$SMPROGRAMS\${Application}\Uninstall ApacheDS.lnk" "$SERVER_HOME_DIR\Uninstall.exe"
"" "$SERVER_HOME_DIR\Uninstall.exe" 0
         
     	# Writing instances files
         SetOutPath "$INSTANCES_HOME_DIR"

Added: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/nsis/uninstaller.ico
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/nsis/uninstaller.ico?rev=1000826&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/nsis/uninstaller.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message