# HG changeset patch # User Shabe Razvi # Date 1260459271 0 # Node ID 9eea79386bb7ca6961154193d21196ca68702186 # Parent c84911f61ce033b9d5596a54a7840bb682bd68ce Clear HG_PASSWORD before executing build steps. Also allow cenrep generation in PDK_Raptor for Symbian^3. diff -r c84911f61ce0 -r 9eea79386bb7 PDK_Helium/config.xml --- a/PDK_Helium/config.xml Tue Dec 08 13:54:31 2009 +0000 +++ b/PDK_Helium/config.xml Thu Dec 10 15:34:31 2009 +0000 @@ -21,9 +21,6 @@ false - - false - @@ -79,7 +76,7 @@ HG_PASSWORD Enter your Mercurial symbian developer web password <i>(required for download of packages from BOM, not needed when using source zip packages)</i> -<br><b>Note: Be aware that currently this password will appear in plain text in the build logs.</b> +<br> @@ -208,5 +205,4 @@ - \ No newline at end of file diff -r c84911f61ce0 -r 9eea79386bb7 PDK_Raptor/config.xml --- a/PDK_Raptor/config.xml Tue Dec 08 13:54:31 2009 +0000 +++ b/PDK_Raptor/config.xml Thu Dec 10 15:34:31 2009 +0000 @@ -12,9 +12,6 @@ false - - false - @@ -75,7 +72,7 @@ HG_PASSWORD Enter your Mercurial symbian developer web password <i>(required for download of packages from BOM, not needed when using source zip packages)</i> -<br><b>Note: Be aware that currently this password will appear in plain text in the build logs.</b> +<br> @@ -171,6 +168,7 @@ mkdir %SUBST_DRIVE%\epoc32\include\variant\ mkdir %SUBST_DRIVE%\epoc32\tools\variant\ set VARIANT=tb91sf +set HG_PASSWORD= IF %PLATFORM% == symbian3 set VARIANT=tb92sf IF NOT %PLATFORM% == symbian2 copy %SUBST_DRIVE%\sf\os\deviceplatformrelease\symbianosbld\cedarutils\inc\Symbian_OS_%VARIANT%.hrh %SUBST_DRIVE%\sf\os\deviceplatformrelease\symbianosbld\cedarutils\Symbian_OS.hrh copy %SUBST_DRIVE%\sf\os\deviceplatformrelease\symbianosbld\cedarutils\*.hrh %SUBST_DRIVE%\epoc32\include\variant\ @@ -183,6 +181,7 @@ IF %LEGACY_BLDMEFIRST% == true exit cd %SUBST_DRIVE% %SUBST_DRIVE% +set HG_PASSWORD= cd\ cmd /c sbs EXPORT --ignore-os-detection --export-only -b %SUBST_DRIVE%\sf\os\deviceplatformrelease\sf_config\config\western\group\bld.inf cmd /c sbs EXPORT --ignore-os-detection --export-only -b %SUBST_DRIVE%\sf\os\deviceplatformrelease\sf_config\config\group\bld.inf @@ -196,6 +195,7 @@ IF %LEGACY_BLDMEFIRST% == true exit cd %SUBST_DRIVE% %SUBST_DRIVE% +set HG_PASSWORD= cd\ xcopy /s %SUBST_DRIVE%\sf\tools\makefile_templates\*.* %SUBST_DRIVE%\epoc32\tools\makefile_templates\s60\ exit 0 @@ -204,6 +204,7 @@ if %REBUILD_TOOLS% == true exit cd %SUBST_DRIVE% %SUBST_DRIVE% +set HG_PASSWORD= cd\ set VARIANT=tb91sf IF %PLATFORM% == symbian3 set VARIANT=tb92sf @@ -213,6 +214,7 @@ if %REBUILD_TOOLS% == false exit cd %SUBST_DRIVE% %SUBST_DRIVE% +set HG_PASSWORD= cd\ set VARIANT=tb91sf IF %PLATFORM% == symbian3 set VARIANT=tb92sf @@ -222,6 +224,7 @@ if %REBUILD_TOOLS% == false exit cd %SUBST_DRIVE% %SUBST_DRIVE% +set HG_PASSWORD= cd\ set VARIANT=tb91sf IF %PLATFORM% == symbian3 set VARIANT=tb92sf @@ -230,6 +233,7 @@ cd %SUBST_DRIVE% %SUBST_DRIVE% +set HG_PASSWORD= cd\ set VARIANT=tb91sf IF %PLATFORM% == symbian3 set VARIANT=tb92sf @@ -240,6 +244,7 @@ IF %REBUILD_TOOLS% == true exit cd %SUBST_DRIVE% %SUBST_DRIVE% +set HG_PASSWORD= cd\ set S60VARIANT=5_1 set VARIANT=tb91sf @@ -252,6 +257,7 @@ IF %REBUILD_TOOLS% == false exit cd %SUBST_DRIVE% %SUBST_DRIVE% +set HG_PASSWORD= cd\ set S60VARIANT=5_1 set VARIANT=tb91sf @@ -264,6 +270,7 @@ IF %REBUILD_TOOLS% == false exit cd %SUBST_DRIVE% %SUBST_DRIVE% +set HG_PASSWORD= cd\ set S60VARIANT=5_1 set VARIANT=tb91sf @@ -275,6 +282,7 @@ IF %SPLIT_BUILD% == false exit cd %SUBST_DRIVE% %SUBST_DRIVE% +set HG_PASSWORD= cd\ set S60VARIANT=5_1 set VARIANT=tb91sf @@ -286,7 +294,9 @@ cd %SUBST_DRIVE% %SUBST_DRIVE% cd\ -%HELIUM_HOME%\..\ConfigurationTool/cli_build.cmd -master_conf s60 -impl /epoc32/rom/config/confml_data/s60 -confml /epoc32/rom/config/confml_data/s60 -ignore_errors +IF %PLATFORM% == symbian2 set CENREP_DIR=/epoc32/rom/config/confml_data/s60 +IF %PLATFORM% == symbian3 set CENREP_DIR=/epoc32/rom/config/assets +%HELIUM_HOME%\..\ConfigurationTool/cli_build.cmd -master_conf s60 -impl %CENREP_DIR% -confml %CENREP_DIR% -ignore_errors