directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r570001 - in /directory: apacheds/trunk/server-installers/src/main/installers/apacheds-server-win.nsi daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java
Date Mon, 27 Aug 2007 05:29:14 GMT
Author: ccustine
Date: Sun Aug 26 22:29:14 2007
New Revision: 570001

URL: http://svn.apache.org/viewvc?rev=570001&view=rev
Log:
- DIRSERVER-1034 Fixes Windows installer when using NSIS 2.30
- Added absolute path variable ${SourceDir} to eliminate relative paths once and for all.

Modified:
    directory/apacheds/trunk/server-installers/src/main/installers/apacheds-server-win.nsi
    directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java

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=570001&r1=570000&r2=570001&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 22:29:14 2007
@@ -2,6 +2,7 @@
 !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"
@@ -41,10 +42,10 @@
 XPStyle on
 
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "../../../src/main/resources/both_header.bmp"
+!define MUI_HEADERIMAGE_BITMAP "${SourceDir}/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_WELCOMEFINISHPAGE_BITMAP "${SourceDir}/main/resources/welcome.bmp"
+!define iconfile "${SourceDir}/main/resources/adstree.ico"
 !define MUI_ICON ${iconfile}
 !define MUI_UNICON ${iconfile}
 

Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java?rev=570001&r1=570000&r2=570001&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java
(original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java
Sun Aug 26 22:29:14 2007
@@ -228,7 +228,8 @@
     {
         filterProperties.putAll( mymojo.getProject().getProperties() );
         filterProperties.put( "app", target.getApplication().getName() );
-
+        filterProperties.put( "app.base.dir", mymojo.getProject().getBasedir().getAbsolutePath()
);
+                                 
         char firstChar = target.getApplication().getName().charAt( 0 );
         firstChar = Character.toUpperCase( firstChar );
         filterProperties.put( "app.displayname", firstChar + target.getApplication().getName().substring(
1 ) );



Mime
View raw message