Commits

Ville Suoranta authored 7663ffa9440 Merge
Merge pull request #136 in CASA/casa-pkg from CAS-13117 to casa6-master

* commit '84d22da11777ad527298a3c419188cdc0b3fd353': Remove data checkout from Casa6 make-app
No tags

packaging/scripts/make-app

Modified
1125 1125 # Checkout casadata
1126 1126 if ($osname eq "darwin") {
1127 1127 $casadata="/Contents/Resources/casa-data";
1128 1128 }
1129 1129 else {
1130 1130 $casadata="/data";
1131 1131 }
1132 1132 unlink "$output_dir/$output_target/$casadata";
1133 1133
1134 1134 # Clone data
1135 - my $checkout_casadata = "git clone --no-checkout $data_url $output_target/$casadata && cd $output_target/$casadata && git show HEAD:distro | bash && rm -rf .git".' |';
1136 -
1137 - my $limit = 3;
1138 - my @output = ( );
1139 - open(my $output, $checkout_casadata ) or die $!;
1140 - while(my $line=<$output>){
1141 - unless ( $quiet ) {
1142 - if ( scalar(@output) < $limit ) { print "\t<git> $line" }
1143 - push( @output, $line );
1144 - if ( scalar(@output) > $limit ) { shift(@output) }
1145 - }
1146 - }
1147 - unless ( $quiet ) {
1148 - print "\t<git> ...\n";
1149 - foreach ( @output ) {
1150 - print "\t<git> $_";
1151 - }
1152 - }
1153 - close($output);
1135 + #my $checkout_casadata = "git clone --no-checkout $data_url $output_target/$casadata && cd $output_target/$casadata && git show HEAD:distro | bash && rm -rf .git".' |';
1136 +
1137 +
1138 + #my $limit = 3;
1139 + #my @output = ( );
1140 + #open(my $output, $checkout_casadata ) or die $!;
1141 + #while(my $line=<$output>){
1142 + # unless ( $quiet ) {
1143 + # if ( scalar(@output) < $limit ) { print "\t<git> $line" }
1144 + # push( @output, $line );
1145 + # if ( scalar(@output) > $limit ) { shift(@output) }
1146 + # }
1147 + #}
1148 + #unless ( $quiet ) {
1149 + # print "\t<git> ...\n";
1150 + # foreach ( @output ) {
1151 + # print "\t<git> $_";
1152 + # }
1153 + #}
1154 + #close($output);
1154 1155 chdir( $orig_dir );
1155 1156 }
1156 1157
1157 1158
1158 1159 sub relative_path {
1159 1160 my $from = shift(@_);
1160 1161 my $to = shift(@_);
1161 1162 if ( $from eq $to ) { return "." }
1162 1163 my $from_is_dir = -d $from;
1163 1164 my $common = common_prefix( { $from => 1, $to => 1 } );

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut