Changeset 28471

Timestamp:

2013-10-16T17:58:00+13:00 (11 years ago)

Author:

davidb

Message:

Change to use new java support methods in util.pm to help operation 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

@@ -31 +31 @@
 use Cwd;
 
-use FileUtil;
+use FileUtils;
 
 use strict;
@@ -105 +105 @@
 
     my $ace_xml_output_directory = &util::filename_cat($gsdl_home,"tmp"); # Set the directory to save the the ACE XML output files in
-    if (!FileUtil::directoryExists($ace_xml_output_directory)) {
-    FileUtil::makeDirectory($ace_xml_output_directory);
+    if (!FileUtils::directoryExists($ace_xml_output_directory)) {
+    FileUtils::makeDirectory($ace_xml_output_directory);
     }
     $self->{'ace_xml_output_directory'} = $ace_xml_output_directory;
@@ -251 +251 @@
     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+$//;
-    }
+    $batch_file_path_os = &util::makeFilenameJavaCygwinCompatible($batch_file_path_os);
+#   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\"";