Ticket #4952: win32-packager-spelling.patch

contrib/Win32/build/win32-packager.pl

@@ -27 +27 @@
 
 $| = 1; # autoflush stdout;
 
-# this scipt was last tested to work with this version, on other versions YMMV.
+# this script was last tested to work with this version, on other versions YMMV.
 #my $SVNRELEASE = '15528'; #builds and runs with 3x patches commented out below
 #my $SVNRELEASE = '15586'; # builds and runs without patches except backend.gz
 my $SVNRELEASE = '15699'; # latest build that seemed to run without any additional patches, YMMV.
@@ -39 +39 @@
                                                    # mirror of SF's choosing,
                                                    # hopefully close to you
 # alternatively you can choose your own mirror:
-#my $sourceforge = 'optusnet.dl.sourceforge.net';  # australia 
+#my $sourceforge = 'optusnet.dl.sourceforge.net';  # Australia 
 #my $sourceforge = 'internap.dl.sourceforge.net';  # USA,California
 #my $sourceforge = 'easynews.dl.sourceforge.net';  # USA,Arizona,Phoenix,
 #my $sourceforge = 'jaist.dl.sourceforge.net';     # Japan
@@ -157 +157 @@
 
 
 [ dir  => $mingw, exec => $dossources.'MinGW-5.1.3.exe',comment => 'install MinGW (be sure to install g++, g77 and ming make too) - it will require user interaction, but once completed, will return control to us....' ], # interactive, supposed to install g++ and ming make too, but people forget to select them? 
-[ file  => $mingw."bin/gcc.exe", exec => $dossources.'MinGW-5.1.3.exe',comment => 'unable to gind a gcc.exe where expected, rerunning MinGW installer!' ], # interactive, supposed to install g++ and ming make too, but people forget to select them? 
+[ file  => $mingw."bin/gcc.exe", exec => $dossources.'MinGW-5.1.3.exe',comment => 'unable to find a gcc.exe where expected, rerunning MinGW installer!' ], # interactive, supposed to install g++ and ming make too, but people forget to select them? 
 
 [ archive => $sources.'MSYS-1.0.10.exe', 'fetch' => 'http://'.$sourceforge.'/sourceforge/mingw/MSYS-1.0.10.exe',comment => 'Get the MSYS and addons:' ] ,
 [ archive => $sources.'bash-3.1-MSYS-1.0.11-1.tar.bz2', 'fetch' => 'http://'.$sourceforge.'/sourceforge/mingw/bash-3.1-MSYS-1.0.11-1.tar.bz2' ] ,
@@ -194 +194 @@
 
 
 # (alternate would be from the gnuwin32 project, which is actually from same source)
-#  run it into a 'unzip' folder, becuase it doesn't extract to a folder:
+#  run it into a 'unzip' folder, because it doesn't extract to a folder:
 [ dir => $sources."unzip" ,  mkdirs => $sources.'unzip',comment => 'unzip.exe - Get a precompiled native Win32 version from InfoZip' ],
 [ archive => $sources.'unzip/unz552xN.exe',  fetch => 'ftp://tug.ctan.org/tex-archive/tools/zip/info-zip/WIN32/unz552xN.exe'],
 [ file => $sources.'unzip/unzip.exe', exec => 'chdir '.$dossources.'unzip && '.$dossources.'unzip/unz552xN.exe' ],
@@ -291 +291 @@
 
 
 #----------------------------------------
-# now we do each of the source library dependancies in turn: download,extract,build/install
+# now we do each of the source library dependencies in turn: download,extract,build/install
 # TODO - ( and just prey that they all work?)  These should really be more detailed, and actually check that we got it installed properly.
 
 # Most of these look for a Makefile as a sign that the ./configure was successful (not necessarily true, but it's a start)
@@ -484 +484 @@
 # is svn num (ie file contents) changed since last run, if so, do a 'make clean' (overkill, I know, but safer)!
 [ filesame => [$mythtv.'mythtv\svn_info.txt',$mythtv.'mythtv\svn_info.new'], shell => ['touch '.$unixmythtv.'mythtv/last_build.txt','cat '.$unixmythtv.'mythtv/svn_info.new >'.$unixmythtv.'mythtv/svn_info.txt','touch -r '.$unixmythtv.'mythtv/svn_info.txt '.$unixmythtv.'mythtv/svn_info.new'], comment => 'if the SVN number is changed, then remember that, AND arrange for a full re-make of mythtv. (overkill, I know, but safer)' ],
 
-# apply any outstanding win32 patches - this section will be hard to keep upwith HEAD/SVN:
+# apply any outstanding win32 patches - this section will be hard to keep up with HEAD/SVN:
 
 # 15586 and earlier need this patch:
-#[ archive => $sources.'backend.patch.gz' , 'fetch' => 'http://svn.mythtv.org/trac/raw-attachment/ticket/4392/backend.patch.gz', comment => 'backend.patch.gz - apply any outstanding win32 patches - this section will be hard to keep upwith HEAD/SVN'],
+#[ archive => $sources.'backend.patch.gz' , 'fetch' => 'http://svn.mythtv.org/trac/raw-attachment/ticket/4392/backend.patch.gz', comment => 'backend.patch.gz - apply any outstanding win32 patches - this section will be hard to keep up with HEAD/SVN'],
 #[ filesame => [$mythtv.'mythtv/backend.patch.gz',$sources."backend.patch.gz"], copy => [''=>'',comment => '4392: - backend connections being accepted patch '] ],
 #[ grep => ['unsigned\* Indexes = new unsigned\[n\]\;',$mythtv.'mythtv/libs/libmyth/mythsocket.cpp'], shell => ["cd ".$unixmythtv."mythtv/","gunzip -f backend.patch.gz","patch -p0 < backend.patch"] ],
 
 # these next 3 patches are needed for 15528 (and earlier)
-#[ archive => $sources.'importicons_windows_2.diff' , 'fetch' => 'http://svn.mythtv.org/trac/raw-attachment/ticket/3334/importicons_windows_2.diff', comment => 'importicons_windows_2.diff - apply any outstanding win32 patches - this section will be hard to keep upwith HEAD/SVN'],
+#[ archive => $sources.'importicons_windows_2.diff' , 'fetch' => 'http://svn.mythtv.org/trac/raw-attachment/ticket/3334/importicons_windows_2.diff', comment => 'importicons_windows_2.diff - apply any outstanding win32 patches - this section will be hard to keep up with HEAD/SVN'],
 #[ filesame => [$mythtv.'mythtv/importicons_windows_2.diff',$sources."importicons_windows_2.diff"], copy => [''=>'',comment => '3334 fixes error with mkdir() unknown.'] ],
 #
 #[ grep => ['\#include <qdir\.h>',$mythtv.'mythtv/libs/libmythtv/importicons.cpp'], shell => ["cd ".$unixmythtv."mythtv/","patch -p0 < importicons_windows_2.diff"] ],
-#[ archive => $sources.'mingw.patch' , 'fetch' => 'http://svn.mythtv.org/trac/raw-attachment/ticket/4516/mingw.patch', comment => 'mingw.patch - apply any outstanding win32 patches - this section will be hard to keep upwith HEAD/SVN'],
+#[ archive => $sources.'mingw.patch' , 'fetch' => 'http://svn.mythtv.org/trac/raw-attachment/ticket/4516/mingw.patch', comment => 'mingw.patch - apply any outstanding win32 patches - this section will be hard to keep up with HEAD/SVN'],
 #[ filesame => [$mythtv.'mythtv/mingw.patch',$sources."mingw.patch"], copy => [''=>'',comment => '4516 fixes build'] ],
 #[ grep => ['LIBS \+= -lmyth-\$\$LIBVERSION',$mythtv.'mythtv/libs/libmythui/libmythui.pro'], shell => ["cd ".$unixmythtv."mythtv/","patch -p0 < mingw.patch"] ]
 #
 # (fixed in 15547)
-#[ archive => $sources.'util_win32.patch' , 'fetch' => 'http://svn.mythtv.org/trac/raw-attachment/ticket/4497/util_win32.patch', comment => 'util_win32.patch - apply any outstanding win32 patches - this section will be hard to keep upwith HEAD/SVN'],
+#[ archive => $sources.'util_win32.patch' , 'fetch' => 'http://svn.mythtv.org/trac/raw-attachment/ticket/4497/util_win32.patch', comment => 'util_win32.patch - apply any outstanding win32 patches - this section will be hard to keep up with HEAD/SVN'],
 #[ filesame => [$mythtv.'mythtv/util_win32.patch',$sources."util_win32.patch"], copy => [''=>'',comment => '4497 fixes build'] ],
 #[ grep => ['\#include "compat.h"',$mythtv.'mythtv/libs/libmyth/util.h'], shell => ["cd ".$unixmythtv."mythtv/libs/libmyth/","patch -p0 < ".$unixmythtv."mythtv/util_win32.patch"] ],
 
 # post 15528, pre 15568  needs this: equivalent to: svn merge -r 15541:15540 .
-#[ archive => $sources.'15541_undo.patch' , 'fetch' => 'http://svn.mythtv.org/trac/raw-attachment/ticket/XXXX/15541_undo.patch', comment => 'util_win32.patch - apply any outstanding win32 patches - this section will be hard to keep upwith HEAD/SVN'],
+#[ archive => $sources.'15541_undo.patch' , 'fetch' => 'http://svn.mythtv.org/trac/raw-attachment/ticket/XXXX/15541_undo.patch', comment => 'util_win32.patch - apply any outstanding win32 patches - this section will be hard to keep up with HEAD/SVN'],
 #[ filesame => [$mythtv.'mythtv/15541_undo.patch',$sources."15541_undo.patch"], copy => [''=>'',comment => 'XXXX'] ],
-#[ grep  => ['\#include \"compat.h\"',$mythtv.'mythtv/libs/libmythui/mythpainter.cpp'], shell => ["cd ".$unixmythtv."mythtv/libs/libmyth/","patch -p2 < ".$unixmythtv."mythtv/15541_undo.patch"] , comment => 'currently need this patch too, equivalemnt of: svn merge -r 15541:15540 .'],
+#[ grep  => ['\#include \"compat.h\"',$mythtv.'mythtv/libs/libmythui/mythpainter.cpp'], shell => ["cd ".$unixmythtv."mythtv/libs/libmyth/","patch -p2 < ".$unixmythtv."mythtv/15541_undo.patch"] , comment => 'currently need this patch too, equivalent of: svn merge -r 15541:15540 .'],
 
 
 [ file => $mythtv.'mythtv/config/config.pro', shell => ['touch '.$unixmythtv.'mythtv/config/config.pro'], comment => 'create an empty config.pro or the mythtv build will fail'],
@@ -536 +536 @@
 
 # install some themes? does a 'make install' do that adequately (no, not if running outside msys)?
 # copy the basic themes somewhere that mythtv can get at it.
-# TODO this should really be independant of the msys folders, but it's not at present?
+# TODO this should really be independent of the msys folders, but it's not at present?
 [ dir => $msys.'share\mythtv\themes\G.A.N.T', shell => ['mkdir /usr/share/mythtv','mkdir /usr/share/mythtv/themes','cp -r /c/mythtv/mythtv/themes/* /usr/share/mythtv/themes/'], comment => 'copy the basic themes somewhere that mythtv can get at it.' ],
 
 # 
@@ -544 +544 @@
 '#!/bin/bash
 source '.$unixmythtv.'qt_env.sh
 cd '.$unixmythtv.'mythtv
-# keep around just one earlier verion in run_old:
+# keep around just one earlier version in run_old:
 rm -rf run_old
 mv run run_old
 mkdir run
@@ -670 +670 @@
 
 sub _end {
         
-        comment("This verson of the Win32 Build script last was last tested on: $SVNRELEASE");
+        comment("This version of the Win32 Build script last was last tested on: $SVNRELEASE");
 
 print << 'END';    
 #
@@ -685 +685 @@
 
 #------------------------------------------------------------------------------
 
-# this is the mainloop that itterates over the above definitions and determines what to do:
+# this is the mainloop that iterates over the above definitions and determines what to do:
 # cause:
 foreach my $dep ( @{$expect} ) { 
     my @dep = @{$dep};
@@ -1035 +1035 @@
 
 sub perl2unix  {
     my $p = shift;
-    $p =~ s#$msys#/#i;  # remove superflouus msys folders if they are there
+    $p =~ s#$msys#/#i;  # remove superfluous msys folders if they are there
     $p =~ s#^([CD]):#/$1#ig;  #change c:/ into /c  (or a D:)   so c:/msys becomes /c/msys etc.
     $p =~ s#//#/#ig; # reduce any double forward slashes to single ones.
     return $p;