You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2008/07/08 14:13:14 UTC
svn commit: r674792 - in /directory/installers/branches/bigbang/apacheds:
pom.xml src/main/installers/apacheds-server-win.nsi
Author: pamarcelot
Date: Tue Jul 8 05:13:14 2008
New Revision: 674792
URL: http://svn.apache.org/viewvc?rev=674792&view=rev
Log:
o Added a target for Solaris PKG installers, Refactored the Mac OS X PKG installer package name.
o Fix for DIRSERVER-1112 (ApacheDS installer creates redundant server.xml file).
o Fixed a bug in the Windows Installer which caused the user to be asked if he wants to launch the default instance even if he has chosen to not install a default instance.
Modified:
directory/installers/branches/bigbang/apacheds/pom.xml
directory/installers/branches/bigbang/apacheds/src/main/installers/apacheds-server-win.nsi
Modified: directory/installers/branches/bigbang/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/installers/branches/bigbang/apacheds/pom.xml?rev=674792&r1=674791&r2=674792&view=diff
==============================================================================
--- directory/installers/branches/bigbang/apacheds/pom.xml (original)
+++ directory/installers/branches/bigbang/apacheds/pom.xml Tue Jul 8 05:13:14 2008
@@ -571,16 +571,16 @@
</nsisTargets>
<!-- Targets for Mac OS X .pkg installer package -->
- <pkgTargets>
- <pkgTarget>
+ <macOsXPkgTargets>
+ <macOsXPkgTarget>
<id>apacheds-macosx</id>
<finalName>apacheds-${server-version}.dmg</finalName>
<osName>Mac OS X</osName>
<osFamily>macosx</osFamily>
<osArch>x86</osArch>
<daemonFramework>tanuki</daemonFramework>
- </pkgTarget>
- </pkgTargets>
+ </macOsXPkgTarget>
+ </macOsXPkgTargets>
<!-- Targets for Debian .deb installer package -->
<debTargets>
Modified: directory/installers/branches/bigbang/apacheds/src/main/installers/apacheds-server-win.nsi
URL: http://svn.apache.org/viewvc/directory/installers/branches/bigbang/apacheds/src/main/installers/apacheds-server-win.nsi?rev=674792&r1=674791&r2=674792&view=diff
==============================================================================
--- directory/installers/branches/bigbang/apacheds/src/main/installers/apacheds-server-win.nsi (original)
+++ directory/installers/branches/bigbang/apacheds/src/main/installers/apacheds-server-win.nsi Tue Jul 8 05:13:14 2008
@@ -153,7 +153,7 @@
SectionGroup "Apache Directory Server"
Section "Application Files" SecServerFiles
- SectionIn 1 2
+ SectionIn 1 RO
SetOutPath "$SERVER_HOME_DIR\bin"
File /r "bin\*.*"
@@ -178,6 +178,8 @@
Push $R0
Push "$SERVER_HOME_DIR\conf\apacheds.conf" ; file to replace in
Call ReplaceInFile
+
+ CreateDirectory "$INSTANCE_HOME_DIR"
;Store install folder
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Server" "DisplayName" "${Project} Server - (remove only)"
@@ -207,7 +209,9 @@
; This section needs a custom screen to ask for a name for the instance (replace default)
Section "Example Instance" SecInstanceFiles
- SectionIn 1 2
+ SectionIn 1
+ StrCpy $R9 "Passed the Example Instance section"
+
Push "default"
Call CreateInstanceDirs
@@ -216,6 +220,8 @@
File "conf\log4j.properties"
File /oname=apacheds.conf "conf\apacheds-default.conf"
File "conf\server.xml"
+ ; Removing the redundant server.xml file (see DIRSERVER-1112)
+ Delete "$SERVER_HOME_DIR\conf\server.xml"
Push "$INSTANCE_HOME_DIR\default\conf"
Push "*.*"
@@ -295,6 +301,8 @@
Push "$INSTANCE_HOME_DIR\conf\apacheds-default.conf"
Call ConvertUnixNewLines
+ StrCmp $R9 "" End
+
; Start the server
MessageBox MB_YESNO|MB_ICONQUESTION "Do you want to start the default directory instance?" IDYES startService IDNO End
startService: