Changeset 26276 for gs2-extensions/music-ir-src/trunk/perllib/plugins/jAudioExtractor.pm

Timestamp:

2012-10-02T05:43:31+13:00 (12 years ago)

Author:

davidb

Message:

Some mods that resulted from testing under Cygwin

File:

• gs2-extensions/music-ir-src/trunk/perllib/plugins/jAudioExtractor.pm (modified) (3 diffs)

gs2-extensions/music-ir-src/trunk/perllib/plugins/jAudioExtractor.pm

@@ -102 +102 @@
     my $music_ir_home = $ENV{'GEXT_MUSICIR'};
 
-    $self->{'ace_xml_output_directory'} = &util::filename_cat($gsdl_home,"tmp"); # Set the directory to save the the ACE XML output files in
+    my $ace_xml_output_directory = &util::filename_cat($gsdl_home,"tmp"); # Set the directory to save the the ACE XML output files in
+    if (!util::dir_exists($ace_xml_output_directory)) {
+    util::mk_dir($ace_xml_output_directory);
+    }
+    $self->{'ace_xml_output_directory'} = $ace_xml_output_directory;
+
     $self->{'jmir_directory'} = &util::filename_cat($music_ir_home,"lib","java"); # Set the directory holding the jMIR .jar files
+
 
 
@@ -137 +143 @@
 
     # Set the input file name in the file tag in the temporary file
+    if ($^O eq "cygwin") {
+    $input_music_file_path = `cygpath -m "$input_music_file_path"`;
+    $input_music_file_path=~ s/\s+$//;
+    }
     $batch_file_contents =~ s/<file><\/file>/<file>$input_music_file_path<\/file>/;
 
     # Set the feature vales save path in the temporary file
+    if ($^O eq "cygwin") {
+    $feature_descriptions_file_path = `cygpath -m "$feature_descriptions_file_path"`;
+    $feature_descriptions_file_path=~ s/\s+$//;
+    }
+
     $batch_file_contents =~ s/<destination><\/destination>/<destination>$feature_descriptions_file_path<\/destination>/;
 
     # Set the feature vales save path in the temporary file
+    if ($^O eq "cygwin") {
+    $feature_values_file_path = `cygpath -m "$feature_values_file_path"`;
+    $feature_values_file_path=~ s/\s+$//;
+    }
     $batch_file_contents =~ s/<destination><\/destination>/<destination>$feature_values_file_path<\/destination>/;
 
@@ -228 +247 @@
     
     # Input and Output files to use are stored in the batch_file
-    my $jaudio_cmd = "java -Xmx1024M -jar jAudio.jar $convert_options -b \"$batch_file_path\"";
+    my $batch_file_path_os = $batch_file_path;
+
+    if ($^O eq "cygwin") {
+        $batch_file_path_os = `cygpath -w "$batch_file_path"`;
+        $batch_file_path_os =~ s/\s+$//;
+    }
+
+    my $jaudio_cmd = "java -Xmx1024M -jar jAudio.jar $convert_options -b \"$batch_file_path_os\"";
         
     # Test the execution path