Mercurial Mercurial > oss > FCL > sf > os > fshell / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Build fixes for environments which don't have \epoc32\tools in their path.
authorTom Sutcliffe <thomas.sutcliffe@accenture.com>
Thu, 24 Jun 2010 14:37:45 +0100
changeset 1 6c055a136ec1
parent 0 7f656887cf89
child 2 68b921ce1944
Build fixes for environments which don't have \epoc32\tools in their path.
core/group/fshell_version.mk file | annotate | diff | comparison | revisions
documentation/change_history.pod file | annotate | diff | comparison | revisions
plugins/consoles/guicons/group/guicons_makefont.mk file | annotate | diff | comparison | revisions
plugins/consoles/win32cons/group/os_ver.mk file | annotate | diff | comparison | revisions 
--- 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 : 
--- 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.
--- 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 : 
--- 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 :
FCL/sf/os/fshell