--- a/LibraryDefinition.st Thu Sep 14 17:06:50 2006 +0200
+++ b/LibraryDefinition.st Thu Sep 14 19:07:26 2006 +0200
@@ -432,90 +432,82 @@
bc_dot_def_mappings
^ (super bc_dot_def_mappings)
- at:#'LIBRARY_NAME' put:[ self libraryName ];
+ at:'LIBRARY_NAME' put:( self libraryName );
yourself
"Created: / 09-08-2006 / 11:17:59 / fm"
"Modified: / 16-08-2006 / 18:19:25 / User"
- "Modified: / 18-08-2006 / 17:14:00 / cg"
+ "Modified: / 14-09-2006 / 18:56:11 / cg"
!
classLine_libInit_dot_cc_mappings: aClassName
^Dictionary new
- at: #'CLASS' put: [self st2c:aClassName];
+ at: 'CLASS' put: ( self st2c:aClassName );
yourself
"Created: / 08-08-2006 / 14:04:00 / fm"
"Modified: / 09-08-2006 / 18:27:07 / fm"
+ "Modified: / 14-09-2006 / 18:56:18 / cg"
!
extensionLine_libInit_dot_cc_mappings
^Dictionary new
- at: #'LIBRARY_NAME' put: [self st2c:(self package copy asString replaceAny:':/' with:$_)];
+ at: 'LIBRARY_NAME' put: ( self st2c:(self package copy asString replaceAny:':/' with:$_) );
yourself
"Created: / 09-08-2006 / 11:19:59 / fm"
- "Modified: / 23-08-2006 / 01:23:40 / cg"
+ "Modified: / 14-09-2006 / 18:56:26 / cg"
!
libInit_dot_cc_mappings
^Dictionary new
- at: #'LIBRARY_NAME' put: [self libraryName];
- at: #'PACKAGE' put: [self package];
- at: #'CLASSES' put: [self generateClassLines_libInit_dot_cc];
- at: #'EXTENSION' put: [self generateExtensionLine_libInit_dot_cc];
+ at: 'LIBRARY_NAME' put: (self libraryName);
+ at: 'PACKAGE' put: (self package);
+ at: 'CLASSES' put: (self generateClassLines_libInit_dot_cc);
+ at: 'EXTENSION' put: (self generateExtensionLine_libInit_dot_cc);
yourself
"Created: / 09-08-2006 / 11:20:24 / fm"
"Modified: / 16-08-2006 / 18:19:03 / User"
-!
-
-lib_dot_rc_mappings
-
-^Dictionary new
- at: #'FILEVERSION' put: ['5,2,8,1'];
- at: #'PRODUCTVERSION' put: ['5,2,8,1'];
- at: #'FILETYPE' put: 'VFT_DLL';
- yourself
-
- "Created: / 17-08-2006 / 19:35:05 / cg"
+ "Modified: / 14-09-2006 / 18:56:42 / cg"
!
make_dot_proto_mappings
^ Dictionary new
- at: #'TAB' put: ( Character tab asString );
- at: #'TOP' put: ( self pathToTop_unix );
- at: #'LIBRARY_NAME' put: ( self libraryName );
- at: #'SUBDIRECTORIES' put: (self generateSubDirectories);
- at: #'LOCAL_INCLUDES' put: (self generateLocalIncludes_unix);
- at: #'LOCAL_DEFINES' put: '';
- at: #'COMMONSYMFLAG' put: (self commonSymbolsFlag);
- at: #'HEADEROUTPUTARG' put: (self headerFileOutputArg);
- at: #'ADDITIONAL_DEFINITIONS' put: (self additionalDefinitions_make_dot_proto);
- at: #'ADDITIONAL_RULES' put: (self additionalRules_make_dot_proto);
- at: #'ADDITIONAL_TARGETS' put: (self additionalTargets_make_dot_proto);
- at: #'ADDITIONAL_LINK_LIBRARIES' put: (self additionalLinkLibraries_make_dot_proto);
- at: #'DEPENDENCIES' put: (self generateDependencies_unix);
+ at: 'TAB' put: ( Character tab asString );
+ at: 'TOP' put: ( self pathToTop_unix );
+ at: 'LIBRARY_NAME' put: ( self libraryName );
+ at: 'SUBDIRECTORIES' put: (self generateSubDirectories);
+ at: 'LOCAL_INCLUDES' put: (self generateLocalIncludes_unix);
+ at: 'LOCAL_DEFINES' put: '';
+ at: 'COMMONSYMFLAG' put: (self commonSymbolsFlag);
+ at: 'HEADEROUTPUTARG' put: (self headerFileOutputArg);
+ at: 'ADDITIONAL_DEFINITIONS' put: (self additionalDefinitions_make_dot_proto);
+ at: 'ADDITIONAL_RULES' put: (self additionalRules_make_dot_proto);
+ at: 'ADDITIONAL_TARGETS' put: (self additionalTargets_make_dot_proto);
+ at: 'ADDITIONAL_LINK_LIBRARIES' put: (self additionalLinkLibraries_make_dot_proto);
+ at: 'DEPENDENCIES' put: (self generateDependencies_unix);
yourself
"Created: / 09-08-2006 / 11:20:45 / fm"
"Modified: / 09-08-2006 / 16:44:48 / fm"
- "Modified: / 14-09-2006 / 12:33:08 / cg"
+ "Modified: / 14-09-2006 / 18:57:52 / cg"
!
nt_dot_def_mappings
^Dictionary new
- at: #'LIBRARY_NAME' put: [self libraryName];
- at: #'DESCRIPTION' put: [self description asString storeString];
- at: #'VERSION_NUMBER' put: [self versionNumber];
+ at: 'LIBRARY_NAME' put: (self libraryName);
+ at: 'DESCRIPTION' put: (self description asString storeString);
+ at: 'VERSION_NUMBER' put: (self versionNumber);
yourself
"Created: / 09-08-2006 / 11:21:21 / fm"
+ "Modified: / 14-09-2006 / 18:58:07 / cg"
!
nt_dot_mak_mappings
@@ -525,21 +517,21 @@
d := super nt_dot_mak_mappings.
d
- at: #'LIBRARY_NAME' put: ( self libraryName );
- at: #'LOCAL_INCLUDES' put: (self generateLocalIncludes_win32);
- at: #'COMMONSYMFLAG' put: (self commonSymbolsFlag);
- at: #'HEADEROUTPUTARG' put: (self headerFileOutputArg);
- at: #'RESFILENAME' put: resFileName;
- at: #'ADDITIONAL_DEFINITIONS' put: (self additionalDefinitions_nt_dot_mak);
- at: #'ADDITIONAL_RULES' put: (self additionalRules_nt_dot_mak);
- at: #'ADDITIONAL_TARGETS' put: (self additionalTargets_nt_dot_mak);
- at: #'DEPENDENCIES' put: (self generateDependencies_win32);
+ at: 'LIBRARY_NAME' put: ( self libraryName );
+ at: 'LOCAL_INCLUDES' put: (self generateLocalIncludes_win32);
+ at: 'COMMONSYMFLAG' put: (self commonSymbolsFlag);
+ at: 'HEADEROUTPUTARG' put: (self headerFileOutputArg);
+ at: 'RESFILENAME' put: resFileName;
+ at: 'ADDITIONAL_DEFINITIONS' put: (self additionalDefinitions_nt_dot_mak);
+ at: 'ADDITIONAL_RULES' put: (self additionalRules_nt_dot_mak);
+ at: 'ADDITIONAL_TARGETS' put: (self additionalTargets_nt_dot_mak);
+ at: 'DEPENDENCIES' put: (self generateDependencies_win32);
yourself.
^ d.
"Created: / 09-08-2006 / 11:44:36 / fm"
"Modified: / 09-08-2006 / 20:00:01 / fm"
- "Modified: / 14-09-2006 / 12:32:45 / cg"
+ "Modified: / 14-09-2006 / 18:58:15 / cg"
!
st2c:aString
@@ -637,142 +629,6 @@
"Modified: / 14-09-2006 / 13:11:57 / cg"
!
-generateDependencies:whichArchitecture
- ^ String streamContents:[:s |
- |classNames classesLoaded classesSorted classNamesSorted putDependencyForClass
- archClassNames archClassesLoaded putSingleClassDependencyEntry putDependencyForExtensions|
-
- putSingleClassDependencyEntry :=
- [:cls | |sclsBaseName|
- s nextPutAll:' $(INCLUDE_TOP)'.
- s nextPutAll:(self pathSeparator:whichArchitecture) asString.
- sclsBaseName := cls classFilename asFilename withoutSuffix baseName.
- s nextPutAll:(self topRelativePathTo:sclsBaseName inPackage:cls package architecture:whichArchitecture).
- s nextPutAll:'.$(H)'.
- ].
-
- putDependencyForClass :=
- [:cls |
- |clsBaseName already|
-
- clsBaseName := cls classFilename asFilename withoutSuffix baseName.
- s nextPutAll:'$(OUTDIR)'.
- s nextPutAll:clsBaseName.
- s nextPutAll:'.$(O)'.
-
- s nextPutAll:' '.
- s nextPutAll:clsBaseName.
- s nextPutAll:'.$(H)'.
-
- s nextPutAll:': '.
- s nextPutAll:clsBaseName.
- s nextPutAll:'.st'.
- already := Set new.
- cls allSuperclassesDo:[:scls |
- putSingleClassDependencyEntry value:scls.
- already add:scls.
- ].
- cls privateClassesDo:[:eachPrivateClass |
- eachPrivateClass allSuperclassesDo:[:scls | |sclsBaseName|
- scls ~~ cls ifTrue:[
- scls isPrivate ifFalse:[
- (already includes:scls) ifFalse:[
- putSingleClassDependencyEntry value:scls.
- already add:scls.
- ].
- ].
- ].
- ]
- ].
-
- s nextPutAll:' $(STCHDR)'.
- s cr.
- ].
-
- putDependencyForExtensions :=
- [
- |already|
-
- s nextPutAll:'$(OUTDIR)extensions.$(O): extensions.st'.
-
- already := Set new.
- self extensionMethodNames pairWiseDo:[:className :selector |
- |mthdCls cls|
-
- ((mthdCls := Smalltalk classNamed:className) notNil and:[mthdCls isLoaded]) ifTrue:[
- cls := mthdCls theNonMetaclass.
- (already includes:cls) ifFalse:[
- cls allSuperclassesDo:[:scls |
- (already includes:scls) ifFalse:[
- putSingleClassDependencyEntry value:scls.
- already add:scls.
- ].
- ].
- ].
- ].
- ].
-
- s nextPutAll:' $(STCHDR)'.
- s cr.
- ].
-
- classNames := self common_compiled_classNames.
- classesLoaded := classNames
- collect:[:className | |cls| cls := Smalltalk classNamed:className]
- thenSelect:[:cls | cls notNil and:[cls isLoaded] ].
-
- classesSorted := Class classesSortedByLoadOrder:classesLoaded.
- classesSorted do:putDependencyForClass.
-
- self namesAndAttributesIn:(self additionalClassNamesAndAttributes) do:[:className :attr |
- |cls|
-
- (attr isEmptyOrNil or:[(attr includes:#autoload) not]) ifTrue:[
- ((cls := Smalltalk classNamed:className) notNil and:[cls isLoaded]) ifTrue:[
- putDependencyForClass value:cls.
- ]
- ].
- ].
-
- archClassNames := self compiled_classNamesForArchitecture:whichArchitecture.
- archClassesLoaded := archClassNames
- collect:[:className | |cls| cls := Smalltalk classNamed:className]
- thenSelect:[:cls | cls notNil and:[cls isLoaded] ].
-
- archClassesLoaded notEmpty ifTrue:[
- (Class classesSortedByLoadOrder:archClassesLoaded) do:putDependencyForClass.
- ].
-
- self hasExtensions ifTrue:putDependencyForExtensions.
- ]
-
- "
- stx_libbasic3 generateDependencies:#unix
- stx_libbasic3 generateDependencies:#win32
- "
-
- "Modified: / 16-08-2006 / 18:52:10 / User"
- "Created: / 14-09-2006 / 12:38:57 / cg"
- "Modified: / 14-09-2006 / 17:04:21 / cg"
-!
-
-generateDependencies_unix
- ^ self generateDependencies:#unix
-
- "
- stx_libbasic3 generateDependencies:#unix
- stx_libbasic3 generateDependencies:#win32
- "
-
- "Modified: / 14-09-2006 / 13:32:34 / cg"
-!
-
-generateDependencies_win32
- ^ self generateDependencies:#win32
-
- "Created: / 14-09-2006 / 12:39:18 / cg"
-!
-
generateExtensionLine_libInit_dot_cc
|mappings|
@@ -813,32 +669,11 @@
"Modified: / 14-09-2006 / 15:38:16 / cg"
!
-generateLocalIncludes_win32
- ^ String streamContents:[:s |
- s nextPutAll:(self localIncludes_win32).
- self searchForProjectsWhichProvideHeaderFiles
- do:[:includeProject |
- s nextPutAll:' -I$(INCLUDE_TOP)\',(self topRelativePathToPackage_win32: includeProject)
- ]
- ]
-
- "
- bosch_dapasx_application generateLocalIncludes_win32
- bosch_dapasx_datenbasis generateLocalIncludes_win32
- stx_libbasic generateLocalIncludes_win32
- stx_libview generateLocalIncludes_win32
- stx_libtool2 generateLocalIncludes_win32
- "
-
- "Created: / 09-08-2006 / 16:46:49 / fm"
- "Modified: / 14-09-2006 / 15:37:35 / cg"
-!
-
generateSubDirectories
^ String streamContents:[:s |
self subProjects
- do:[:subProjectName |
- s space; nextPutAll:subProjectName
+ do:[:projectID |
+ s space; nextPutAll:projectID
]
]
@@ -848,7 +683,7 @@
"
"Created: / 09-08-2006 / 11:26:59 / fm"
- "Modified: / 18-08-2006 / 11:59:32 / cg"
+ "Modified: / 14-09-2006 / 18:46:18 / cg"
!
generateUnixLocalIncludes
@@ -973,5 +808,5 @@
!LibraryDefinition class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/LibraryDefinition.st,v 1.63 2006-09-14 15:06:50 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/LibraryDefinition.st,v 1.64 2006-09-14 17:07:26 cg Exp $'
! !