# HG changeset patch # User Fionntina Carville # Date 1289321725 0 # Node ID 1158876b56228245c606dabc025f3605cc3455b2 # Parent a728d3c0bd35b22717e84c137fb0380a3b6254e3 Adjust .mk files for parallel execution. diff -r a728d3c0bd35 -r 1158876b5622 build/common/bld.inf --- a/build/common/bld.inf Mon Nov 08 17:25:34 2010 +0000 +++ b/build/common/bld.inf Tue Nov 09 16:55:25 2010 +0000 @@ -48,6 +48,11 @@ ..\..\tools\baserom \epoc32\tools\baserom ..\..\tools\baserom.bat \epoc32\tools\baserom.bat -PRJ_MMPFILES +..\..\tools\export_templates.mk \epoc32\tools\makefile_templates\fshell\export_templates.mk +..\..\tools\export_templates.meta \epoc32\tools\makefile_templates\fshell\export_templates.meta + -gnumakefile ..\..\tools\export_templates.mk +PRJ_EXTENSIONS +start extension fshell/export_templates +end + diff -r a728d3c0bd35 -r 1158876b5622 build/common/fsh_buildsis.mk --- a/build/common/fsh_buildsis.mk Mon Nov 08 17:25:34 2010 +0000 +++ b/build/common/fsh_buildsis.mk Tue Nov 09 16:55:25 2010 +0000 @@ -9,14 +9,22 @@ # Initial Contributors: # Accenture - Initial contribution # -FINAL : +# To ensure that EPOCROOT always ends with a forward slash +TMPROOT:=$(subst \,/,$(EPOCROOT)) +EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/ + +BUILDSIS = $(EPOCROOT)sf/os/fshell/tools/fsh-buildsis + +FINAL : $(DOFINAL) +$(DOFINAL) : ifneq ($(PLATFORM), WINSCW) - ..\..\tools\fsh-buildsis -u $(PLATFORM) $(EPOCROOT)epoc32\rom\include\fshell.iby $(EPOCROOT)epoc32\fshell\fshell.sis + $(BUILDSIS) -u $(PLATFORM) $(EPOCROOT)epoc32/rom/include/fshell.iby $(EPOCROOT)epoc32/fshell/fshell.sis endif -RELEASABLES : +RELEASABLES : $(RELEASABLEFILES) +$(RELEASABLEFILES) : ifneq ($(PLATFORM), WINSCW) - @echo $(EPOCROOT)epoc32\fshell\fshell.unsigned.sis + @echo $(EPOCROOT)epoc32/fshell/fshell.unsigned.sis endif MAKMAKE BLD FREEZE LIB CLEANLIB RESOURCE CLEAN SAVESPACE : diff -r a728d3c0bd35 -r 1158876b5622 build/s60/bld_generic.inf --- a/build/s60/bld_generic.inf Mon Nov 08 17:25:34 2010 +0000 +++ b/build/s60/bld_generic.inf Tue Nov 09 16:55:25 2010 +0000 @@ -26,6 +26,9 @@ #include "../common/bld.inf" -PRJ_MMPFILES -gnumakefile ..\common\fsh_buildsis.mk +..\common\fsh_buildsis.mk \epoc32\tools\makefile_templates\fshell\fsh_buildsis.mk +..\common\fsh_buildsis.meta \epoc32\tools\makefile_templates\fshell\fsh_buildsis.meta +PRJ_EXTENSIONS +start extension fshell/fsh_buildsis +end \ No newline at end of file diff -r a728d3c0bd35 -r 1158876b5622 build/sf/bld_shared.inf --- a/build/sf/bld_shared.inf Mon Nov 08 17:25:34 2010 +0000 +++ b/build/sf/bld_shared.inf Tue Nov 09 16:55:25 2010 +0000 @@ -26,6 +26,9 @@ FSHELL_ROM_INCLUDE(fshell_platform.iby) #endif -PRJ_MMPFILES -gnumakefile ..\common\fsh_buildsis.mk +..\common\fsh_buildsis.mk \epoc32\tools\makefile_templates\fshell\fsh_buildsis.mk +..\common\fsh_buildsis.meta \epoc32\tools\makefile_templates\fshell\fsh_buildsis.meta +PRJ_EXTENSIONS +start extension fshell/fsh_buildsis +end \ No newline at end of file diff -r a728d3c0bd35 -r 1158876b5622 build/symtb92/bld.inf --- a/build/symtb92/bld.inf Mon Nov 08 17:25:34 2010 +0000 +++ b/build/symtb92/bld.inf Tue Nov 09 16:55:25 2010 +0000 @@ -22,8 +22,11 @@ FSHELL_ROM_INCLUDE2(platform.mmh, fshell\platform.mmh) FSHELL_ROM_INCLUDE(fshell_platform.iby) -PRJ_MMPFILES -gnumakefile ..\common\fsh_buildsis.mk +..\common\fsh_buildsis.mk \epoc32\tools\makefile_templates\fshell\fsh_buildsis.mk +..\common\fsh_buildsis.meta \epoc32\tools\makefile_templates\fshell\fsh_buildsis.meta #include <../common/bld.inf> +PRJ_EXTENSIONS +start extension fshell/fsh_buildsis +end diff -r a728d3c0bd35 -r 1158876b5622 core/group/fshell_version.mk --- a/core/group/fshell_version.mk Mon Nov 08 17:25:34 2010 +0000 +++ b/core/group/fshell_version.mk Tue Nov 09 16:55:25 2010 +0000 @@ -17,23 +17,20 @@ TMPROOT:=$(subst \,/,$(EPOCROOT)) EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/ - - GENERATED_SOURCE_DIR = $(EPOCROOT)epoc32/build/fshell/core/generated/platform_$(PLATFORM) GENERATED_SOURCE = $(GENERATED_SOURCE_DIR)/fshell_version.cpp - GENVER:= $(EPOCROOT)sf/os/fshell/core/group/genver.pl MAKMAKE : $(GENERATED_SOURCE) - $(GENERATED_SOURCE) : perl $(EPOCROOT)epoc32\tools\emkdir.pl $(GENERATED_SOURCE_DIR) echo perl .\genver.pl $(PLATFORM) $(CFG) perl $(GENVER) $(PLATFORM) > $(GENERATED_SOURCE) -CLEAN : +CLEAN : $(CLEAN_FILES) +$(CLEAN_FILES) : perl $(EPOCROOT)epoc32\tools\ermdir.pl $(GENERATED_SOURCE_DIR) BLD FREEZE LIB CLEANLIB RESOURCE SAVESPACE RELEASABLES FINAL : diff -r a728d3c0bd35 -r 1158876b5622 documentation/bld.inf --- a/documentation/bld.inf Mon Nov 08 17:25:34 2010 +0000 +++ b/documentation/bld.inf Tue Nov 09 16:55:25 2010 +0000 @@ -17,7 +17,10 @@ documentation-style.css \epoc32\build\fshell\documentation\documentation-style.css common_mmh.pod \epoc32\build\fshell\documentation\common_mmh.pod cif_syntax.pod \epoc32\build\fshell\documentation\cif_syntax.pod +fshell_builddocs.mk \epoc32\tools\makefile_templates\fshell\fshell_builddocs.mk +fshell_builddocs.meta \epoc32\tools\makefile_templates\fshell\fshell_builddocs.meta -PRJ_MMPFILES -gnumakefile fshell_builddocs.mk +PRJ_EXTENSIONS +start extension fshell/fshell_builddocs +end diff -r a728d3c0bd35 -r 1158876b5622 documentation/fshell_builddocs.mk --- a/documentation/fshell_builddocs.mk Mon Nov 08 17:25:34 2010 +0000 +++ b/documentation/fshell_builddocs.mk Tue Nov 09 16:55:25 2010 +0000 @@ -9,13 +9,24 @@ # Initial Contributors: # Accenture - Initial contribution # -BLD : - ..\tools\fsh-builddocs -i epoc32/include pod-list.txt +# To ensure that EPOCROOT always ends with a forward slash +TMPROOT:=$(subst \,/,$(EPOCROOT)) +EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/ + +BUILDDOCS = $(EPOCROOT)sf/os/fshell/tools/fsh-builddocs +POD = $(EPOCROOT)sf/os/fshell/documentation/pod-list.txt + -RELEASABLES : - @..\tools\fsh-builddocs -i epoc32/include pod-list.txt -w +BLD : $(BUILDFILES) +$(BUILDFILES) : + $(BUILDDOCS) -i $(EPOCROOT)epoc32/include $(POD) -CLEAN : - ..\tools\fsh-builddocs -i epoc32/include pod-list.txt -c +RELEASABLES : $(RELEASEABLEFILES) +$(RELEASEABLEFILES) : + @$(BUILDDOCS) -i $(EPOCROOT)epoc32/include $(POD) -w + +CLEAN : $(CLEANFILES) +$(CLEANFILES) : + $(BUILDDOCS) -i $(EPOCROOT)epoc32/include $(POD) -c MAKMAKE FREEZE LIB CLEANLIB RESOURCE SAVESPACE FINAL : diff -r a728d3c0bd35 -r 1158876b5622 plugins/consoles/guicons/group/bld.inf --- a/plugins/consoles/guicons/group/bld.inf Mon Nov 08 17:25:34 2010 +0000 +++ b/plugins/consoles/guicons/group/bld.inf Tue Nov 09 16:55:25 2010 +0000 @@ -23,11 +23,16 @@ ..\data\font_6x10.PNG Z:\resource\font_6x10.PNG ..\data\font_7x13.PNG Z:\resource\font_7x13.PNG ..\inc\guicons.h \epoc32\include\fshell\guicons.h +guicons_makefont.mk \epoc32\tools\makefile_templates\fshell\guicons_makefont.mk +guicons_makefont.meta \epoc32\tools\makefile_templates\fshell\guicons_makefont.meta PRJ_MMPFILES -gnumakefile guicons_makefont.mk guicons.mmp +PRJ_EXTENSIONS +start extension fshell/guicons_makefont +end + #ifdef FSHELL_PLATFORM_S60 #include "..\s60\group\bld.inf" #endif diff -r a728d3c0bd35 -r 1158876b5622 plugins/consoles/guicons/group/guicons_makefont.mk --- a/plugins/consoles/guicons/group/guicons_makefont.mk Mon Nov 08 17:25:34 2010 +0000 +++ b/plugins/consoles/guicons/group/guicons_makefont.mk Tue Nov 09 16:55:25 2010 +0000 @@ -9,16 +9,23 @@ # Initial Contributors: # Accenture - Initial contribution # -GENERATED_SOURCE_DIR = $(EPOCROOT)epoc32\build\fshell\guicons\generated -GENERATED_SOURCE = $(GENERATED_SOURCE_DIR)\defaultfontdata.inl +# To ensure that EPOCROOT always ends with a forward slash +TMPROOT:=$(subst \,/,$(EPOCROOT)) +EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/ + +GENERATED_SOURCE_DIR = $(EPOCROOT)epoc32/build/fshell/guicons/generated +GENERATED_SOURCE = $(GENERATED_SOURCE_DIR)/defaultfontdata.inl +PNG = $(EPOCROOT)sf/os/fshell/plugins/consoles/guicons/data/font_6x10.PNG +GENFILE:= $(EPOCROOT)sf/os/fshell/plugins/consoles/guicons/group/bin2lit.pl + MAKMAKE : $(GENERATED_SOURCE) - -$(GENERATED_SOURCE) : ..\data\font_6x10.PNG +$(GENERATED_SOURCE) : perl $(EPOCROOT)epoc32\tools\emkdir.pl $(GENERATED_SOURCE_DIR) - perl .\bin2lit.pl KDefaultFontImageData < ..\data\font_6x10.PNG > $(GENERATED_SOURCE) + perl $(GENFILE) KDefaultFontImageData < $(PNG) > $(GENERATED_SOURCE) -CLEAN : +CLEAN : $(CLEANFILES) +$(CLEANFILES) : perl $(EPOCROOT)epoc32\tools\ermdir.pl $(GENERATED_SOURCE_DIR) BLD FREEZE RESOURCE LIB CLEANLIB RESOURCE SAVESPACE RELEASABLES FINAL : diff -r a728d3c0bd35 -r 1158876b5622 plugins/consoles/win32cons/group/os_ver.mk --- a/plugins/consoles/win32cons/group/os_ver.mk Mon Nov 08 17:25:34 2010 +0000 +++ b/plugins/consoles/win32cons/group/os_ver.mk Tue Nov 09 16:55:25 2010 +0000 @@ -19,18 +19,15 @@ GENERATED_SOURCE_DIR = $(EPOCROOT)epoc32/build/fshell/win32cons/generated GENERATED_SOURCE = $(GENERATED_SOURCE_DIR)/os_version.h - - OSVER:= $(EPOCROOT)sf/os/fshell/plugins/consoles/win32cons/group/os_version_h.pl - MAKMAKE : $(GENERATED_SOURCE) - $(GENERATED_SOURCE) : perl $(EPOCROOT)epoc32\tools\emkdir.pl $(EPOCROOT)epoc32\build\fshell/win32cons\generated perl $(OSVER) > $(GENERATED_SOURCE) -CLEAN : +CLEAN : $(CLEAN_FILES) +$(CLEAN_FILES) : -del ..\src\os_version.h BLD FREEZE LIB CLEANLIB RESOURCE SAVESPACE RELEASABLES FINAL : diff -r a728d3c0bd35 -r 1158876b5622 tools/export_templates.mk --- a/tools/export_templates.mk Mon Nov 08 17:25:34 2010 +0000 +++ b/tools/export_templates.mk Tue Nov 09 16:55:25 2010 +0000 @@ -9,19 +9,31 @@ # Initial Contributors: # Accenture - Initial contribution # -BLD : +# To ensure that EPOCROOT always ends with a forward slash +TMPROOT:=$(subst \,/,$(EPOCROOT)) +EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/ + +CREATESRCDIR = $(EPOCROOT)sf/os/fshell/tools/createsrc-templates +CREATESRCDEST = $(EPOCROOT)epoc32/tools/createsrc-templates +EXPORT = $(EPOCROOT)sf/os/fshell/tools/exportall + +BLD : $(BUILDFILES) +$(BUILDFILES) : ifeq ($(PLATFORM), WINSCW) - .\exportall .\createsrc-templates $(EPOCROOT)epoc32\tools\createsrc-templates + $(EXPORT) $(CREATESRCDIR) $(CREATESRCDEST) endif -RELEASABLES : +RELEASABLES : $(RELEASABLEFILES) +$(RELEASABLEFILES) : ifeq ($(PLATFORM), WINSCW) - @.\exportall -w .\createsrc-templates $(EPOCROOT)epoc32\tools\createsrc-templates + @$(EXPORT) -w $(CREATESRCDIR) $(CREATESRCDEST) endif -CLEAN : +CLEAN : $(CLEANFILES) + +$(CLEANFILES) : ifeq ($(PLATFORM), WINSCW) - .\exportall -c .\createsrc-templates $(EPOCROOT)epoc32\tools\createsrc-templates + $(EXPORT)-c $(CREATESRCDIR) $(CREATESRCDEST) endif MAKMAKE FINAL FREEZE LIB CLEANLIB RESOURCE SAVESPACE : \ No newline at end of file