FCL/sftools/dev/build: comparison buildframework/helium/tools/preparation/getenv.pl

equal deleted inserted replaced

-:be27ed110b50
+:d8ac696cc51f
 else {
 return $tmpParam."/";
 }
 }
-# Make sure paths are as windows likes 'em
-# change '/' ==> '\\' and make sure last char is \\
-sub UnFixPaths {
-my $tmpParam = shift;
-$tmpParam =~ s/\//\\/g;
-if( substr( $tmpParam, -1 ) eq "\\" ) {
-return $tmpParam;
-}
-else {
-return $tmpParam."\\";
-}
-}
 # smarter handling of logging
 sub printLog {
 foreach my $trace ( @_ ) {
 if( $param_debug ) {
 # we should print traces for STDOUT as well
 print "Unable to access $wantedServer\nPlease select another network share.\n";
 }
 }
 my $wantedService = $serviceList[ ReturnMenuIndex( "Please select GRACE Service.", @serviceNameList)];
 printLog( "selected: $wantedServer.$wantedService - accessing.." );
-		local *GRACETEST2;
+local *GRACETEST2;
 if( opendir( GRACETEST2, $wantedServer.$wantedService ) ) {
 printLog( "serviceconnection tested OK" );
 $defaultServiceName = $wantedService
 }
 else {
 # parse dl directory into $releaseDirectory
 $releaseLocationInServer = $data->{releaseDetails}->{releaseID}->{service}->{name} . "/";
 $releaseLocationInServer .= $data->{releaseDetails}->{releaseID}->{product}->{name} ."/";
 $releaseLocationInServer .= $data->{releaseDetails}->{releaseID}->{release}->{name} ."/";
-	local *DEPTEST;
+local *DEPTEST;
 # check if we can find this release from GRACE
 if( $graceServer ) {
 if( -e $graceServer.$releaseLocationInServer."grace.txt" ) {
 printLog( "dl dir: $graceServer$releaseLocationInServer" );
 # param: xml data handle
 sub GeneratePackageHash {
 my( $xmlDataHandle, $releaseInServer )  = @_;
 my $finalState = 0;
 printLog( "parse filenames to extract to packageHah" );
+no strict 'refs';
+# Incase if we have only one package in the release to extract, then in the case
+# the Xml::Simple::XMLin is not creating keys inside $xmlDataHandle->{releaseFiles}->{package}
+# with package names. So to address it, the below part of code is done..
+####
+if(exists $xmlDataHandle->{releaseFiles}->{package}->{name}){
+my $pkgName = $xmlDataHandle->{releaseFiles}->{package}->{name};
+my $tmphash = $xmlDataHandle->{releaseFiles}->{package};
+delete $tmphash->{name} ;
+delete $xmlDataHandle->{releaseFiles}->{package};
+$xmlDataHandle->{releaseFiles}->{package}->{$pkgName} = $tmphash;
+}
+#####
 # generate new hash of zips to DL for %packageHash
 # foreach my $key( sort { $xmlDataHandle{a}->{'state'} <=> $xmlDataHandle{b}->{'state'} } %{$xmlDataHandle->{releaseFiles}->{'package'} } ){
 foreach my $key( keys(%{$xmlDataHandle->{releaseFiles}->{package} } ) ) {
 printLog( "adding $key to packageHash" );
 ${packageHash}{$key}{path} = FixPaths( $releaseInServer );
 my $dependsOfServiceToRemove = FixPaths( $currentReleaseXmlHandle->{releaseDetails}->{dependsOf}->{service}->{name} );
 my $dependsOfProductToRemove = FixPaths( $currentReleaseXmlHandle->{releaseDetails}->{dependsOf}->{product}->{name} );
 my $dependsOfReleaseToRemove = FixPaths( $currentReleaseXmlHandle->{releaseDetails}->{dependsOf}->{release}->{name} );
 my $dependsOf = $dependsOfServiceToRemove.$dependsOfProductToRemove.$dependsOfReleaseToRemove;
-		local *TMPTEST;
+local *TMPTEST;
 # find out where the release came from
 if( $param_release_path ) {
 # best guess is $param_release_path\..\..\..\$dependsOf even though it is not very common situation
 my $dependencyPath = FixPaths( $param_release_path ) . "../../../" . FixPaths( $dependsOf );
 foreach my $finalZip( @finalZipList ) {
 # path contains ../../../ so wont match ==>
 #               if( $finalZip->{filename} eq $zips and
 #                       $finalZip->{path} eq %packageHash->{$zips}->{'path'} ) {
 if( $finalZip->{filename} eq $zips ) {
-printLog( "removing $finalZip->{path} $finalZip->{filename} from dl list" );
+printLog( "removing $finalZip->{path}/$finalZip->{filename} from dl list" );
 $finalZip->{default} = "false";
 }
 }
 }
 }
 }
 elsif( $file->{extract} eq 'double' ) {
 # unzip double zipped zips to $tmpDlDir
 # there shouldnt be much of these anymore
 printLog( "parent: double zipped - unzip to $tmpDlDir" );
-my $extrCmd = "7za x -y \"";
+my $extrCmd = q{7za x -y "};
 $extrCmd .= $file->{path} . $file->{filename};
-$extrCmd .= "\" -o" . $tmpDlDir;
+$extrCmd .= q{" -o} . $tmpDlDir;
-$extrCmd .= " > NUL";
+if ( $^O =~ /linux/i){
+$extrCmd .= " > /dev/null";
+}else{
+$extrCmd .= " > NUL";
+}
 print "system: $extrCmd\n" if( $param_print_only );
 printLog( "parent: system: $extrCmd" );;
 system( $extrCmd ) if( !$param_print_only );
 if( $? ) {
 printLog( "Problem processing $file->{path} $file->{filename}: $?" );;
 next if $file =~ /^\.[\.]?$/;
 $somethingToCopy = 1;
 }
 if( $somethingToCopy ) {
-printLog( "move everything from $tmpDlDir to $tmpDir > NUL" );
+printLog( "move everything from $tmpDlDir to $tmpDir" );
-my $moveCmd = "move $tmpDlDir\\*.* $tmpDir > NUL";
+opendir( DLTEMP , $tmpDlDir );
-printLog( "running moveCmd: $moveCmd" );
+for (grep( !/^\.\.?$/, readdir(DLTEMP))){
-system( $moveCmd ) if( !$param_print_only );
+move("$tmpDlDir/$_", $tmpDir) or die("$tmpDlDir/$_ move failed :$!");
-#       move( "$tmpDlDir/*.*", "$tmpDir" ) or die( "move failed: $!" );
+}
+closedir( DLTEMP );
 }
 if( $returnValue == 0 ) {
 print "done\n";
 printLog( "done" );
 printLog( "done, but errors occured" );
 }
 }
 # current forking mechanism is leaving last package(s) to $tmpDir
-UnzipFromTempToEnv( );
+opendir(TEMPDIR,  $tmpDir);
+UnzipFromTempToEnv() if(scalar(grep( !/^\.\.?$/, readdir(TEMPDIR))) > 0);
+closedir(TEMPDIR);
 if( -e FixPaths( getcwd )."currentRelease.xml" ) {
 unlink( FixPaths( getcwd )."currentRelease.xml" ) if( ! $param_print_only );
 }
 # copy the xml into $extractDir\buildData from $serverPath.$serviceName.$metaDataFile
 }
 sub UnzipFromTempToEnv {
 # extract from temp to extractDir
 printLog( "child: unzip from temp" );
-my $finalUnzipCmd = "7za x -y \"".UnFixPaths( $tmpDir )."\\*.zip\" -o\"".UnFixPaths( getcwd )."\"";
+my $finalUnzipCmd = qq{7za x -y "$tmpDir/*.zip" -o"}.getcwd.q{"};
-$finalUnzipCmd .= " > NUL";
+if ( $^O =~ /linux/i){
+$finalUnzipCmd .= " > /dev/null";
+}else{
+$finalUnzipCmd .= " > NUL";
+}
 print "system: $finalUnzipCmd\n" if( $param_print_only );
 printLog( "child: system: $finalUnzipCmd" );
 system( $finalUnzipCmd ) if( !$param_print_only );
 #           if( $? ) {
 #               $returnValue = $?;
 #               HandleZipError( $file->{path} . $file->{filename}, $? );
 #           }
 # empty temp dir
 printLog( "child: empty temp dir" );
-$tmpDir =~ s/\//\\/g;
 printLog( "child: unlink: $tmpDir" );
 # dont handle errors - temp might be empty as well!
 opendir( TEMPDIR, $tmpDir );
 my @zipFiles = grep /zip/, readdir TEMPDIR;

changeset 179	d8ac696cc51f
parent 1	be27ed110b50
child 587	85df38eb4012