FCL/sf/os/ossrv: comparison glib/tsrc/genatsmodules.bat

equal deleted inserted replaced

-:e4d67989cc36
+:47c74d1534e1
 	session files.
 EOHelp
 		exit();
 }
 my $do_armv5 = 1;
-my $do_winscw = 1;
+my $do_winscw = 0;
 if(scalar @ARGV == 1)
 {
 	if($ARGV[0] eq "session")
 	{
 	 if(rindex($templateRoot, "stdlibs") != -1)
 	 {
 	 	$srcPrefix =~ /(.*)stdlibs.*/;
 	 	$srcPrefix = $1;
-	 	if($suite eq "glib")
+	 	if($suite eq "glib-2.20.4")
 	 	{
-	 		$templateRoot = $srcPrefix."/glib/tsrc/";
+	 		$templateRoot = $srcPrefix."/glib-2.20.4/";
 	 	}
 	 	elsif($suite eq "ssl")
 	 	{
 	 		$templateRoot = $srcPrefix."/ssl/tsrc/";
 	 	}
 	 		print "ngi atsinput creation not supported from mobileruntime\n";
 	 		exit();
 	 	}
 	 }
-	if(rindex($templateRoot, "glib") != -1)
+	if(rindex($templateRoot, "glib-2.20.4") != -1)
 	{
-		$suite = "glib";
+		$suite = "glib-2.20.4";
 	}
 	elsif(rindex($templateRoot, "ssl") != -1)
 	{
 		$suite = "ssl";
 	}
 				 ["ostream_seeks-1.tst","ostream_seeks", "/../internal/testapps/gnu/io/doc/", "/General/", "C:\\TestFramework\\gnu"],
 				 ["infile_auto.txt","multi_thread_auto", "/../internal/testapps/doc/", "/General/", "C:\\TestFramework\\tstdcpp"],
 );
 my @gliblist = (
-				 ["1.gmarkup", "markup_test", "/epoc32/winscw/c/", "/General/", "C:"],
+				 ["valid-1.gmarkup", "markup_test", "/epoc32/winscw/c/", "/General/", "C:"],
-				 ["1.gmarkup", "markup-test", "/epoc32/winscw/c/", "/General/", "C:"],
+				 ["valid-01.xbel", "bookmarkfile_test", "/epoc32/winscw/c/", "/General/", "C:"],
 				 ["iochannel-test-infile", "iochannel_test",  "/epoc32/winscw/c/", "/General/", "C:"],
-				 ["iochannel-test-infile", "iochannel-test",  "/epoc32/winscw/c/", "/General/", "C:"],
+				 ["casemap.txt",  "unicode_caseconv",  "/epoc32/winscw/c/", "/General/", "C:"],
-#  				 ["casemap.bin",  "unicode-caseconv",  "/epoc32/winscw/c/", "/General/", "C:"],
+				 ["casefold.txt", "unicode_caseconv",  "/epoc32/winscw/c/", "/General/", "C:"],
-#  				 ["casefold.bin", "unicode-caseconv",  "/epoc32/winscw/c/", "/General/", "C:"],
+				 ["utf8.txt", "unicode_encoding","/epoc32/winscw/c/", "/General/", "C:"],
-				 ["utf8.txt", "unicode-encoding","/epoc32/winscw/c/", "/General/", "C:"],
+				 ["collate-1.unicode", "unicode_collate","/epoc32/winscw/c/", "/General/", "C:"],
-				 ["casecollate.txt", "unicode-collate","/epoc32/winscw/c/", "/General/", "C:"],
+				 ["NormalizationTest.txt", "unicode_normalize","/epoc32/winscw/c/", "/General/", "C:"],
-				 ["utf8_hindi.txt", "tutf8","/epoc32/winscw/c/", "/General/", "C:"],
+				 ["4096-random-bytes", "strfuncs", "/epoc32/winscw/c/", "/General/", "C:"],
-				 ["scanfile.txt", "tscanner","/epoc32/winscw/c/", "/General/", "C:"],
-				 ["test.txt", "dir_test","/epoc32/winscw/c/temp/tmp/", "/General/", "C:\\temp\\tmp"],
-				 ["NormalizationTest.txt", "unicode-normalize","/epoc32/winscw/c/", "/General/", "C:"],
 				 ["helloworld.exe", "spawn_test","/epoc32/release/armv5/urel/", "/armv5_urel/", "C:\\sys\\bin"],
 				 ["helloworld.exe", "spawn_test","/epoc32/release/winscw/udeb/", "/winscw_udeb/", "Z:\\sys\\bin"],
-				 ["libmoduletestplugin_a.dll", "module-test","/epoc32/release/armv5/urel/", "/armv5_urel/", "C:\\sys\\bin"],
+				 ["libmoduletestplugin_a.dll", "module_test","/epoc32/release/armv5/urel/", "/armv5_urel/", "C:\\sys\\bin"],
-				 ["libmoduletestplugin_a.dll", "module-test","/epoc32/release/winscw/udeb/", "/winscw_udeb/", "Z:\\sys\\bin"],
+				 ["libmoduletestplugin_a.dll", "module_test","/epoc32/release/winscw/udeb/", "/winscw_udeb/", "Z:\\sys\\bin"],
-				 ["libmoduletestplugin_b.dll", "module-test","/epoc32/release/armv5/urel/", "/armv5_urel/", "C:\\sys\\bin"],
+				 ["libmoduletestplugin_b.dll", "module_test","/epoc32/release/armv5/urel/", "/armv5_urel/", "C:\\sys\\bin"],
-				 ["libmoduletestplugin_b.dll", "module-test","/epoc32/release/winscw/udeb/", "/winscw_udeb/", "Z:\\sys\\bin"],
+				 ["libmoduletestplugin_b.dll", "module_test","/epoc32/release/winscw/udeb/", "/winscw_udeb/", "Z:\\sys\\bin"],
 				 );
 my @ngilist = (
 my $validexpansions = "all stdlibs combined";
-my $validLibraries = "ltp opts lsb glib ssl ngi pcts stdcpp gcce libc-locale play_new";
+my $validLibraries = "ltp opts lsb glib-2.20.4 ssl ngi pcts stdcpp gcce libc-locale play_new";
 if(rindex($validexpansions, $suite)== -1 && rindex($validLibraries, $suite) == -1)
 {
 	die("$suite is not a valid library. Valid options are $validexpansions $validLibraries");
 }
 	@generatedModules = GetCompiledModules($optsGroupPath."/bld.inf");
 	DoGen("opts",".dll");
 }
-if ($suite eq "glib")
+if ($suite eq "glib-2.20.4")
 {
-	my $bldfile = $templateRoot."/glib_nonstif/group/bld.inf";
+	my $bldfile = $templateRoot."/group/bld.inf";
+	my $fileName = $templateRoot;
+	#chopn("$fileName", 5);
+	chop($fileName);
+	chop($fileName);
+	chop($fileName);
+	chop($fileName);
+	chop($fileName);
+	$bldfile = $fileName."/build/symbian/tests/group/bld.inf";
+	print "bldfile: $bldfile\n";
 	my @glibModules = GetCompiledModules($bldfile);
+	#mahesh
+	print "glibModules: @glibModules\n";
 	@generatedModules = @glibModules;
-	DoGen("glib",".exe");
+	$bldfile = $fileName."/build/symbian/tests/gobject/group/bld.inf";
+	print "bldfile: $bldfile\n";
+	my @glibModules = GetCompiledModules($bldfile);
+	#mahesh
+	print "glibModules: @glibModules\n";
+	my $i =0;
+	foreach my $name(@glibModules){
+		@glibModules[$i] =~ s/ //;
+		$i = $i + 1;
+	}
+	push(@generatedModules, @glibModules);
+	$bldfile = $fileName."/build/symbian/tests/refcount/group/bld.inf";
+	print "bldfile: $bldfile\n";
+	my @glibModules = GetCompiledModules($bldfile);
+	#mahesh
+	print "glibModules: @glibModules\n";
+	my $i =0;
+	foreach my $name(@glibModules){
+		@glibModules[$i] =~ s/ //;
+		$i = $i + 1;
+	}
+	push(@generatedModules, @glibModules);
+	$bldfile = $fileName."/build/symbian/glib/tests/group/bld.inf";
+	print "bldfile: $bldfile\n";
+	my @glibModules = GetCompiledModules($bldfile);
+	#mahesh
+	print "glibModules: @glibModules\n";
+	my $i =0;
+	foreach my $name(@glibModules){
+		@glibModules[$i] =~ s/ //;
+		$i = $i + 1;
+	}
+	push(@generatedModules, @glibModules);
+	$bldfile = $fileName."/build/symbian/gobject/tests/group/bld.inf";
+	print "bldfile: $bldfile\n";
+	my @glibModules = GetCompiledModules($bldfile);
+	#mahesh
+	print "glibModules: @glibModules\n";
+	my $i =0;
+	foreach my $name(@glibModules){
+		@glibModules[$i] =~ s/ //;
+		$i = $i + 1;
+	}
+	push(@generatedModules, @glibModules);
+	DoGen("glib-2.20.4",".exe");
 	my $gDataRef = \@gliblist;
-	CopyArbitDatFiles("glib",$gDataRef);
+	CopyArbitDatFiles("glib-2.20.4",$gDataRef);
 	if($install eq "yes")
 	{
 		my @saved = @dllList;
 		my @glib2dllList = ("glibbackend.dll", "Libgobject.dll", "libgmodule.dll", "libgthread.dll",
 "libglib.dll");
 my  @glib1List = ( "libgobject.dll", "libgmodule.dll", "libgthread.dll",  "libglib.dll", );
 @dllList = @glib2dllList;
-CopySharedDlls("glib",\@dllList);
+CopySharedDlls("glib-2.20.4",\@dllList);
-TransformXmls("glib", "shared");
+TransformXmls("glib-2.20.4", "shared");
 		@dllList = @saved;
 	}#if install
-}#glib
+}#glib-2.20.4
 if ($suite eq "ssl")
 {
 	my $stripStatus = $dontStrip;
 	#copy the provided cfg, ini and xmls
 	if($libname eq "opts")
 	{
 		CopyOptsCfg($libname);
 	}
-	elsif($libname eq "ltp" || $libname eq "lsb" || $libname eq "glib")
+	elsif($libname eq "ltp" || $libname eq "lsb" || $libname eq "glib-2.20.4")
 	{
 	  #copy latter and  dont copy respectively for ltp and lsb
 	}
 	else
 	{
 		}
 }#ref processing
 }#fn
-#glib dat file copy
+#glib-2.20.4 dat file copy
 sub CopyArbitDatFiles($$)
 {
 	 my $libname = shift @_;
 	 my $refArr = shift @_;
 		{
 			die("DIED: no Dat file  $src found to copy!");
 		}
 		foreach my $file(@filesFound)
 		{
-			copy($file, $dst) || die("DIED: unable to copy $file to $dst");
+			copy($file, $dst) || warn("DIED: unable to copy $file to $dst");
 		}
 		if($targetDst ne "")
 		{
 			 		my @filesToChange = ();

changeset 18	47c74d1534e1
parent 0	e4d67989cc36
child 45	4b03adbd26ca
child 71	28ccaba883f4