You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by cc...@apache.org on 2007/08/26 23:29:40 UTC

svn commit: r569887 - in /directory/apacheds/trunk/server-installers: pom.xml src/main/installers/apacheds-server-win.nsi src/main/installers/apacheds-suite-win.nsi

Author: ccustine
Date: Sun Aug 26 14:29:39 2007
New Revision: 569887

URL: http://svn.apache.org/viewvc?rev=569887&view=rev
Log:
- DIRSERVER-1034 Fixes Windows installer when using NSIS 2.30

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=569887&r1=569886&r2=569887&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/pom.xml (original)
+++ directory/apacheds/trunk/server-installers/pom.xml Sun Aug 26 14:29:39 2007
@@ -290,7 +290,7 @@
               </packagedFiles>
 
               <id>win32</id>
-              <nsisCompiler>/usr/local/share/nsis/makensis</nsisCompiler>
+              <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
               <nsisConfigurationFile>src/main/installers/apacheds-server-win.nsi</nsisConfigurationFile>
               <finalName>
                 apacheds-server-${pom.version}-setup

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=569887&r1=569886&r2=569887&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 Sun Aug 26 14:29:39 2007
@@ -40,10 +40,10 @@
 BrandingText "${AppName} - ${AppVersion}"
 XPStyle on
 
-!define MUI_COMPONENTSPAGE_SMALLDESC
-!define MUI_WELCOMEFINISHPAGE_BITMAP "../../../src/main/resources/welcome.bmp"
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_BITMAP "../../../src/main/resources/both_header.bmp"
+!define MUI_COMPONENTSPAGE_SMALLDESC
+!define MUI_WELCOMEFINISHPAGE_BITMAP "../../../src/main/resources/welcome.bmp"
 !define iconfile "../../src/main/resources/adstree.ico"
 !define MUI_ICON ${iconfile}
 !define MUI_UNICON ${iconfile}

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=569887&r1=569886&r2=569887&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 Sun Aug 26 14:29:39 2007
@@ -42,10 +42,10 @@
 BrandingText "${AppName} - ${AppVersion}"
 XPStyle on
 
-!define MUI_COMPONENTSPAGE_SMALLDESC
-!define MUI_WELCOMEFINISHPAGE_BITMAP "../../../src/main/resources/welcome.bmp"
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_BITMAP "../../../src/main/resources/both_header.bmp"
+!define MUI_COMPONENTSPAGE_SMALLDESC
+!define MUI_WELCOMEFINISHPAGE_BITMAP "../../../src/main/resources/welcome.bmp"
 !define iconfile "../../src/main/resources/adstree.ico"
 !define MUI_ICON ${iconfile}
 !define MUI_UNICON ${iconfile}