# HG changeset patch # User Ross Qin # Date 1288236882 -28800 # Node ID fb8810d63524731a426d424c1658eca5ffe9875d # Parent a3b39a14147ab0563ad970a476ee1de23d9b9269 remove the emulatorlauncher diff -r a3b39a14147a -r fb8810d63524 deprecated/buildtools/emulatorlauncher/group/bld.inf --- a/deprecated/buildtools/emulatorlauncher/group/bld.inf Thu Oct 28 11:18:50 2010 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies). -// All rights reserved. -// This component and the accompanying materials are made available -// under the terms of "Eclipse Public License v1.0" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// - -PRJ_PLATFORMS -TOOLS - -PRJ_EXPORTS -..\perl\epoc.bat \epoc32\tools\epoc.bat -..\perl\epoc.pl \epoc32\tools\epoc.pl -..\perl\eshell.bat \epoc32\tools\eshell.bat -..\perl\eshell.pl \epoc32\tools\eshell.pl -..\perl\console.ini \epoc32\data\console.ini -..\perl\console.bmp \epoc32\data\console.bmp - diff -r a3b39a14147a -r fb8810d63524 deprecated/buildtools/emulatorlauncher/group/location.txt --- a/deprecated/buildtools/emulatorlauncher/group/location.txt Thu Oct 28 11:18:50 2010 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -The content of emulator_launcher is: - -perl Perl scripts and batch files for all tools. -group Information and build files. -test Sample build.info files. - diff -r a3b39a14147a -r fb8810d63524 deprecated/buildtools/emulatorlauncher/group/release.txt --- a/deprecated/buildtools/emulatorlauncher/group/release.txt Thu Oct 28 11:18:50 2010 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -Made by JonC 14/05/01 - -Introduction of emulator_launcher component for the 6.1 SDKs i.e. these are the stub launchers -that were present on the 6.0 SDKs, together with a new launcher for pepoc. - - diff -r a3b39a14147a -r fb8810d63524 deprecated/buildtools/emulatorlauncher/group/todo.txt --- a/deprecated/buildtools/emulatorlauncher/group/todo.txt Thu Oct 28 11:18:50 2010 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -Todo for : - - - - - - diff -r a3b39a14147a -r fb8810d63524 deprecated/buildtools/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.history.xml --- a/deprecated/buildtools/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.history.xml Thu Oct 28 11:18:50 2010 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - - - - diff -r a3b39a14147a -r fb8810d63524 deprecated/buildtools/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp --- a/deprecated/buildtools/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp Thu Oct 28 11:18:50 2010 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -# -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of "Eclipse Public License v1.0" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - -component tools_sdk_eng_emulator_launcher -source \sf\os\buildtools\misccomponents\emulatorlauncher -binary \sf\os\buildtools\misccomponents\emulatorlauncher\group all -exports \sf\os\buildtools\misccomponents\emulatorlauncher\group -notes_source \component_defs\release.src - -#Intermediate files for tools target -#binary \epoc32\release\tools\rel\pjava.exe -#binary \epoc32\release\tools\rel\pjava_g.exe -#binary \epoc32\release\tools\rel\pappletviewer.exe -#binary \epoc32\release\tools\rel\pappletviewer_g.exe - - - -ipr T - diff -r a3b39a14147a -r fb8810d63524 deprecated/buildtools/emulatorlauncher/perl/console.bmp Binary file deprecated/buildtools/emulatorlauncher/perl/console.bmp has changed diff -r a3b39a14147a -r fb8810d63524 deprecated/buildtools/emulatorlauncher/perl/console.ini --- a/deprecated/buildtools/emulatorlauncher/perl/console.ini Thu Oct 28 11:18:50 2010 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -# Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of "Eclipse Public License v1.0" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - -ScreenWidth 640 -ScreenHeight 240 - -PhysicalScreenWidth 0 -PhysicalScreenHeight 0 - -fasciabitmap console.bmp - -ScreenOffsetX 0 -ScreenOffsetY 0 - - -# could be decreased to reflect the amount of memory available on Brutus -MegabytesOfFreeMemory 16 - - diff -r a3b39a14147a -r fb8810d63524 deprecated/buildtools/emulatorlauncher/perl/epoc.bat --- a/deprecated/buildtools/emulatorlauncher/perl/epoc.bat Thu Oct 28 11:18:50 2010 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -@echo off - -rem Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies). -rem All rights reserved. -rem This component and the accompanying materials are made available -rem under the terms of "Eclipse Public License v1.0" -rem which accompanies this distribution, and is available -rem at the URL "http://www.eclipse.org/legal/epl-v10.html". -rem -rem Initial Contributors: -rem Nokia Corporation - initial contribution. -rem -rem Contributors: -rem -rem Description: -rem Emulator Launcher -rem -rem - -perl -S epoc.pl %1 %2 diff -r a3b39a14147a -r fb8810d63524 deprecated/buildtools/emulatorlauncher/perl/epoc.pl --- a/deprecated/buildtools/emulatorlauncher/perl/epoc.pl Thu Oct 28 11:18:50 2010 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,256 +0,0 @@ -# Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies). -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of "Eclipse Public License v1.0" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# Launcher for the Symbian Emulator, including -# functionality to read the $ENV{EPOCROOT}epoc32\data\BuildInfo.txt -# file to find out information regarding the current Emulator. -# Depends on the current working directory providing -# the drive of the currently used SDK. -# -# - -use Cwd; - -# -# Check the argument(s), if any. -# -$numArgs = $#ARGV + 1; - -if($numArgs == 0) - { - &launchEmulator("udeb","winscw"); - exit(0); - } - -if($numArgs > 2) - { - &printHelp; - die "ERROR: Too many arguments.\n"; - } - -if($numArgs == 1) - { - if(lc($ARGV[0]) eq "-rel") - { - &launchEmulator("urel","winscw"); - exit(0); - } - - if (lc($ARGV[0]) eq "-version") - { - &printVersion; - exit(0); - } - - if(lc($ARGV[0]) eq "-wins") - { - &launchEmulator("udeb", "wins"); - exit(0); - } - - if(lc($ARGV[0]) eq "-winscw") - { - &launchEmulator("udeb", "winscw"); - exit(0); - } - - if(lc($ARGV[0]) eq "-help") - { - &printHelp; - exit(0); - } - } - -if ($numArgs == 2) - { - if(lc($ARGV[0]) eq "-rel") - { - if (lc($ARGV[1]) eq "-wins") - { - &launchEmulator("urel","wins"); - exit(0); - } - - if (lc($ARGV[1]) eq "-winscw") - { - &launchEmulator("urel","winscw"); - exit(0); - } - } - - if (lc($ARGV[0]) eq "-winscw") - { - if (lc($ARGV[1] eq "-rel")) - { - &launchEmulator("urel","winscw"); - exit(0); - } - } - - if (lc($ARGV[0]) eq "-wins") - { - if (lc($ARGV[1] eq "-rel")) - { - &launchEmulator("urel","wins"); - exit(0); - } - } - } - -# Error, unknown argument. -&printHelp; -die "ERROR: Unknown argument " . "\"" . $ARGV[0] . "\".\n"; - -sub launchEmulator -{ - my ($type,$win) = @_; - - my $epocroot = &getEpocroot; - my $drive = &getDrive; - my $emu = $drive . $epocroot . "epoc32" . "\\" - . "release\\" . $win . "\\" . $type . "\\" . "epoc.exe"; - -e $emu || - die "ERROR: File \"$emu\" not found.\n\n" . - "The EPOCROOT environment variable does not identify\n" . - "a valid Symbian emulator installation on this drive.\n" . - "EPOCROOT must be an absolute path to an existing\n" . - "directory - it should have no drive qualifier and\n" . - "must end with a backslash.\n"; - # If the execute is successful, this never returns. - exec("\"" . $emu . "\"") || die "Failed to execute the emulator \"$emu\": $!"; -} - -sub printHelp -{ - print "Symbian Platform Emulator Launcher\n"; - print "Syntax :\tepoc [-rel] [-wins|-winscw] [-version] [-help]\n"; - print "(no options)\tLaunch active winscw debug emulator\n"; - print "-rel\t\tLaunch active release emulator\n"; - print "-wins\t\tLaunch active wins emulator\n"; - print "-winscw\t\tLaunch active winscw emulator\n"; - print "-version\tDisplay active emulator details\n"; - print "-help\tOutput this help message\n"; -} - -sub printVersion -{ - my $epocroot = &getEpocroot; - my $drive = &getDrive; - - my $binfo = $drive . $epocroot . "epoc32" . "\\" - . "data" . "\\" . "BuildInfo.txt"; - - -e $binfo || die "ERROR: File \"" . $binfo . "\" does not exist.\n"; - open(IFILE, $binfo) || - die "ERROR: Failed to open file \"" . $binfo . "\": $!"; - - my $DeviceFamily = ""; - my $DeviceFamilyRev = ""; - my $ManufacturerSoftwareRev = ""; - my $ManufacturerSoftwareBuild = ""; - - while() { - if(/DeviceFamily\s+(.*\S)\s*$/i) { - $DeviceFamily = $1; - } - if(/DeviceFamilyRev\s+(.*\S)\s*$/i) { - $DeviceFamilyRev = $1; - } - if(/ManufacturerSoftwareRev\s+(.*\S)\s*$/i) { - $ManufacturerSoftwareRev = $1; - } - if(/ManufacturerSoftwareBuild\s+(.*\S)\s*$/i) { - $ManufacturerSoftwareBuild = $1; - } - } - - close(IFILE); - - # - # Verify that we got everything we should have. - # - $DeviceFamily ne "" || - die "ERROR: Device family not specified in file \"" . $binfo . - "\".\n"; - $DeviceFamilyRev ne "" || - die "ERROR: Device family revision not specified in file \"" . $binfo . - "\".\n"; - $ManufacturerSoftwareBuild ne "" || - die "ERROR: Manufacturer software build not specified in file \"" . - $binfo . "\".\n"; - - $Revision = (($ManufacturerSoftwareRev eq "")?($DeviceFamilyRev): - ($ManufacturerSoftwareRev)); - - $DeviceFamily = getDFRDName($DeviceFamily); - - # - # Make the standard revision representation prettier, - # but leave other representations untouched. - # - if($Revision =~ /^0x([0-9])([0-9][0-9])$/) { - $Revision = $1 . "." . $2; - } - - print $DeviceFamily . " " . - "version " . $Revision . " " . - "build " . $ManufacturerSoftwareBuild . "\n"; -} - -# -# Determines, validates, and returns EPOCROOT. -# -sub getEpocroot -{ - my $epocroot = $ENV{EPOCROOT}; - die "ERROR: Must set the EPOCROOT environment variable.\n" - if (!defined($epocroot)); - $epocroot =~ s-/-\\-go; # for those working with UNIX shells - die "ERROR: EPOCROOT must be an absolute path, " . - "not containing a drive letter.\n" if ($epocroot !~ /^\\/); - die "ERROR: EPOCROOT must not be a UNC path.\n" if ($epocroot =~ /^\\\\/); - die "ERROR: EPOCROOT must end with a backslash.\n" if ($epocroot !~ /\\$/); - die "ERROR: EPOCROOT must specify an existing directory.\n" - if (!-d $epocroot); - return $epocroot; -} - -# -# Determines and returns the current drive, if any. -# -sub getDrive -{ - my $wd = cwd; - my $drive; - if($wd =~ /^([a-zA-Z]:)/) { - $drive = $1; - } else { - # Perhaps we're on a machine that has no drives. - $drive = ""; - } - return $drive; -} - -# -# The DFRD may be represented by a numeric value, as defined by HAL. -# Changes known numeric values to the name of the DFRD, -# and leaves all other values untouched. -# -sub getDFRDName -{ - my $dfrd = shift; - return "Crystal" if $dfrd eq "0"; - return "Pearl" if $dfrd eq "1"; - return "Quartz" if $dfrd eq "2"; - return $dfrd; # as fallback -} diff -r a3b39a14147a -r fb8810d63524 deprecated/buildtools/emulatorlauncher/perl/eshell.bat --- a/deprecated/buildtools/emulatorlauncher/perl/eshell.bat Thu Oct 28 11:18:50 2010 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -@echo off - -rem Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies). -rem All rights reserved. -rem This component and the accompanying materials are made available -rem under the terms of "Eclipse Public License v1.0" -rem which accompanies this distribution, and is available -rem at the URL "http://www.eclipse.org/legal/epl-v10.html". -rem -rem Initial Contributors: -rem Nokia Corporation - initial contribution. -rem -rem Contributors: -rem -rem Description: -rem Eshell Launcher -rem -rem - -perl -S eshell.pl %1 %2 diff -r a3b39a14147a -r fb8810d63524 deprecated/buildtools/emulatorlauncher/perl/eshell.pl --- a/deprecated/buildtools/emulatorlauncher/perl/eshell.pl Thu Oct 28 11:18:50 2010 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,170 +0,0 @@ -# Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies). -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of "Eclipse Public License v1.0" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# Eshell Launcher -# Depends on the current working directory providing -# the drive of the currently used SDK. -# -# - -use Cwd; - -# -# Check the argument(s), if any. -# -$numArgs = $#ARGV + 1; - -if($numArgs == 0) - { - &launchEshell("udeb","winscw"); - exit(0); - } - -if($numArgs > 2) - { - &printHelp; - die "ERROR: Too many arguments.\n"; - } - -if($numArgs == 1) - { - if(lc($ARGV[0]) eq "-rel") - { - &launchEshell("urel","winscw"); - exit(0); - } - - if(lc($ARGV[0]) eq "-wins") - { - &launchEshell("udeb", "wins"); - exit(0); - } - - if(lc($ARGV[0]) eq "-winscw") - { - &launchEshell("udeb", "winscw"); - exit(0); - } - - if(lc($ARGV[0]) eq "-help") - { - &printHelp; - exit(0); - } - } - -if ($numArgs == 2) - { - if(lc($ARGV[0]) eq "-rel") - { - if (lc($ARGV[1]) eq "-wins") - { - &launchEshell("urel","wins"); - exit(0); - } - - if (lc($ARGV[1]) eq "-winscw") - { - &launchEshell("urel","winscw"); - exit(0); - } - } - - if (lc($ARGV[0]) eq "-winscw") - { - if (lc($ARGV[1] eq "-rel")) - { - &launchEshell("urel","winscw"); - exit(0); - } - } - - if (lc($ARGV[0]) eq "-wins") - { - if (lc($ARGV[1] eq "-rel")) - { - &launchEshell("urel","wins"); - exit(0); - } - } - } - -# Error, unknown argument. -&printHelp; -die "ERROR: Unknown argument " . "\"" . $ARGV[0] . "\".\n"; - -sub launchEshell -{ - my ($type,$win) = @_; - $epocroot = &getEpocroot; - $drive = &getDrive; - $emu = $drive . $epocroot . "epoc32" . "\\" - . "release\\" . $win . "\\" . $type . "\\" . "eshell.exe"; - -e $emu || - die "ERROR: File \"$emu\" not found.\n\n" . - "The EPOCROOT environment variable does not identify\n" . - "a valid eshell installation on this drive.\n" . - "EPOCROOT must be an absolute path to an existing\n" . - "directory - it should have no drive qualifier and\n" . - "must end with a backslash.\n"; - - #add the stuff to use the console - $emu.=" -MConsole --"; - - # If the execute is successful, this never returns. - exec($emu) || die "Failed to execute eshell \"$emu\": $!"; -} - -sub printHelp -{ - print "Eshell Launcher\n"; - print "Syntax :\teshell [-rel] [-wins|-winscw] [-help]\n"; - print "(no options)\tLaunch active winscw debug eshell\n"; - print "-rel\t\tLaunch active release eshell\n"; - print "-wins\t\tLaunch active wins eshell\n"; - print "-winscw\t\tLaunch active winscw eshell\n"; - print "-help\t\tOutput this help message\n"; -} - -# -# Determines, validates, and returns EPOCROOT. -# -sub getEpocroot -{ - my $epocroot = $ENV{EPOCROOT}; - die "ERROR: Must set the EPOCROOT environment variable.\n" - if (!defined($epocroot)); - $epocroot =~ s-/-\\-go; # for those working with UNIX shells - die "ERROR: EPOCROOT must be an absolute path, " . - "not containing a drive letter.\n" if ($epocroot !~ /^\\/); - die "ERROR: EPOCROOT must not be a UNC path.\n" if ($epocroot =~ /^\\\\/); - die "ERROR: EPOCROOT must end with a backslash.\n" if ($epocroot !~ /\\$/); - die "ERROR: EPOCROOT must specify an existing directory.\n" - if (!-d $epocroot); - return $epocroot; -} - -# -# Determines and returns the current drive, if any. -# -sub getDrive -{ - my $wd = cwd; - if($wd =~ /^([a-zA-Z]:)/) { - $drive = $1; - } else { - # Perhaps we're on a machine that has no drives. - $drive = ""; - } - return $drive; -} diff -r a3b39a14147a -r fb8810d63524 deprecated/buildtools/emulatorlauncher/src/RunPerl.cpp --- a/deprecated/buildtools/emulatorlauncher/src/RunPerl.cpp Thu Oct 28 11:18:50 2010 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ -// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies). -// All rights reserved. -// This component and the accompanying materials are made available -// under the terms of "Eclipse Public License v1.0" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// RunPerl.cpp : Defines the entry point for the console application. -// -// - - -#include -#include - -void main(int argc, char* argv[]) - { - - char** args = new char*[argc+3]; - int index = 0; - - char* p = argv[0]; - int pl = strlen(p); - if((pl >= 4) && - (*(p+pl-4)=='.') && - (*(p+pl-3)=='e' || *(p+pl-3)=='E') && - (*(p+pl-2)=='x' || *(p+pl-2)=='X') && - (*(p+pl-1)=='e' || *(p+pl-1)=='E')) - *(p+pl-4)='\0'; - char* cmd = new char[strlen(p)+4]; - strcpy(cmd,p); - strcat(cmd,".pl"); - - args[index++] = "perl"; - args[index++] = "-S"; - args[index++] = cmd; - - for(int i=1; i