#OTHER by cg
authorClaus Gittinger <cg@exept.de>
Wed, 15 Jun 2016 16:33:01 +0200
changeset 19996 7dea0665f414
parent 19995 c4be724738fa
child 19997 e925ec41a00c
#OTHER by cg name conflict in resource file (.rc) on windows, if a class with the same name as the package existed. Changed name of resource file.
ProjectDefinition.st
--- a/ProjectDefinition.st	Wed Jun 15 16:32:55 2016 +0200
+++ b/ProjectDefinition.st	Wed Jun 15 16:33:01 2016 +0200
@@ -366,6 +366,27 @@
     "Created: / 25-11-2011 / 14:34:01 / cg"
 !
 
+fullPackageName
+    "all components with underlines"
+
+    ^ self fullPackageNameFor: self package
+
+    "
+     stx_libwidg2 packageName
+     stx_libwidg2 fullPackageName
+     stx_goodies_refactoryBrowser_browser packageName
+     stx_goodies_refactoryBrowser_browser fullPackageName
+    "
+!
+
+fullPackageNameFor: aProjectID
+    ^ (aProjectID copyReplaceAny:':/' with:$_)
+
+    "
+     stx_goodies_refactoryBrowser_lint fullPackageNameFor:#stx_goodies_refactoryBrowser_lint  
+    "
+!
+
 initialClassNameForDefinitionOf:aPackageId
     <resource: #obsolete>
 
@@ -3293,7 +3314,7 @@
     action notNil ifTrue:[
         ^ self perform:action
     ].
-    (filename = 'app.rc' or:[filename = 'lib.rc']) ifTrue:[
+    (filename = 'app.rc' or:[filename = 'lib.rc' or:[filename = self rcFilename]]) ifTrue:[
         ^ self generate_packageName_dot_rc
     ].
     (filename = 'loadAll') ifTrue:[
@@ -3720,9 +3741,15 @@
 !
 
 rcFilename
-    ^ self packageName,'.rc'.
+    ^ self fullPackageName,'WINrc.rc'.
 
     "Created: / 07-09-2006 / 17:07:00 / cg"
+!
+
+resourceFilename
+    ^ (self rcFilename asFilename withSuffix:'$(RES)') name
+
+    "Created: / 07-09-2006 / 17:12:53 / cg"
 ! !
 
 !ProjectDefinition class methodsFor:'file mappings'!