directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r570551 - in /directory/apacheds/trunk/server-installers/src/main/installers: apacheds-server-win.nsi apacheds-suite-win.nsi
Date Tue, 28 Aug 2007 19:57:04 GMT
Author: ccustine
Date: Tue Aug 28 12:57:03 2007
New Revision: 570551

URL: http://svn.apache.org/viewvc?rev=570551&view=rev
Log:
- DIRSERVER-1039 File resource defs were not being quoted which is breaking creation of windows
installers while building on windows, also changed forward slashes to backslash

Modified:
    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/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=570551&r1=570550&r2=570551&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
Tue Aug 28 12:57:03 2007
@@ -2,7 +2,7 @@
 !define AppVersion "${app.version}"
 !define OutFile "${app.final.name}"
 !define ShortName "${app}"
-!define SourceDir "${app.base.dir}/src"
+!define SourceDir "${app.base.dir}\src"
 !define JRE_VERSION "1.5.0"
 !define Vendor "Apache Software Foundation"
 !define Project "Apache Directory"
@@ -54,7 +54,7 @@
 
   ; License page
   !insertmacro MUI_PAGE_WELCOME
-  !insertmacro MUI_PAGE_LICENSE "win32/LICENSE"
+  !insertmacro MUI_PAGE_LICENSE "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.
@@ -195,9 +195,9 @@
 
     ;I am hand picking the files for now, but we could simplify this by creating a template
for new instances
     SetOutPath "$INSTANCE_HOME_DIR\default\conf"
-    File "conf/log4j.properties"
-    File /oname=apacheds.conf "conf/apacheds-default.conf"
-    File "conf/server.xml"
+    File "conf\log4j.properties"
+    File /oname=apacheds.conf "conf\apacheds-default.conf"
+    File "conf\server.xml"
 
     Push "$INSTANCE_HOME_DIR\default\conf"
     Push "*.*"

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=570551&r1=570550&r2=570551&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
Tue Aug 28 12:57:03 2007
@@ -56,7 +56,7 @@
 
   ; License page
   !insertmacro MUI_PAGE_WELCOME
-  !insertmacro MUI_PAGE_LICENSE "win32/LICENSE"
+  !insertmacro MUI_PAGE_LICENSE "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.
@@ -205,9 +205,9 @@
 
     ;I am hand picking the files for now, but we could simplify this by creating a template
for new instances
     SetOutPath "$INSTANCE_HOME_DIR\default\conf"
-    File "conf/log4j.properties"
-    File /oname=apacheds.conf "conf/apacheds-default.conf"
-    File "conf/server.xml"
+    File "conf\log4j.properties"
+    File /oname=apacheds.conf "conf\apacheds-default.conf"
+    File "conf\server.xml"
 
     Push "$INSTANCE_HOME_DIR\default\conf"
     Push "*.*"



Mime
View raw message