Changeset 2121

Timestamp:

04/29/07 22:29:16 (2 years ago)

Author:

kmaclean

Message:

Refactoring Mirroring scripts

Files:

• Trunk/Scripts/AcousticModel_scripts/LICENSE (added)
• Trunk/Scripts/Metrics_scripts/archive/metrics.txt (moved) (moved from Trunk/Scripts/Mirroring_scripts/metrics.txt)
• Trunk/Scripts/Mirroring_scripts/RunDaily.pl (modified) (1 diff)
• Trunk/Scripts/Mirroring_scripts/TarFiles.pm (modified) (2 diffs)
• Trunk/Scripts/Mirroring_scripts/TarFiles/Audio.pm (modified) (1 diff)
• Trunk/Scripts/Mirroring_scripts/TarFiles/MakeFiles/Lexicon_makefile (modified) (1 diff)
• Trunk/Scripts/Mirroring_scripts/TarFiles/MakeFiles/Scripts_makefile (modified) (1 diff)
• Trunk/Scripts/Mirroring_scripts/TarFiles/MakeFiles/archive (added)
• Trunk/Scripts/Mirroring_scripts/TarFiles/MakeFiles/archive/Releases_makefile (moved) (moved from Trunk/Scripts/Mirroring_scripts/TarFiles/MakeFiles/Releases_makefile) (1 diff)
• Trunk/Scripts/Mirroring_scripts/TarFiles/NightlyBuild.pm (modified) (1 diff)
• Trunk/Scripts/Mirroring_scripts/VoxForge_config.pm (modified) (3 diffs)
• Trunk/Scripts/temp (deleted)

Trunk/Scripts/Mirroring_scripts/RunDaily.pl

@@ -72 +72 @@
-
-#Nightly_test::Process(\%parms) || die "UserSubmissions error: $?";
-
-
+$parms
+#
-#UserMetrics::Process(\%parms) || die "UserSubmissions error: $?";
-

Trunk/Scripts/Mirroring_scripts/TarFiles.pm

@@ -35 +35 @@
-        my ($parms) = @_;
-        Prepare($parms);
-_a
+A
-        print "make_all completed!\n";  
-        return 1;
@@ -45 +45 @@
-        # makefile for gzipped/tar file creation
-        #$command = ("cp $MakeFiles_dir/NightlyBuilds_sub_makefile $Nightly_dirname"); print "$command\n" if $debug; system($command) == 0 or die "system $command failed: $?";  
+        # Create Tar/Gzip files
+        #$command = ("cd $dir && \./create_AudioMakefiles.pl"); print "$command\n" if $debug; system($command) == 0 or die "system $command failed: $?";  
+        #$command = ("cd $dir && \./create_NightlyBuildMakefiles.pl"); print "$command\n" if $debug; system($command) == 0 or die "system $command failed: $?";  
+
-        TarFiles::NightlyBuild::CopySubdirectoryMakeFile($parms);       
-        # Create Tar/Gzip files
-#       $command = ("cd $dir && \./create_AudioMakefiles.pl"); print "$command\n" if $debug; system($command) == 0 or die "system $command failed: $?";  
-        TarFiles::Audio::Create($parms);
-#       $command = ("cd $dir && \./create_NightlyBuildMakefiles.pl"); print "$command\n" if $debug; system($command) == 0 or die "system $command failed: $?";  
-        TarFiles::NightlyBuild::Create($parms);
-}
-
-_a
+A
-        my ($parms) = @_;
-        my $debug = $$parms{"debug"};
-#       $command = ("cd $dir && \./make_all.pl"); print "$command\n" if $debug; system($command) == 0 or die "system $command failed: $?";  
-
+ 
-        _make($parms,"Scripts_makefile");               
-        _make($parms,"Lexicon_makefile");       
-
-
+
+# created dynamically - see NightlyBuild.pm
-}
-
-sub _make {
-filenam
+makefil
-        my $debug = $$parms{"debug"};
-filenam
-NightlyBuild/$filenam
+makefil
+TarFiles/MakeFiles/$makefil
-}
-1;

Trunk/Scripts/Mirroring_scripts/TarFiles/Audio.pm

@@ -44 +44 @@
-            @line=split(/\s+/, $line);
-                ($AudioDirParms{'source'}, $AudioDirParms{'target'}) = @line;
-source
+AudioDirParms{'source'}
-                @sourcepath=split(/\//, $sourcepath);
-            $AudioDirParms{'audiodir'} = pop (@sourcepath);                     

Trunk/Scripts/Mirroring_scripts/TarFiles/MakeFiles/Lexicon_makefile

@@ -21 +21 @@
-###
-####################################################################
-../..
-
+/data/svn-mirror/SpeechCorpus/Trunk
+SpeechCorpus/
-VPATH = $(SOURCE) $(TARGET)
-

Trunk/Scripts/Mirroring_scripts/TarFiles/MakeFiles/Scripts_makefile

@@ -21 +21 @@
-###
-####################################################################
-../..
-
+/data/svn-mirror/Main/Trunk
+Main/
-VPATH = $(SOURCE) $(TARGET)
-
-HTK.tgz Mirroring_scripts.tgz Audio_scripts.tgz Testing_scripts.tgz Metrics_scripts.tgz AudioBook
+AcousticModel_scripts.tgz Audio_scripts.tgz Metrics_scripts.tgz Mirroring_scripts.tgz Testing
-
-HTK
-acoustic_model_files $(dir)/AMCreate_scripts $(dir)/documentation $(dir)/etc $(dir)/manual_testing
+AcousticModel_scripts
+AcousticModel $(dir)/etc  $(dir)/HTK $(dir)/HTK/acoustic_model_files $(dir)/HTK/AMCreate_scripts $(dir)/HTK/documentation  $(dir)/HTK/manual_testing $(dir)/Prompts $(dir)/Sphinx 
-        cd $(SOURCE) && tar --exclude=.svn -zcvf  $(TARGET)/$@ $(<F)
+        
+dir = Audio_scripts
+$(dir).tgz : $(dir) $(dir)/Repository $(dir)/UserSubmission $(dir)/etc
+        cd $(SOURCE) && tar --exclude=.svn -zcvf  $(TARGET)/$@ $(<F)    
-
+dir = Metrics_scripts
+$(dir).tgz : $(dir) $(dir)/etc
+        cd $(SOURCE) && tar --exclude=.svn -zcvf  $(TARGET)/$@ $(<F)            
+                
-dir = Mirroring_scripts
-$(dir).tgz : $(dir) $(dir)/etc
-        cd $(SOURCE) && tar --exclude=.svn -zcvf  $(TARGET)/$@ $(<F)
-
-dir = Audio_scripts
-$(dir).tgz : $(dir) $(dir)/Repository $(dir)/UserSubmission $(dir)/etc
-        cd $(SOURCE) && tar --exclude=.svn -zcvf  $(TARGET)/$@ $(<F)    
-        
-dir = Testing_scripts
-$(dir).tgz : $(dir) $(dir)/etc
-        cd $(SOURCE) && tar --exclude=.svn -zcvf  $(TARGET)/$@ $(<F)            
-
-dir = Metrics_scripts
-$(dir).tgz : $(dir) $(dir)/etc
-        cd $(SOURCE) && tar --exclude=.svn -zcvf  $(TARGET)/$@ $(<F)            
-        
-dir = AudioBook_scripts
-$(dir).tgz : $(dir) $(dir)/etc
-        cd $(SOURCE) && tar --exclude=.svn -zcvf  $(TARGET)/$@ $(<F)                    

Trunk/Scripts/Mirroring_scripts/TarFiles/MakeFiles/archive/Releases_makefile

@@ -30 +30 @@
-####################################################################
-
-../../..
+/data/svn-mirror/SpeechCorpus
-TARGET = /data/svn-tarfiles/Tags/Releases
-VPATH = $(SOURCE) \

Trunk/Scripts/Mirroring_scripts/TarFiles/NightlyBuild.pm

@@ -61 +61 @@
-        my ($parms,$source, $dirlist) = @_;
-        my $debug = $$parms{"debug"};   
-
+TarFiles/
-        open(FILEOUT, ">$filename"); 
-        print (FILEOUT "VPATH = $source\n");

Trunk/Scripts/Mirroring_scripts/VoxForge_config.pm

@@ -32 +32 @@
-        ####################################################################
-        # Speech Corpus Location
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        if ($parms{"testing"}) {        
-                $parms{"PromptsFile"} = $parms{"_Prompts"}."/test_prompts"; # for testing
@@ -47 +43 @@
-        }
-        ####################################################################
+        # Speech Corpus Releases directory - none yet ...
+        $parms{"Tags"}  = "/data/svn-mirror/SpeechCorpus/Tags";
+                $parms{"Releases"} = $parms{"Tags"}."/Releases";        
+                $parms{"CurrentBuild_dir"} = $parms{"Releases"}."/0_1_1-build726";
+                                $parms{"CurrentAM_16kHz_16bit"} = $parms{"CurrentBuild_dir"}."/AcousticModels/HTK/16kHz-16bit/MFCC_O_D";                                
+                                $parms{"CurrentAM_8kHz_16bit"} = $parms{"CurrentBuild_dir"}."/AcousticModels/HTK/8kHz-16bit/MFCC_O_D";                                  
+        ####################################################################
+        # Nightly build location
+        
+        # Get today's date and create Nightly AM creation sub-directories
+        # see http://search.cpan.org/~gbarr/TimeDate-1.16/lib/Date/Format.pm for time format definitions
+        my $year = strftime "%Y", localtime; #%Y      year (4 digits)
+        my $mon = strftime "%m", localtime; # %m      month number, starting with 01
+        my $mday = strftime "%d", localtime; #  %d      numeric day of the month, with leading zeros (eg 01..31)
+        
+        $parms{"Nightly_dir"}  = "/data/svn-mirror/Nightly_Builds"; 
+                $parms{"Nightly_dirname"} = $parms{"Nightly_dir"}."/AcousticModel-$year-$mon-$mday";    
+                $parms{"NightlyAM_16kHz_16bit"} = $parms{"Nightly_dirname"}."/HTK/16kHz_16bit/MFCC_O_D";                                
+                $parms{"NightlyAM_8kHz_16bit"} = $parms{"Nightly_dirname"}."/HTK/8kHz_16bit/MFCC_O_D";  
+        ####################################################################
-        # Script Location
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        ####################################################################
-        # UserSubmission Location
@@ -70 +94 @@
-                $parms{"QuarantineDir"} = $parms{"UserSubmissions"}."/Quarantine";
-                $parms{"ToBeProcessedDir"} = $parms{"UserSubmissions"}."/ToBeProcessed";
-        ####################################################################
-        # Get today's date and create Nightly AM creation sub-directories
-        # see http://search.cpan.org/~gbarr/TimeDate-1.16/lib/Date/Format.pm for time format definitions
-        my $year = strftime "%Y", localtime; #%Y      year (4 digits)
-        my $mon = strftime "%m", localtime; # %m      month number, starting with 01
-        my $mday = strftime "%d", localtime; #  %d      numeric day of the month, with leading zeros (eg 01..31)
-        if ($parms{"testing"}) {
-                $parms{"mirror_dir"}  = "/data/svn-mirror-copy"; # for testing
-        } else {
-                $parms{"mirror_dir"}  = "/data/svn-mirror" ; 
-        }
-        $parms{"Nightly_dir"}  = $parms{"mirror_dir"} . "/Nightly_Builds"; 
-                $parms{"Nightly_dirname"} = $parms{"Nightly_dir"}."/AcousticModel-$year-$mon-$mday";    
-                $parms{"NightlyAM_16kHz_16bit"} = $parms{"Nightly_dirname"}."/HTK/16kHz_16bit/MFCC_O_D";                                
-                $parms{"NightlyAM_8kHz_16bit"} = $parms{"Nightly_dirname"}."/HTK/8kHz_16bit/MFCC_O_D";          
-        $parms{"Tags"}  = $parms{"mirror_dir"} . "/Tags";
-                $parms{"Releases"} = $parms{"Tags"}."/Releases";        
-                $parms{"CurrentBuild_dir"} = $parms{"Releases"}."/0_1_1-build726";
-                                $parms{"CurrentAM_16kHz_16bit"} = $parms{"CurrentBuild_dir"}."/AcousticModels/HTK/16kHz-16bit/MFCC_O_D";                                
-                                $parms{"CurrentAM_8kHz_16bit"} = $parms{"CurrentBuild_dir"}."/AcousticModels/HTK/8kHz-16bit/MFCC_O_D";                                  
-        ####################################################################
-        # NFS directory from AM create server server to WebGUI server