# HG changeset patch # User Tom Sutcliffe # Date 1277386665 -3600 # Node ID 6c055a136ec121317c455f70c486d6cdbe9773ba # Parent 7f656887cf89c7c1b861cf86d38d89c4256bb1e3 Build fixes for environments which don't have \epoc32\tools in their path. diff -r 7f656887cf89 -r 6c055a136ec1 core/group/fshell_version.mk --- a/core/group/fshell_version.mk Wed Jun 23 15:52:26 2010 +0100 +++ b/core/group/fshell_version.mk Thu Jun 24 14:37:45 2010 +0100 @@ -13,11 +13,11 @@ GENERATED_SOURCE = $(GENERATED_SOURCE_DIR)\fshell_version.cpp MAKMAKE : - perl -S emkdir.pl $(GENERATED_SOURCE_DIR) + perl $(EPOCROOT)epoc32\tools\emkdir.pl $(GENERATED_SOURCE_DIR) echo perl .\genver.pl $(PLATFORM) $(CFG) perl .\genver.pl $(PLATFORM) > $(GENERATED_SOURCE) CLEAN : - perl -S ermdir.pl $(GENERATED_SOURCE_DIR) + perl $(EPOCROOT)epoc32\tools\ermdir.pl $(GENERATED_SOURCE_DIR) BLD FREEZE LIB CLEANLIB RESOURCE SAVESPACE RELEASABLES FINAL : diff -r 7f656887cf89 -r 6c055a136ec1 documentation/change_history.pod --- a/documentation/change_history.pod Wed Jun 23 15:52:26 2010 +0100 +++ b/documentation/change_history.pod Thu Jun 24 14:37:45 2010 +0100 @@ -14,6 +14,10 @@ =head1 FShell Change History +=head2 Release 000.2 + +Build fixes. + =head2 Release 000.1 Prerelease to the SF staging server. diff -r 7f656887cf89 -r 6c055a136ec1 plugins/consoles/guicons/group/guicons_makefont.mk --- a/plugins/consoles/guicons/group/guicons_makefont.mk Wed Jun 23 15:52:26 2010 +0100 +++ b/plugins/consoles/guicons/group/guicons_makefont.mk Thu Jun 24 14:37:45 2010 +0100 @@ -15,11 +15,11 @@ MAKMAKE : $(GENERATED_SOURCE) $(GENERATED_SOURCE) : ..\data\font_6x10.PNG - perl -S emkdir.pl $(GENERATED_SOURCE_DIR) + perl $(EPOCROOT)epoc32\tools\emkdir.pl $(GENERATED_SOURCE_DIR) echo perl .\bin2lit.pl KDefaultFontImageData ^< ..\data\font_6x10.PNG ^> $(GENERATED_SOURCE) perl .\bin2lit.pl KDefaultFontImageData < ..\data\font_6x10.PNG > $(GENERATED_SOURCE) CLEAN : - perl -S ermdir.pl $(GENERATED_SOURCE_DIR) + perl $(EPOCROOT)epoc32\tools\ermdir.pl $(GENERATED_SOURCE_DIR) BLD FREEZE RESOURCE LIB CLEANLIB RESOURCE SAVESPACE RELEASABLES FINAL : diff -r 7f656887cf89 -r 6c055a136ec1 plugins/consoles/win32cons/group/os_ver.mk --- a/plugins/consoles/win32cons/group/os_ver.mk Wed Jun 23 15:52:26 2010 +0100 +++ b/plugins/consoles/win32cons/group/os_ver.mk Thu Jun 24 14:37:45 2010 +0100 @@ -10,7 +10,7 @@ # Accenture - Initial contribution # MAKMAKE : - perl -S emkdir.pl $(EPOCROOT)epoc32\build\fshell/win32cons\generated + perl $(EPOCROOT)epoc32\tools\emkdir.pl $(EPOCROOT)epoc32\build\fshell/win32cons\generated perl .\os_version_h.PL > $(EPOCROOT)epoc32\build\fshell/win32cons\generated\os_version.h CLEAN :