FCL/sftools/dev/build: comparison bintools/elftools/def2dll.pl

equal deleted inserted replaced

-:22486c9c7b15
+:378360dbbdba
 	{
 		$PerlLibPath =~ s/\//\\/g;	# X:\epoc32\tools
 		$PerlLibPath .= "\\";
 	}
 }
+# Version
+my $MajorVersion = 1;
+my $MinorVersion = 1;
+my $PatchVersion = 0;
 use lib $PerlLibPath;
 use Defutl;
 my %opts = ();
 my $floatingpointmodel = "${oP}fpu softvfp";
 my $interworkingp = $opts{"inter"};
 my $interworking = "${oP}apcs /nointer";
 $interworking = "${oP}apcs /inter" if ($interworkingp);
+my $gDelim;
+if ($^O eq "MSWin32") {
+	$gDelim = '\\';
+}
+else {
+	$gDelim = '/';
+}
 my @objectFiles;
 &main;
 my @DefDataStruct;
 # Usage subroutine
 sub usage( )
 {
 print "\n";
-print "DEF2DLL -Creates binary objects used to implement the Symbian OS DLL model\n";
+print "DEF2DLL -Creates binary objects used to implement the Symbian OS DLL model v$MajorVersion.$MinorVersion.$PatchVersion\n";
 print "\n";
 print "Usage: def2dll --deffile=<file> [--path=<dir>] [--bldpath=<dir>] [--import=<file>]  [--linkas=<file>] [--inter] [--export=<file>] [--sym_name_lkup]\n";
 print "\nOptions:\n";
 	print "\t--deffile=<file>   	 	: def file to be converted\n";
 print "\t--bldpath=<direcotry>		: build path for dll\n";
 print "\t--import=<file>			: import from file name\n";
 print "\t--linkas=<file>     		: linkas to file name specified\n";
 print "\t--inter                 	: enables interworking on ARM and THUMB\n";
 print "\t--export=<file>			: export to filename\n";
-print "\t--sym_name_lkup         	: symbol name ordinal number lookupç\n";
+print "\t--sym_name_lkup         	: symbol name ordinal number lookup\n";
 print "\n";
 exit 1;
 }
 my %symbols = ();
 {
 my ($path, $bldpath, $expFile) = @_;
 my $numkeys = keys %symbolIndexMap;
 my $failed = 0;
-open EXPFILE, ">$path\\$expFile.s" or
+open EXPFILE, ">$path$gDelim$expFile.s" or
-		die "Error: can't create $path\\$expFile.s\n";
+		die "Error: can't create $path$gDelim$expFile.s\n";
 print EXPFILE "\tEXPORT __DLL_Export_Table__\n\n";
 print EXPFILE "\tEXPORT |DLL\#\#ExportTable|\n\n";
 print EXPFILE "\tEXPORT |DLL\#\#ExportTableSize|\n\n";
 print EXPFILE "\tAREA ExportTable, CODE\n";
 print EXPFILE "\tDCB  \"EXPORT DLL##ExportTableSize\\n\"\n";
 print EXPFILE "\tEND";
 close EXPFILE;
-$failed = system "armasm $floatingpointmodel $interworking -o $path\\$expFile.exp $path\\$expFile.s";
+$failed = system "armasm $floatingpointmodel $interworking -o $path$gDelim$expFile.exp $path$gDelim$expFile.s";
-unlink ("$path\\$expFile.s") unless $failed;
+unlink ("$path$gDelim$expFile.s") unless $failed;
-die "Error: cant create $path\\$expFile.exp\n" if $failed;
+die "Error: cant create $path$gDelim$expFile.exp\n" if $failed;
 }
 my %DataSymbols = ();
 sub genVtblExportFile($$)
 {
 my ($bldpath, $dllName) = @_;
 my $FileName = "VtblExports";
-open VTBLFILE, ">$bldpath\\$FileName.s" or
+open VTBLFILE, ">$bldpath$gDelim$FileName.s" or
-		die "Error: can't create $bldpath\\$FileName.s\n";
+		die "Error: can't create $bldpath$gDelim$FileName.s\n";
 print VTBLFILE "\tAREA |.directive|, NOALLOC, READONLY, ALIGN=2\n";
 printf VTBLFILE "\tDCB \"\#\<SYMEDIT\>\#\\n\"\n";
 my $symbol;
 }
 #    printf VTBLFILE "\tDCB \"\#\<\\\\VTBLSYMS\>\#\\n\"\n";
 print VTBLFILE "\tEND";
 close VTBLFILE;
-my $failed = system "armasm $floatingpointmodel $interworking -o $bldpath\\$FileName.o $bldpath\\$FileName.s";
+my $failed = system "armasm $floatingpointmodel $interworking -o $bldpath$gDelim$FileName.o $bldpath$gDelim$FileName.s";
-unlink ("$bldpath\\$FileName.s");
+unlink ("$bldpath$gDelim$FileName.s");
-die "Error: cant create $bldpath\\$FileName.o\n" if $failed;
+die "Error: cant create $bldpath$gDelim$FileName.o\n" if $failed;
-push @objectFiles, "$bldpath\\$FileName.o";
+push @objectFiles, "$bldpath$gDelim$FileName.o";
 }
 sub genLibFile ($$$$)
 {
 my ($path, $bldpath, $libFile, $dllName) = @_;
-my $tempFileName = "$bldpath\\$compName";
+my $tempFileName = "$bldpath$gDelim$compName";
-my $viaFileName = sprintf("$bldpath\\_t%x_via_.txt", time);
+my $viaFileName = sprintf("$bldpath${gDelim}_t%x_via_.txt", time);
 my $keyz = keys %symbolIndexMap;
 my $failed = 0;
 my $key;
 if ($keyz > 0) {
-		open STUBGEN, "|$ENV{'EPOCROOT'}/epoc32/tools/genstubs" if $exports;
+		open STUBGEN, "|genstubs" if $exports;
 		foreach $key (sort keys %symbolIndexMap) {
 			my $symbol = $symbolIndexMap{$key};
 			my $stubFileName = "$tempFileName-$key";
 			if ( $symbols{$symbol} eq 'DATA') {
 				$DataSymbols{$symbol} = $key;
 			}
 		}
 		genVtblExportFile($bldpath, $dllName);
 } else {
 		# create dummy stub so armar creates a .lib for us
-		open STUBGEN, "|$ENV{'EPOCROOT'}/epoc32/tools/genstubs";
+		open STUBGEN, "|genstubs";
 		print STUBGEN "$tempFileName-stub.o $tempFileName##stub $dllName##dummy\n";
 		push @objectFiles, "$tempFileName-stub.o";
 }
 close STUBGEN;
 open VIAFILE, ">$viaFileName" or
 		die "Error: can't create VIA fie $viaFileName\n";
-print VIAFILE "${oP}create \"$path\\$libFile\"\n";
+print VIAFILE "${oP}create \"$path$gDelim$libFile\"\n";
 my $objectFile;
 foreach $objectFile (@objectFiles) {
 		print VIAFILE "\"$objectFile\"\n";
 }
 close VIAFILE;
 $failed = system( "armar ${oP}via $viaFileName");
 push @objectFiles, $viaFileName;
 unlink @objectFiles;
-die "Error: can't create $path\\$libFile\n" if $failed;
+die "Error: can't create $path$gDelim$libFile\n" if $failed;
 }
 __END__

changeset 607	378360dbbdba
parent 606	30b30f9da0b7