--- a/ApplicationDefinition.st Wed Dec 05 12:35:30 2012 +0000
+++ b/ApplicationDefinition.st Fri Dec 07 19:24:14 2012 +0000
@@ -55,7 +55,7 @@
buildTarget name of the generated exe-file
-
+
should redefine:
preRequisites list of required packages
@@ -73,7 +73,7 @@
applicationName app name; shown by windows explorer
- might redefine:
+ might redefine:
isConsoleApplication if true, windows-build generates a console app.
isGUIApplication if true, the GUI framework is linked in
@@ -98,7 +98,7 @@
appSourcesProjects
"Returns only the application projects (which are included in the application module)"
- ^self preRequisites select:[:each |
+ ^self preRequisites select:[:each |
(self moduleFor: each) = self module
].
@@ -112,8 +112,8 @@
|cls|
- Error
- handle:[:ex | ]
+ Error
+ handle:[:ex | ]
do:[
|clsName|
@@ -128,7 +128,7 @@
stxSourcesProjects
"Returns only the required STX projects (which are included in the STX module)"
- ^self effectivePreRequisites select:[:each |
+ ^self effectivePreRequisites select:[:each |
(self moduleFor: each) = (self moduleFor: #'stx')
].
@@ -138,16 +138,16 @@
"
#(
- 'libbasic'
- 'libbasic2'
- 'libcomp'
- 'libview'
+ 'libbasic'
+ 'libbasic2'
+ 'libcomp'
+ 'libview'
'libview2'
- 'libwidg'
- 'libwidg2'
- 'libtool'
- 'libtool2'
- 'libhtml'
+ 'libwidg'
+ 'libwidg2'
+ 'libtool'
+ 'libtool2'
+ 'libhtml'
'libui'
)
"
@@ -158,25 +158,25 @@
forEachMethodsCodeToCompileDo:aTwoArgBlock ignoreOldDefinition:ignoreOldDefinition
super forEachMethodsCodeToCompileDo:aTwoArgBlock ignoreOldDefinition:ignoreOldDefinition.
- aTwoArgBlock
+ aTwoArgBlock
value:self subProjects_code
value:'description'.
- aTwoArgBlock
+ aTwoArgBlock
value:self preRequisites_code
value:'description'.
- aTwoArgBlock
+ aTwoArgBlock
value:self excludedFromPreRequisites_code
value:'description'.
(self class includesSelector:#startupClassName) ifFalse:[
- aTwoArgBlock
+ aTwoArgBlock
value:self startupClassName_code
value:'description - startup'.
].
(self class includesSelector:#startupSelector) ifFalse:[
- aTwoArgBlock
+ aTwoArgBlock
value:self startupSelector_code
value:'description - startup'.
].
@@ -188,8 +188,8 @@
startupClassName_code
|classes startClasses mainClasses appClasses|
- classes := self classNamesAndAttributes
- collect:[:nm | Smalltalk classNamed:nm]
+ classes := self classNamesAndAttributes
+ collect:[:nm | Smalltalk classNamed:nm]
thenSelect:[:cls | cls notNil and:[cls isProjectDefinition not ]].
mainClasses := classes select:[:each | each theMetaclass includesSelector:#main ].
@@ -209,7 +209,7 @@
]
].
- ^
+ ^
'startupClassName
"the name of the class which starts the show in its <startupSelector> method.
Usually, the name of a subclass of StandAloneStartup."
@@ -222,7 +222,7 @@
!
startupClassName_codeFor:aClassName
- ^
+ ^
'startupClassName
"the class that starts the show in its startupSelector method"
@@ -238,8 +238,8 @@
|clsName cls sel|
- Error
- handle:[:ex | ]
+ Error
+ handle:[:ex | ]
do:[
clsName := self startupClassName.
cls := Smalltalk classNamed:clsName.
@@ -258,21 +258,21 @@
!
startupSelector_codeFor:aSelector
- ^
+ ^
'startupSelector
"the message that is sent to the startupClass to start the show"
- ^ #''',aSelector,'''
+ ^ #''',aSelector,'''
'
"Created: / 05-09-2006 / 13:41:01 / cg"
"Modified: / 15-12-2006 / 14:10:11 / cg"
!
-subProjects_code
+subProjects_code
|subProjects|
- subProjects :=
+ subProjects :=
(self siblingsAreSubProjects)
ifTrue:[ self searchForSiblingProjects ]
ifFalse:[ self searchForSubProjects ].
@@ -282,13 +282,13 @@
^ String streamContents:[:s |
s nextPutLine:'subProjects'.
s nextPutLine:' "list packages which are known as subprojects.'.
- s nextPutLine:' This method is generated automatically; however, when generating automatically,'.
+ s nextPutLine:' This method is generated automatically; however, when generating automatically,'.
s nextPutLine:' packages are only added - never removed, unless listed in #excludedFromSubProjects."'.
s nextPutLine:''.
s nextPutLine:' ^ #('.
- subProjects do:[:eachPackageID |
+ subProjects do:[:eachPackageID |
s nextPutLine:eachPackageID asString storeString
- ].
+ ].
s nextPutLine:')'
].
@@ -326,7 +326,7 @@
!
guiClassFileNames_unix
- ^ self guiClasses_unix
+ ^ self guiClasses_unix
collect:[:cls | (cls classBaseFilename asFilename withSuffix:'so') baseName].
"Created: / 14-09-2006 / 18:13:22 / cg"
@@ -334,7 +334,7 @@
!
guiClassFileNames_win32
- ^ self guiClasses_win32
+ ^ self guiClasses_win32
collect:[:cls | (cls classBaseFilename asFilename withSuffix:'dll') baseName].
"Created: / 07-09-2006 / 17:23:13 / cg"
@@ -360,7 +360,7 @@
needs resources to be installed. This is normally true.
Even non-GUI apps need some (libbasic/resources)"
- ^ true
+ ^ true
! !
!ApplicationDefinition class methodsFor:'description'!
@@ -409,8 +409,8 @@
^ self applicationNameFromPackage
"
- bosch_dapasx_application applicationName
- stx_projects_smalltalk applicationName
+ bosch_dapasx_application applicationName
+ stx_projects_smalltalk applicationName
"
"Created: / 08-08-2006 / 20:25:39 / fm"
@@ -439,9 +439,9 @@
^ path last
"
- bosch_dapasx_application applicationName
- stx_projects_smalltalk applicationName
- alspa_batch_application applicationName
+ bosch_dapasx_application applicationName
+ stx_projects_smalltalk applicationName
+ alspa_batch_application applicationName
"
"Created: / 08-08-2006 / 20:25:39 / fm"
@@ -457,16 +457,16 @@
^self module, ':', self applicationNameFromPackage
"
- bosch_dapasx_application applicationPackage
- stx_projects_smalltalk applicationPackage
- alspa_batch_application applicationPackage
+ bosch_dapasx_application applicationPackage
+ stx_projects_smalltalk applicationPackage
+ alspa_batch_application applicationPackage
"
"Created: / 08-08-2006 / 20:25:39 / fm"
"Modified: / 30-08-2006 / 19:29:25 / cg"
!
-applicationType
+applicationType
^self isGUIApplication
ifTrue:['GUI_APPLICATION']
@@ -506,20 +506,20 @@
^ nil "the default, nil means: all prerequisites should be loaded initially"
"/ ^ #(
-"/ #'stx:libbasic'
-"/ #'stx:libbasic2'
+"/ #'stx:libbasic'
+"/ #'stx:libbasic2'
"/ #'stx:libcomp'
"/ )
!
isConsoleApplication
"Used with WIN32 only (i.e. affects bc.mak).
- Return true, if this is a console application.
+ Return true, if this is a console application.
Console applications have stdout and stderr and open up a command-window
when started. Only console applications can interact with the user in the
command line window.
By default, GUI apps are compiled as non-console apps.
- If you need both (as in expecco), redefine this as true AND in addition redefine
+ If you need both (as in expecco), redefine this as true AND in addition redefine
makeConsoleApplication to return true."
^ self isGUIApplication not
@@ -528,7 +528,7 @@
!
isGUIApplication
- "Return true, if this is a GUI app.
+ "Return true, if this is a GUI app.
Redefine to return false for non-GUI applications (affects inclusion of Display classes)."
^true
@@ -538,7 +538,7 @@
!
isSingleThreadedApplication
- "Return true, if this should be started without multiple threads.
+ "Return true, if this should be started without multiple threads.
(not possible with gui applications)"
^false
@@ -657,12 +657,12 @@
basicFileNamesToGenerate
"answer a dictionary (filename -> generator method) with all the files, that have to be generated for this
package"
-
+
|dict|
dict := super basicFileNamesToGenerate.
- dict
+ dict
at:'modules.stx' put:#'generate_modules_dot_stx';
at:'modules.c' put:#'generate_modules_dot_c';
at:self rcFilename put:#'generate_packageName_dot_rc';
@@ -697,7 +697,7 @@
generate_modules_dot_c
- ^self replaceMappings: self modules_dot_c_mappings
+ ^self replaceMappings: self modules_dot_c_mappings
in: self modules_dot_c
"
@@ -709,7 +709,7 @@
generate_modules_dot_stx
- ^self replaceMappings: self modules_dot_stx_mappings
+ ^self replaceMappings: self modules_dot_stx_mappings
in: self modules_dot_stx
"
@@ -723,8 +723,8 @@
generate_packageName_dot_nsi
- ^self
- replaceMappings: self packageName_dot_nsi_mappings
+ ^self
+ replaceMappings: self packageName_dot_nsi_mappings
in: self packageName_dot_nsi
"
@@ -756,11 +756,11 @@
!ApplicationDefinition class methodsFor:'file mappings'!
-additionalFilesToInstall_dot_nsi:bindings
- ^ String
- streamContents:[:s |
- self additionalFilesToInstall do:[:pattern |
- s nextPutLine:((self installFileLine_nsi_for:pattern)
+additionalFilesToInstall_dot_nsi:bindings
+ ^ String
+ streamContents:[:s |
+ self additionalFilesToInstall do:[:pattern |
+ s nextPutLine:((self installFileLine_nsi_for:pattern)
expandPlaceholdersWith:bindings)
].
].
@@ -821,24 +821,24 @@
at: 'APPLICATION_TYPE' put: self applicationType;
yourself.
- self offerSmalltalkSourceCode ifTrue:[
+ self offerSmalltalkSourceCode ifTrue:[
"/ mappings
-"/ at: 'STX_SOURCE_RULES' put: ( self replaceMappings: mappings
+"/ at: 'STX_SOURCE_RULES' put: ( self replaceMappings: mappings
"/ in: self make_dot_proto_stx_source_rules).
].
- self offerApplicationSourceCode ifTrue:[
+ self offerApplicationSourceCode ifTrue:[
"/ mappings
-"/ at: 'SOURCE_RULES' put:( self replaceMappings: mappings
+"/ at: 'SOURCE_RULES' put:( self replaceMappings: mappings
"/ in: self make_dot_proto_app_source_rules ).
].
self needResources ifTrue:[
"/ mappings
"/ at: 'REQUIRED_SUPPORT_DIRS' put: 'RESOURCEFILES';
-"/ at: 'RESOURCE_RULES' put:( self replaceMappings: mappings
+"/ at: 'RESOURCE_RULES' put:( self replaceMappings: mappings
"/ in: self make_dot_proto_resource_rules );
-"/ at: 'STX_RESOURCE_RULES' put: ( self replaceMappings: mappings
+"/ at: 'STX_RESOURCE_RULES' put: ( self replaceMappings: mappings
"/ in: self make_dot_proto_stx_resource_rules);
"/ at: 'ADDITIONAL_RESOURCE_TARGETS' put:( self additionalResourceTargets asStringWith:' ');
"/ yourself.
@@ -855,7 +855,7 @@
|d|
d := super bc_dot_mak_mappings.
- d
+ d
at: 'LOCAL_INCLUDES' put: (self generateLocalIncludes_win32);
at: 'CONSOLE_APPLICATION_OR_EMPTY' put:(self makeConsoleApplication ifTrue:['consoleApp'] ifFalse:'');
at: 'NOCONSOLE_APPLICATION_OR_EMPTY' put:(self makeNonConsoleApplication ifTrue:['noConsoleApp'] ifFalse:'');
@@ -869,32 +869,32 @@
at: 'STARTUP_CLASS' put: ( self startupClassName );
at: 'STARTUP_SELECTOR' put: (self startupSelector );
at: 'MAIN_DEFINES' put: (self mainDefines );
- at: 'REQUIRED_LIBS' put: (self generateRequiredLibs_bc_dot_mak);
- at: 'PREREQUISITES_LIBS' put: (self generatePreRequisiteLines_bc_dot_mak );
+ at: 'REQUIRED_LIBS' put: (self generateRequiredLibs_bc_dot_mak);
+ at: 'PREREQUISITES_LIBS' put: (self generatePreRequisiteLines_bc_dot_mak );
at: 'DEPENDENCIES' put: (self generateDependencies_win32);
- at: 'SUBPROJECTS_LIBS' put: (self generateSubProjectLines_bc_dot_mak );
+ at: 'SUBPROJECTS_LIBS' put: (self generateSubProjectLines_bc_dot_mak );
at: 'BUILD_TARGET' put: (self buildTarget );
at: 'REQUIRED_SUPPORT_DIRS' put: (self extraTargets asStringWith:' ');
yourself.
self needResources ifTrue:[
- d
- at: 'RESOURCE_RULES' put:( self replaceMappings: d
+ d
+ at: 'RESOURCE_RULES' put:( self replaceMappings: d
in: self bc_dot_mak_resource_rules );
- at: 'STX_RESOURCE_RULES' put: ( self replaceMappings: d
+ at: 'STX_RESOURCE_RULES' put: ( self replaceMappings: d
in: self bc_dot_mak_stx_resource_rules);
at: 'ADDITIONAL_RESOURCE_TARGETS' put:( self additionalResourceTargets asStringWith:' ');
yourself
].
self offerSmalltalkSourceCode ifTrue:[
- d
- at: 'STX_SOURCE_RULES' put: ( self replaceMappings: d
+ d
+ at: 'STX_SOURCE_RULES' put: ( self replaceMappings: d
in: self bc_dot_mak_stx_source_rules);
yourself
].
self offerApplicationSourceCode ifTrue:[
- d
- at: 'APP_SOURCE_RULES' put: ( self replaceMappings: d
+ d
+ at: 'APP_SOURCE_RULES' put: ( self replaceMappings: d
in: self bc_dot_mak_app_source_rules);
yourself
].
@@ -907,8 +907,8 @@
|d|
d := Dictionary new.
- d
- at: 'BUILDDATE' put: (Timestamp now printStringRFC1123Format ).
+ d
+ at: 'BUILDDATE' put: (Timestamp now printStringRFC1123Format ).
^ d
@@ -916,11 +916,11 @@
"Modified: / 14-09-2006 / 18:58:31 / cg"
!
-commonFilesToInstall_dot_nsi:bindings
- ^ String
- streamContents:[:s |
- self commonFilesToInstall do:[:pattern |
- s nextPutLine:((self installFileLine_nsi_for:pattern)
+commonFilesToInstall_dot_nsi:bindings
+ ^ String
+ streamContents:[:s |
+ self commonFilesToInstall do:[:pattern |
+ s nextPutLine:((self installFileLine_nsi_for:pattern)
expandPlaceholdersWith:bindings)
].
].
@@ -968,33 +968,33 @@
at: 'STARTUP_CLASS' put: (self startupClassName);
at: 'STARTUP_SELECTOR' put: (self startupSelector);
at: 'MAIN_DEFINES' put: (self mainDefines);
- at: 'REQUIRED_LIBS' put: (self generateRequiredLibs_make_dot_proto);
- at: 'PREREQUISITES_LIBS' put: (self generatePreRequisiteLines_make_dot_proto);
- at: 'SUBPROJECTS_LIBS' put: (self generateSubProjectLines_make_dot_proto);
+ at: 'REQUIRED_LIBS' put: (self generateRequiredLibs_make_dot_proto);
+ at: 'PREREQUISITES_LIBS' put: (self generatePreRequisiteLines_make_dot_proto);
+ at: 'SUBPROJECTS_LIBS' put: (self generateSubProjectLines_make_dot_proto);
at: 'REQUIRED_LIBOBJS' put: (self generateRequiredLibobjs_make_dot_proto);
at: 'REQUIRED_LINK_LIBOBJS' put: (self generateRequiredLinkLibobjs_make_dot_proto);
at: 'DEPENDENCIES' put: (self generateDependencies_unix);
- at: 'SUBPROJECTS_LIBS' put: (self generateSubProjectLines_make_dot_proto );
+ at: 'SUBPROJECTS_LIBS' put: (self generateSubProjectLines_make_dot_proto );
at: 'REQUIRED_SUPPORT_DIRS' put: (self extraTargets asStringWith:' ');
at: 'BUILD_TARGET' put: (self buildTarget ).
- self offerSmalltalkSourceCode ifTrue:[
+ self offerSmalltalkSourceCode ifTrue:[
mappings
- at: 'STX_SOURCE_RULES' put: ( self replaceMappings: mappings
+ at: 'STX_SOURCE_RULES' put: ( self replaceMappings: mappings
in: self make_dot_proto_stx_source_rules).
].
- self offerApplicationSourceCode ifTrue:[
+ self offerApplicationSourceCode ifTrue:[
mappings
- at: 'SOURCE_RULES' put:( self replaceMappings: mappings
+ at: 'SOURCE_RULES' put:( self replaceMappings: mappings
in: self make_dot_proto_app_source_rules ).
].
self needResources ifTrue:[
mappings
- at: 'RESOURCE_RULES' put:( self replaceMappings: mappings
+ at: 'RESOURCE_RULES' put:( self replaceMappings: mappings
in: self make_dot_proto_resource_rules );
- at: 'STX_RESOURCE_RULES' put: ( self replaceMappings: mappings
+ at: 'STX_RESOURCE_RULES' put: ( self replaceMappings: mappings
in: self make_dot_proto_stx_resource_rules);
at: 'ADDITIONAL_RESOURCE_TARGETS' put:( self additionalResourceTargets asStringWith:' ');
yourself.
@@ -1009,11 +1009,11 @@
|d|
d := Dictionary new.
- d
- at: 'INIT_LIST' put:
- ((self generateClassLines:(self classLine_modules_dot_c)) ,
+ d
+ at: 'INIT_LIST' put:
+ ((self generateClassLines:(self classLine_modules_dot_c)) ,
(self generateExtensionLine:(self extensionsLine_modules_dot_c)));
- at: 'EXTERN_INIT_NAME_LIST' put:
+ at: 'EXTERN_INIT_NAME_LIST' put:
((self generateClassLines:(self classLine_modules_dot_c_extern)),
(self generateExtensionLine:(self extensionsLine_modules_dot_c_extern)));
yourself.
@@ -1032,10 +1032,10 @@
|d|
d := Dictionary new.
- d
+ d
at: 'PREREQUISITE_LIBS' put: (self generatePreRequisiteLibs_modules_dot_stx);
at: 'ALLPREREQUISITE_LIBS' put: (self generateAllPreRequisiteLibs_modules_dot_stx);
- at: 'SUBPROJECT_LIBS' put: (self generateSubProjectLines_modules_dot_stx ).
+ at: 'SUBPROJECT_LIBS' put: (self generateSubProjectLines_modules_dot_stx ).
^ d
@@ -1052,7 +1052,7 @@
nsiDeliveredExecutables
"by default, an executable named after the application.
- Redefine, if thats not the case. If multiple have to be delivered,
+ Redefine, if thats not the case. If multiple have to be delivered,
return a string containing each individually double-quoted."
|s|
@@ -1080,8 +1080,8 @@
at: 'CONSOLE_APPLICATION' put: (self applicationNameConsole);
at: 'NOCONSOLE_APPLICATION' put: (self applicationNameNoConsole);
at: 'DELIVERED_EXECUTABLES' put: (self nsiDeliveredExecutables);
- at: 'MODULE' put: ( self module );
- at: 'MODULE_KEY' put: ( self module asUppercaseFirst );
+ at: 'MODULE' put: ( self module );
+ at: 'MODULE_KEY' put: ( self module asUppercaseFirst );
at: 'PRODUCT_NAME' put: (self productName);
at: 'PRODUCT_FILENAME' put: (self productFilename);
at: 'PRODUCT_VERSION' put: (self productVersion);
@@ -1123,7 +1123,7 @@
d at:'SEMI_IF_NO_DOC_EXISTS' put:';; '.
] ifFalse:[
d at:'SEMI_IF_NO_DOC_EXISTS' put:''.
- ].
+ ].
self offerSmalltalkSourceCode ifTrue:[
stxSourcesLines := self stxSourcesLines_dot_nsi:d.
d at:'STX_SOURCES_LINES' put:stxSourcesLines.
@@ -1164,12 +1164,12 @@
"Modified: / 12-10-2012 / 11:44:32 / sr"
!
-preRequisiteLine_bc_dot_mak_mappings: aProjectID
+preRequisiteLine_bc_dot_mak_mappings: aProjectID
^ Dictionary new
- at: 'FILE_NAME' put: (self libraryNameFor:aProjectID);
- at: 'MODULE_DIRECTORY' put: (self msdosPathToPackage:aProjectID from:self package);
- at: 'BACK_DIRECTORY' put: (self msdosPathToPackage:self package from:aProjectID);
+ at: 'FILE_NAME' put: (self libraryNameFor:aProjectID);
+ at: 'MODULE_DIRECTORY' put: (self msdosPathToPackage:aProjectID from:self package);
+ at: 'BACK_DIRECTORY' put: (self msdosPathToPackage:self package from:aProjectID);
yourself
"Modified: / 09-02-2007 / 16:59:21 / cg"
@@ -1181,19 +1181,19 @@
relPath := (PackageId from:aClass package) directory copy replaceAll:$/ with:$\.
^ Dictionary new
- at: 'FILE_NAME' put: ( aClass classBaseFilename asFilename withoutSuffix baseName );
- at: 'MODULE_DIRECTORY' put:relPath;
+ at: 'FILE_NAME' put: ( aClass classBaseFilename asFilename withoutSuffix baseName );
+ at: 'MODULE_DIRECTORY' put:relPath;
yourself
"Modified: / 09-02-2007 / 16:28:12 / cg"
!
-preRequisiteLine_make_dot_proto_mappings: aProjectID
+preRequisiteLine_make_dot_proto_mappings: aProjectID
^ Dictionary new
- at: 'FILE_NAME' put: (self libraryNameFor:aProjectID);
- at: 'MODULE_DIRECTORY' put: (self unixPathToPackage:aProjectID from:self package);
- at: 'BACK_DIRECTORY' put: (self unixPathToPackage:self package from:aProjectID);
+ at: 'FILE_NAME' put: (self libraryNameFor:aProjectID);
+ at: 'MODULE_DIRECTORY' put: (self unixPathToPackage:aProjectID from:self package);
+ at: 'BACK_DIRECTORY' put: (self unixPathToPackage:self package from:aProjectID);
yourself
!
@@ -1203,8 +1203,8 @@
relPath := (PackageId from:aClass package) directory.
^ Dictionary new
- at: 'FILE_NAME' put: ( aClass classBaseFilename asFilename withoutSuffix baseName );
- at: 'MODULE_DIRECTORY' put:relPath;
+ at: 'FILE_NAME' put: ( aClass classBaseFilename asFilename withoutSuffix baseName );
+ at: 'MODULE_DIRECTORY' put:relPath;
yourself
"Modified: / 09-02-2007 / 16:28:12 / cg"
@@ -1259,21 +1259,21 @@
"Created: / 15-10-2006 / 12:59:03 / cg"
!
-subProjectLine_bc_dot_mak_mappings: aProjectID
+subProjectLine_bc_dot_mak_mappings: aProjectID
^ Dictionary new
- at: 'LIBRARY_NAME' put: (self libraryNameFor: aProjectID );
- at: 'PATH_TO_SUB_PROJECT' put: ( (PackageId from:aProjectID) module,'\',(PackageId from:aProjectID) directory copy replaceAll:$/ with:$\ );
- at: 'PATH_TO_MYPROJECT' put: (self msdosPathToPackage: self package from: aProjectID);
+ at: 'LIBRARY_NAME' put: (self libraryNameFor: aProjectID );
+ at: 'PATH_TO_SUB_PROJECT' put: ( (PackageId from:aProjectID) module,'\',(PackageId from:aProjectID) directory copy replaceAll:$/ with:$\ );
+ at: 'PATH_TO_MYPROJECT' put: (self msdosPathToPackage: self package from: aProjectID);
yourself
"Modified: / 14-09-2006 / 18:59:26 / cg"
!
-subProjectLine_make_dot_proto_mappings: aProjectID
+subProjectLine_make_dot_proto_mappings: aProjectID
^ Dictionary new
- at: 'LIBRARY_NAME' put: (self libraryNameFor: aProjectID );
- at: 'PATH_TO_SUB_PROJECT' put: ( (PackageId from:aProjectID) module,'\',(PackageId from:aProjectID) directory copy replaceAll:$/ with:$\ );
- at: 'PATH_TO_MYPROJECT' put: (self unixPathToPackage: self package from: aProjectID);
+ at: 'LIBRARY_NAME' put: (self libraryNameFor: aProjectID );
+ at: 'PATH_TO_SUB_PROJECT' put: ( (PackageId from:aProjectID) module,'\',(PackageId from:aProjectID) directory copy replaceAll:$/ with:$\ );
+ at: 'PATH_TO_MYPROJECT' put: (self unixPathToPackage: self package from: aProjectID);
yourself
"Modified: / 14-09-2006 / 18:59:26 / cg"
@@ -1283,7 +1283,7 @@
generateAllPreRequisiteLibs_modules_dot_stx
^ String streamContents:[:s |
- self allPreRequisitesSorted do:[:projectID |
+ self allPreRequisitesSorted do:[:projectID |
(self shouldBeLoadedInitially:projectID) ifFalse:[
s nextPut:$*.
].
@@ -1308,8 +1308,8 @@
^self hasExtensionMethods
ifFalse:['']
ifTrue:[
- self replaceMappings:
- (Dictionary new
+ self replaceMappings:
+ (Dictionary new
at: 'CLASS' put:( self st2c:(self package copy asString replaceAny:':/' with:$_) );
yourself)
in: extensionLineTemplate
@@ -1320,7 +1320,7 @@
generatePreRequisiteLibs_modules_dot_stx
^ String streamContents:[:s |
- self effectivePreRequisites do:[:projectID |
+ self effectivePreRequisites do:[:projectID |
(self shouldBeLoadedInitially:projectID) ifFalse:[
s nextPut:$*.
].
@@ -1340,7 +1340,7 @@
"Modified: / 07-09-2006 / 17:22:58 / cg"
!
-generatePreRequisiteLines_bc_dot_mak
+generatePreRequisiteLines_bc_dot_mak
^ String streamContents:[:s |
self allPreRequisitesSorted do:[:eachPackage |
@@ -1348,28 +1348,28 @@
mappings := self preRequisiteLine_bc_dot_mak_mappings: eachPackage.
newObjectLine := self replaceMappings: mappings
in: self preRequisiteLine_bc_dot_mak.
- s nextPutAll:newObjectLine.
- s cr.
+ s nextPutAll:newObjectLine.
+ s cr.
].
self guiClasses_win32 do:[:eachClass |
|mappings newObjectLine|
mappings := self preRequisiteLine_bc_dot_mak_mappingsForClass: eachClass.
newObjectLine := self replaceMappings: mappings
in: self preRequisiteLine_bc_dot_mak.
- s nextPutAll:newObjectLine.
- s cr.
+ s nextPutAll:newObjectLine.
+ s cr.
].
]
"
- bosch_dapasx_application generatePreRequisiteLines_bc_dot_mak
+ bosch_dapasx_application generatePreRequisiteLines_bc_dot_mak
"
"Created: / 09-08-2006 / 11:24:39 / fm"
"Modified: / 14-09-2006 / 21:58:47 / cg"
!
-generatePreRequisiteLines_make_dot_proto
+generatePreRequisiteLines_make_dot_proto
^ String streamContents:[:s |
self allPreRequisitesSorted do:[:eachPackage |
@@ -1377,21 +1377,21 @@
mappings := self preRequisiteLine_make_dot_proto_mappings: eachPackage.
newObjectLine := self replaceMappings: mappings
in: self preRequisiteLine_make_dot_proto.
- s nextPutAll:newObjectLine.
- s cr.
+ s nextPutAll:newObjectLine.
+ s cr.
].
self guiClasses_win32 do:[:eachClass |
|mappings newObjectLine|
mappings := self preRequisiteLine_make_dot_proto_mappingsForClass: eachClass.
newObjectLine := self replaceMappings: mappings
in: self preRequisiteLine_make_dot_proto.
- s nextPutAll:newObjectLine.
- s cr.
+ s nextPutAll:newObjectLine.
+ s cr.
].
]
"
- bosch_dapasx_application generatePreRequisiteLines_bc_dot_mak
+ bosch_dapasx_application generatePreRequisiteLines_bc_dot_mak
"
"Created: / 09-08-2006 / 11:24:39 / fm"
@@ -1412,17 +1412,17 @@
].
"
- alspa_batch_application generateRequiredLibobjs_make_dot_proto
+ alspa_batch_application generateRequiredLibobjs_make_dot_proto
"
!
generateRequiredLibs_bc_dot_mak
^ String streamContents:[:s |
s nextPutLine:' \'.
- self allPreRequisitesSorted do:[:projectID |
+ self allPreRequisitesSorted do:[:projectID |
s space; nextPutAll:(self libraryNameFor:projectID),'.dll'; nextPutLine:' \'.
].
- self subProjects do:[:projectID |
+ self subProjects do:[:projectID |
s space; nextPutAll:(self libraryNameFor:projectID),'.dll'; nextPutLine:' \'.
].
@@ -1431,14 +1431,14 @@
s space; nextPutAll:eachFilename; nextPutLine:' \'.
].
].
-"/ self subProjects do:[:projectID |
+"/ self subProjects do:[:projectID |
"/ s space; nextPutAll:(self libraryNameFor:projectID),'.dll'; nextPutLine:' \'.
"/ ].
s cr.
].
"
- bosch_dapasx_application generateRequiredLibs_bc_dot_mak
+ bosch_dapasx_application generateRequiredLibs_bc_dot_mak
"
"Modified: / 07-09-2006 / 17:22:51 / cg"
@@ -1447,10 +1447,10 @@
generateRequiredLibs_make_dot_proto
"/ cg: why not (self libraryNameFor:projectID),'.so'; ???
^ String streamContents:[:s |
- self allPreRequisitesSorted do:[:projectID |
+ self allPreRequisitesSorted do:[:projectID |
s space; nextPutAll:(self libraryNameFor:projectID); nextPutLine:' \'.
].
- self subProjects do:[:projectID |
+ self subProjects do:[:projectID |
s space; nextPutAll:(self libraryNameFor:projectID); nextPutLine:' \'.
].
@@ -1459,21 +1459,21 @@
s space; nextPutAll:eachFilename; nextPutLine:' \'.
].
].
-"/ self subProjects do:[:projectID |
+"/ self subProjects do:[:projectID |
"/ s space; nextPutAll:(self libraryNameFor:projectID); nextPutLine:' \'.
"/ ].
s cr.
].
"
- alspa_batch_application generateRequiredLibs_make_dot_proto
+ alspa_batch_application generateRequiredLibs_make_dot_proto
"
!
generateRequiredLinkLibobjs_make_dot_proto
^ String streamContents:[:s |
- self allPreRequisitesSorted do:[:projectID |
+ self allPreRequisitesSorted do:[:projectID |
s space; nextPutAll:(self libraryNameFor:projectID),'$(O_EXT)'; nextPutLine:' \'.
].
@@ -1482,18 +1482,18 @@
s space; nextPutAll:eachFilename,'$(O_EXT)'; nextPutLine:' \'.
].
].
-"/ self subProjects do:[:projectID |
+"/ self subProjects do:[:projectID |
"/ s space; nextPutAll:(self libraryNameFor:projectID),'$(O_EXT)'; nextPutLine:' \'.
"/ ].
s cr.
].
"
- alspa_batch_application generateRequiredLinkLibobjs_make_dot_proto
+ alspa_batch_application generateRequiredLinkLibobjs_make_dot_proto
"
!
-generateSubProjectLines_bc_dot_mak
+generateSubProjectLines_bc_dot_mak
^ String streamContents:[:s |
self subProjects do:[:projectID |
@@ -1502,21 +1502,21 @@
mappings := self subProjectLine_bc_dot_mak_mappings: projectID.
newObjectLine := self replaceMappings: mappings
in: self subProjectLine_bc_dot_mak.
- s nextPutAll:newObjectLine.
- s cr.
+ s nextPutAll:newObjectLine.
+ s cr.
]
]
"
- bosch_dapasx_application generateSubProjectLines_bc_dot_mak
- cg_newCompiler_driver_stc generateSubProjectLines_bc_dot_mak
+ bosch_dapasx_application generateSubProjectLines_bc_dot_mak
+ cg_newCompiler_driver_stc generateSubProjectLines_bc_dot_mak
"
"Created: / 09-08-2006 / 11:24:39 / fm"
"Modified: / 14-09-2006 / 18:46:09 / cg"
!
-generateSubProjectLines_make_dot_proto
+generateSubProjectLines_make_dot_proto
^ String streamContents:[:s |
self subProjects do:[:projectID |
@@ -1525,13 +1525,13 @@
mappings := self subProjectLine_make_dot_proto_mappings: projectID.
newObjectLine := self replaceMappings: mappings
in: self subProjectLine_bc_dot_mak.
- s nextPutAll:newObjectLine.
- s cr.
+ s nextPutAll:newObjectLine.
+ s cr.
]
]
"
- bosch_dapasx_application generateSubProjectLines_make_dot_proto
+ bosch_dapasx_application generateSubProjectLines_make_dot_proto
cg_newCompiler_driver_stc generateSubProjectLines_make_dot_proto
"
@@ -1543,7 +1543,7 @@
|string|
string := String streamContents:[:s |
- self subProjects do:[:projectID |
+ self subProjects do:[:projectID |
(self shouldBeLoadedInitially:projectID) ifFalse:[
s nextPut:$*.
].
@@ -1566,7 +1566,7 @@
bc_dot_def
"the template code for the bc.def file"
-^
+^
'DESCRIPTION %(DESCRIPTION)
CODE PRELOAD MOVEABLE DISCARDABLE
SEGMENTS
@@ -1585,20 +1585,20 @@
^ '# $','Header','$
#
-# DO NOT EDIT
+# DO NOT EDIT
# automagically generated from the projectDefinition: ',self name",' at ',Timestamp now printString",'.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
#
# Historic Note:
-# this used to contain only rules to make with borland
+# this used to contain only rules to make with borland
# (called via bmake, by "make.exe -f bc.mak")
# this has changed; it is now also possible to build using microsoft visual c
# (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
#
-TOP=%(TOP)
+TOP=%(TOP)
INCLUDE_TOP=$(TOP)\..
CFLAGS_LOCAL=$(CFLAGS_APPTYPE) \
@@ -1646,12 +1646,12 @@
REQUIRED_SUPPORT_DIRS=%(REQUIRED_SUPPORT_DIRS)
-target: %(BUILD_TARGET) postBuildCleanup
+target: %(BUILD_TARGET) postBuildCleanup
# the executable, all required files and a self-installing-installer-exe
-ALL:: prereq exe $(REQUIRED_SUPPORT_DIRS) %(ADDITIONAL_TARGETS) postBuildCleanup setup
-
-exe: newBuildDate %(NOCONSOLE_APPLICATION_OR_EMPTY) %(CONSOLE_APPLICATION_OR_EMPTY)
+ALL:: prereq exe $(REQUIRED_SUPPORT_DIRS) %(ADDITIONAL_TARGETS) postBuildCleanup setup
+
+exe: newBuildDate %(NOCONSOLE_APPLICATION_OR_EMPTY) %(CONSOLE_APPLICATION_OR_EMPTY)
# the executable only
# with console
@@ -1675,7 +1675,7 @@
CRT_STARTUP=" $(CRT_STARTUP_NOCONSOLE)" theExe
# the executable only (internal target; needs some defines)
-theExe: $(OUTDIR) $(OBJS) $(REQUIRED_FILES) show $(PROJECT)
+theExe: $(OUTDIR) $(OBJS) $(REQUIRED_FILES) show $(PROJECT)
# build all prerequisite packages for this package
prereq:
@@ -1702,10 +1702,10 @@
%(APP_SOURCE_RULES)
%(STX_SOURCE_RULES)
-%(PREREQUISITES_LIBS)
+%(PREREQUISITES_LIBS)
%(SUBPROJECTS_LIBS)
-sources\NUL:
+sources\NUL:
mkdir sources
show:
@@ -1839,7 +1839,7 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
%(DEPENDENCIES)
# ENDMAKEDEPEND --- do not remove this line
-'.
+%(ADDITIONAL_RULES_HG)'.
"Modified: / 22-11-2012 / 17:18:28 / cg"
"Modified: / 28-11-2012 / 10:18:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1984,7 +1984,7 @@
libtool2_RESOURCES: resources\stx\libtool2\NUL
-copy $(TOP)\libtool2\resources\*.rs resources\stx\libtool2\*.*
-libview_RESOURCES: resources\stx\libview\NUL
+libview_RESOURCES: resources\stx\libview\NUL
-copy $(TOP)\libview\resources\*.rs resources\stx\libview\*.*
libview2_RESOURCES: resources\stx\libview2\NUL
@@ -2061,7 +2061,7 @@
buildDate_dot_h
"the template code for the buildDate.h file"
-^
+^
'#define BUILD_DATE "%(BUILDDATE)"'
"Created: / 30-08-2006 / 19:18:34 / cg"
@@ -2085,8 +2085,8 @@
defineAPPSourceLine_nsi_for: projectID
-^
-'
+^
+'
SetOutPath "$INSTDIR\sources\',(self moduleFor: projectID),'\',(self moduleDirectory_win32For:projectID) ,'"
File /r "${STX_ROOT}\', (self moduleFor: projectID) ,'\',(self moduleDirectory_win32For:projectID) ,'\*.st"'
@@ -2103,8 +2103,8 @@
defineSTXSourceLine_nsi_for: projectID
-^
-'
+^
+'
SetOutPath "$INSTDIR\sources\stx\', (self moduleDirectory_win32For:projectID),'"
File /r "${STX_ROOT}\stx\', (self moduleDirectory_win32For:projectID),'\*.st"'
@@ -2130,7 +2130,7 @@
(filePattern startsWith:'SetOutPath ') ifTrue:[
^ filePattern.
- ].
+ ].
^ ' File ', filePattern
@@ -2305,11 +2305,11 @@
make_dot_proto_resource_rules
^ String streamContents:[:s |
s nextPutAll:'
-%(APPLICATION)_RESOURCES:
+%(APPLICATION)_RESOURCES:
mkdir -p resources/%(MODULE)/%(MODULE_PATH)
-cp ../resources/*.rs ../resources/*.style resources/%(MODULE)/%(MODULE_PATH)/..
-%(APPLICATION)_BITMAPS:
+%(APPLICATION)_BITMAPS:
mkdir -p resources/%(MODULE)/%(MODULE_PATH)/bitmaps
-cp *.ico *.gif *.png resources/%(MODULE)/%(MODULE_PATH)/bitmaps
'.
@@ -2345,7 +2345,7 @@
display.rc: $(TOP)/projects/smalltalk/display.rc
cp $(TOP)/projects/smalltalk/display.rc .
-stx_STYLES:
+stx_STYLES:
mkdir -p resources/stx/libview
mkdir -p resources/stx/libview/styles
cp $(TOP)/libview/styles/*.common resources/stx/libview/styles
@@ -2354,27 +2354,27 @@
stx_BITMAPS: \
libwidg_BITMAPS
-libwidg_BITMAPS:
+libwidg_BITMAPS:
mkdir -p resources/stx/libwidg/bitmaps
-cp $(TOP)/libwidg/bitmaps/*.* resources/stx/libwidg/bitmaps
-libbasic_RESOURCES:
+libbasic_RESOURCES:
mkdir -p resources/stx/libbasic
-cp $(TOP)/libbasic/resources/*.* resources/stx/libbasic
-libtool_RESOURCES:
+libtool_RESOURCES:
mkdir -p resources/stx/libtool
-cp $(TOP)/libtool/resources/*.* resources/stx/libtool
-libtool2_RESOURCES:
+libtool2_RESOURCES:
mkdir -p resources/stx/libtool2
-cp $(TOP)/libtool2/resources/*.* resources/stx/libtool2
-libview_RESOURCES:
+libview_RESOURCES:
mkdir -p resources/stx/libview
-cp $(TOP)/libview/resources/*.* resources/stx/libview
-libview2_RESOURCES:
+libview2_RESOURCES:
mkdir -p resources/stx/libview2
-cp $(TOP)/libview2/resources/*.* resources/stx/libview2
@@ -2418,10 +2418,10 @@
modules_dot_c
-^
+^
'/* $','Header','$
*
- * DO NOT EDIT
+ * DO NOT EDIT
* automagically generated from the projectDefinition: ',self name,'.
*
* Warning: once you modify this file, do not rerun
@@ -2444,10 +2444,10 @@
modules_dot_stx
-^
+^
'# $','Header','$
#
-# DO NOT EDIT
+# DO NOT EDIT
# automagically generated from the projectDefinition: ',self name,'.
#
# Warning: once you modify this file, do not rerun
@@ -2477,7 +2477,7 @@
|docDirPath|
-^
+^
'; $','Header','$
; Script generated by ProjectDefinition.
@@ -2515,7 +2515,7 @@
; License page
; !!define MUI_LICENSEPAGE_CHECKBOX
-',(self hasLicenceToAcceptDuringInstallation
+',(self hasLicenceToAcceptDuringInstallation
ifTrue:['!!insertmacro MUI_PAGE_LICENSE $(license)']
ifFalse:['']),'
!!insertmacro MUI_PAGE_COMPONENTS
@@ -2593,7 +2593,7 @@
;; SetOverwrite ifnewer
;; ; File /r /x CVS "${STX_ROOT}\%(MODULE)\%(APPLICATION)\examples\*"
;; SectionEnd
-;;
+;;
;; Section "%(PRODUCT_NAME) Reports and Printing" Section4
;; SectionIn 1
;; SetOutPath "$INSTDIR\reportGenerator"
@@ -2699,9 +2699,9 @@
packageName_dot_rc
"the template code for the <appname>.rc file"
-^
+^
'//
-// DO NOT EDIT
+// DO NOT EDIT
// automagically generated from the projectDefinition: ',self name,'.
//
#define IDR_MAINFRAME 128
@@ -2808,7 +2808,7 @@
undefineExtenionLine_nsi_for:extension
"the template code for a single extenions undefinition line in the <appname>.nsi file"
-^
+^
' DeleteRegKey HKCR ".',extension,'"'
"Created: / 15-10-2006 / 12:51:00 / cg"
@@ -2862,15 +2862,15 @@
"/ startupSelector
) do:[:sel |
(self theMetaclass includesSelector:sel) ifFalse:[
- Dialog
- warn:('The %1-method is missing from the description %2!!'
+ Dialog
+ warn:('The %1-method is missing from the description %2!!'
bindWith:sel allBold
with:self name allBold).
AbortSignal raise.
].
(Error catch:[ self perform:sel ]) ifTrue:[
- (Dialog
- confirm:('The %1-method needs to be edited in the description %2!!\\Continue anyway?'
+ (Dialog
+ confirm:('The %1-method needs to be edited in the description %2!!\\Continue anyway?'
bindWith:sel allBold
with:self name allBold) withCRs) ifFalse:[
AbortSignal raise.
@@ -2904,7 +2904,7 @@
!ApplicationDefinition class methodsFor:'documentation'!
version
- ^ '$Id: ApplicationDefinition.st 10876 2012-11-30 17:19:23Z vranyj1 $'
+ ^ '$Id: ApplicationDefinition.st 10883 2012-12-07 19:24:14Z vranyj1 $'
!
version_CVS
@@ -2912,6 +2912,6 @@
!
version_SVN
- ^ '$Id:: ApplicationDefinition.st 10876 2012-11-30 17:19:23Z vranyj1 $'
+ ^ '$Id:: ApplicationDefinition.st 10883 2012-12-07 19:24:14Z vranyj1 $'
! !