#docDirPath
authorStefan Vogel <sv@exept.de>
Fri, 25 Apr 2008 12:17:26 +0200
changeset 10975 7e889c33b0e0
parent 10974 9887cad6b7fd
child 10976 5696faf1af02
#docDirPath
ApplicationDefinition.st
--- a/ApplicationDefinition.st	Thu Apr 24 20:25:40 2008 +0200
+++ b/ApplicationDefinition.st	Fri Apr 25 12:17:26 2008 +0200
@@ -517,20 +517,24 @@
     "Modified: / 18-08-2006 / 16:16:01 / cg"
 !
 
+docDirPath
+    "path relative to my dir to the documentation - or empty."
+
+    ^ ''
+
+    "Created: / 20-09-2006 / 17:58:40 / cg"
+!
+
 docDirPath_unix
     "path relative to my dir to the documentation - or nil"
 
-    ^ nil
-
-    "Created: / 20-09-2006 / 17:58:44 / cg"
+    ^ self docDirPath replaceAll:$\ with:$/.
 !
 
 docDirPath_win32
     "path relative to my dir to the documentation - or nil"
 
-    ^ nil
-
-    "Created: / 20-09-2006 / 17:58:40 / cg"
+    ^ self docDirPath replaceAll:$/ with:$\.
 !
 
 fileDescription
@@ -1336,6 +1340,8 @@
 packageName_dot_nsi
     "the template code for the <appname>.nsi file"
 
+|docDirPath|
+
 ^ 
 '; $','Header','$
 ; Script generated by ProjectDefinition.
@@ -1394,10 +1400,10 @@
 
 ; MUI end ------
 
-',((self hasLicenceToAcceptDuringInstallation and:[self docDirPath_win32 notNil])
+',((self hasLicenceToAcceptDuringInstallation and:[(docDirPath := self docDirPath_win32) notEmptyOrNil])
     ifTrue:['
-LicenseLangString license ${LANG_ENGLISH} "',self docDirPath_win32,'\licence_en.txt"
-LicenseLangString license ${LANG_GERMAN}  "',self docDirPath_win32,'\licence_de.txt"
+LicenseLangString license ${LANG_ENGLISH} "' , docDirPath , '\licence_en.txt"
+LicenseLangString license ${LANG_GERMAN}  "' , docDirPath , '\licence_de.txt"
 ']
     ifFalse:['']),'
 
@@ -1914,7 +1920,7 @@
         d  at: #'ICONDEFINITION_LINE' put: 'IDR_MAINFRAME           ICON    DISCARDABLE     "',s,'"'
     ].
     s := self docDirPath_win32.
-    s isNil ifTrue:[
+    s isEmptyOrNil ifTrue:[
         d  at:'SEMI_IF_NO_DOC_EXISTS' put:';; '.
     ] ifFalse:[
         d  at:'SEMI_IF_NO_DOC_EXISTS' put:''.
@@ -2312,5 +2318,5 @@
 !ApplicationDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.102 2008-04-16 19:48:46 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.103 2008-04-25 10:17:26 stefan Exp $'
 ! !