--- a/ProjectDefinition.st Tue Sep 04 12:14:15 2012 +0200
+++ b/ProjectDefinition.st Tue Sep 04 13:20:02 2012 +0200
@@ -3264,10 +3264,7 @@
|mappings|
mappings := Dictionary new.
-
mappings
-"/ at: 'TOP' put: ( self pathToTop_unix );
-"/ at: 'NSI_FILENAME' put: self nsiFilename ;
at: 'DESCRIPTION' put: (self description);
at: 'PRODUCT_VERSION' put: (self productVersion);
at: 'PRODUCT_DATE' put: (self productDate);
@@ -3279,58 +3276,20 @@
at: 'PRODUCT_DESCRIPTION' put: (self productDescription);
at: 'MAINTAINER' put: (self productMaintainer);
at: 'PACKAGER' put: (self productPublisher);
-"/ 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_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: 'BUILD_TARGET' put: (self buildTarget );
yourself.
-"/ self offerSmalltalkSourceCode ifTrue:[
-"/ mappings
-"/ at: 'STX_SOURCE_RULES' put: ( self replaceMappings: mappings
-"/ in: self make_dot_proto_stx_source_rules).
-"/ ].
-
-"/ self offerApplicationSourceCode ifTrue:[
-"/ 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
-"/ in: self make_dot_proto_resource_rules );
-"/ 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.
-"/ ].
-
^ mappings
"Created: / 21-12-2010 / 09:00:49 / cg"
"Modified: / 21-12-2010 / 11:14:41 / cg"
+ "Modified (format): / 04-09-2012 / 13:08:46 / cg"
!
bc_dot_mak_mappings
|d|
- d := Dictionary new.
+ d := self common_mappings.
d
- at: 'TAB' put: ( Character tab asString );
- at: 'TOP' put: ( self pathToTop_win32 );
- at: 'MODULE' put: ( self module );
- at: 'MODULE_DIRECTORY' put: ( self moduleDirectory );
- at: 'MODULE_PATH' put: ( self moduleDirectory_win32 );
at: 'PRIMARY_TARGET' put: (self primaryTarget_bc_dot_mak);
at: 'ADDITIONAL_BASE_ADDRESS_DEFINITION' put: (self additionalBaseAddressDefinition_bc_dot_mak ? '');
at: 'ADDITIONAL_DEFINITIONS' put: (self additionalDefinitions_bc_dot_mak ? '');
@@ -3345,11 +3304,11 @@
^ d
"Created: / 18-08-2006 / 11:43:39 / cg"
- "Modified: / 12-09-2011 / 15:43:30 / cg"
+ "Modified: / 04-09-2012 / 13:08:06 / cg"
!
bmake_dot_mak_mappings
- ^ (Dictionary new)
+ ^ self common_mappings
at:'SUBPROJECT_BMAKE_CALLS' put:(self subProjectBmakeCalls);
at:'SUBPROJECT_VCMAKE_CALLS' put:(self subProjectVCmakeCalls);
at:'SUBPROJECT_LCCMAKE_CALLS' put:(self subProjectLCCmakeCalls);
@@ -3357,7 +3316,7 @@
yourself
"Created: / 17-08-2006 / 21:41:56 / cg"
- "Modified: / 03-09-2012 / 19:48:53 / cg"
+ "Modified: / 04-09-2012 / 13:07:41 / cg"
!
builder_baseline_dot_rbspec_mappings
@@ -3399,12 +3358,23 @@
"Created: / 19-09-2006 / 22:47:43 / cg"
!
-make_dot_proto_mappings
+common_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: 'MODULE' put: ( self module );
+ at: 'MODULE_DIRECTORY' put: ( self moduleDirectory );
+ at: 'MODULE_PATH' put: ( self moduleDirectory );
+ yourself
+
+ "Created: / 04-09-2012 / 13:04:26 / cg"
+!
+
+make_dot_proto_mappings
+ ^ self common_mappings
+ at: 'LIBRARY_NAME' put: ( self libraryName );
at: 'LOCAL_INCLUDES' put: (self generateLocalIncludes_unix);
at: 'LOCAL_DEFINES' put: self localDefines_unix;
at: 'GLOBAL_DEFINES' put: self globalDefines_unix;
@@ -3420,9 +3390,6 @@
at: 'ADDITIONAL_LINK_LIBRARIES' put: (self additionalLinkLibraries_make_dot_proto);
at: 'ADDITIONAL_SHARED_LINK_LIBRARIES' put: (self additionalSharedLinkLibraries_make_dot_proto);
at: 'DEPENDENCIES' put: (self generateDependencies_unix);
- at: 'MODULE' put: ( self module );
- at: 'MODULE_DIRECTORY' put: ( self moduleDirectory );
- at: 'MODULE_PATH' put: ( self moduleDirectory );
at: 'MAKE_PREREQUISITES' put: (self generateRequiredMakePrerequisites_make_dot_proto);
yourself
@@ -3430,14 +3397,11 @@
"Modified: / 09-08-2006 / 16:44:48 / fm"
"Modified: / 24-06-2009 / 21:50:13 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Modified: / 22-08-2009 / 12:03:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 12-09-2011 / 15:43:06 / cg"
+ "Modified: / 04-09-2012 / 13:06:32 / cg"
!
make_dot_spec_mappings
- ^ Dictionary new
- at: 'TAB' put: ( Character tab asString );
- at: 'MODULE' put: ( self module );
- at: 'MODULE_DIRECTORY' put: ( self moduleDirectory );
+ ^ self common_mappings
at: 'STCWARNINGOPTIONS' put: (self stcWarningOptions);
at: 'STCOPTIMIZATIONOPTIONS' put: (self stcOptimizationOptions);
at: 'CLASSES' put: [self generateClasses_make_dot_spec];
@@ -3445,7 +3409,7 @@
yourself
"Created: / 18-08-2006 / 11:44:23 / cg"
- "Modified: / 14-09-2006 / 18:51:24 / cg"
+ "Modified: / 04-09-2012 / 13:05:54 / cg"
!
makefile_mappings
@@ -6759,11 +6723,11 @@
!ProjectDefinition class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.388 2012-09-04 10:14:15 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.389 2012-09-04 11:20:02 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.388 2012-09-04 10:14:15 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.389 2012-09-04 11:20:02 cg Exp $'
!
version_SVN