Ticket #6868: win64_r21900.patch

File win64_r21900.patch, 6.6 KB (added by mythtv@…, 17 years ago)

  • Win32/build/win32-packager.pl

     
    183183my $mythtv  = 'C:/mythtv/';       # this is where the entire SVN checkout lives
    184184                                  # so c:/mythtv/mythtv/ is the main codebase.
    185185my $build   = 'C:/mythtv/build/'; # where 'make install' installs into
    186 my $mysql   = 'C:/Program Files/MySQL/MySQL Server 5.1/';
    187186
    188187# Where is the users home?
    189188# Script later creates $home\.mythtv\mysql.txt
    … …  
    198197$home =~ s/ /\\ /g;
    199198$home .= '/'; # all paths should end in a slash
    200199
     200# Where are program files (32-bit)?
     201my $dosprogramfiles = '';
     202if ( $ENV{'ProgramFiles(x86)'} ) {
     203  $dosprogramfiles = $ENV{'ProgramFiles(x86)'};
     204} else {
     205  $dosprogramfiles = $ENV{'ProgramFiles'};
     206}
     207my $programfiles = $dosprogramfiles;
     208$programfiles =~ s#\\#/#g;
    201209
     210my $mysql   = $programfiles.'/MySQL/MySQL Server 5.1/';
     211
    202212# DOS executable CMD.exe versions of the paths (for when we shell to DOS mode):
    203213my $dosmsys    = perl2dos($msys);
    204214my $dossources = perl2dos($sources);
    … …  
    213223                           # if you setup mingw right in msys,
    214224                           # so we will usually just say /mingw in the code,
    215225                           # not '.$unixmingw.' or similar (see /etc/fstab)
    216 my $unixsources = perl2unix($sources);
    217 my $unixmythtv  = perl2unix($mythtv);
    218 my $unixhome    = perl2unix($home);
    219 my $unixbuild   = perl2unix($build);
     226my $unixsources      = perl2unix($sources);
     227my $unixmythtv       = perl2unix($mythtv);
     228my $unixhome         = perl2unix($home);
     229my $unixprogramfiles = perl2unix($programfiles);
     230my $unixbuild        = perl2unix($build);
    220231
    221232# The installer for MinGW:
    222233my $MinGWinstaller = 'MinGW-5.1.4.exe';
    … …  
    667678 [ archive => $sources.'isetup-5.2.3.exe',
    668679     fetch => 'http://files.jrsoftware.org/ispack/ispack-5.2.3.exe',
    669680   comment => 'fetch inno setup setup' ],
    670  [ file    => "C:/Program Files/Inno Setup 5/iscc.exe",
     681 [ file    => $programfiles.'/Inno Setup 5/iscc.exe',
    671682   exec    => $dossources.'isetup-5.2.3.exe', #/silent is broken!
    672683   comment => 'Install innosetup - install ISTool, '.
    673684              'ISSP, AND encryption support.' ],
    … …  
    680691   comment => 'fetching unrar'],
    681692 [ file    => $sources.'bin/unrar.exe',
    682693  shell    => ["cd ".$sources, "unzip/unzip.exe unrar-3.4.3-bin.zip"]],
    683  [ file    => 'C:/Program Files/Inno Setup 5/UninsHs.exe',
    684   shell    => ['cd /c/program\ files/inno\ setup\ 5',
     694 [ file    => $programfiles.'/Inno Setup 5/UninsHs.exe',
     695  shell    => ['cd "'.$unixprogramfiles.'/inno setup 5"',
    685696              $sources.'bin/unrar.exe e '.$sources.'UninsHs.rar'],
    686697  comment  => 'Install innosetup' ],
    687698 [ archive => $sources.'istool-5.2.1.exe',
    688699     fetch => 'http://downloads.sourceforge.net/sourceforge'.
    689700              '/istool/istool-5.2.1.exe',
    690701   comment => 'fetching istool' ],
    691  [ file    => "c:/Program Files/ISTool/isxdl.dll",
     702 [ file    => $programfiles.'/ISTool/isxdl.dll',
    692703   exec    => $dossources.'istool-5.2.1.exe /silent',
    693704   comment => 'Install istool'],
    694705 [ archive => $sources.'logo_mysql_sun.gif',
    … …  
    18011812[ grep   => ['SERVICE_NAME',$mythtv.'testmysqlsrv.bat'],
    18021813  exec   => ['sc start mysql','nocheck']],
    18031814[ grep   => ['does not exist',$mythtv.'testmysqlsrv.bat'],
    1804   exec   => ['C:\Program Files\MySQL\MySQL Server 5.1\bin\MySQLd-nt.exe'.
    1805              ' --standalone  -console','nocheck']],
     1815  exec   => [$dosprogramfiles.'\MySQL\MySQL Server 5.1\bin\MySQLd-nt.exe '.
     1816             '--standalone  -console','nocheck']],
    18061817
    18071818 
    18081819[ always => [],
    … …  
    18111822echo testing connection to a local mysql server...
    18121823sleep 5
    18131824del '.$dosmythtv.'_mysqlshow_err.txt
    1814 "C:\Program Files\MySQL\MySQL Server 5.1\bin\mysqlshow.exe" -u mythtv --password=mythtv 2> '.$dosmythtv.'_mysqlshow_err.txt  > '.$dosmythtv.'_mysqlshow_out.txt
     1825"'.$dosprogramfiles.'\MySQL\MySQL Server 5.1\bin\mysqlshow.exe" -u mythtv --password=mythtv 2> '.$dosmythtv.'_mysqlshow_err.txt  > '.$dosmythtv.'_mysqlshow_out.txt
    18151826type '.$dosmythtv.'_mysqlshow_out.txt >> '.$dosmythtv.'_mysqlshow_err.txt
    18161827del '.$dosmythtv.'_mysqlshow_out.txt
    18171828sleep 1
    … …  
    18291840# was there, there's no need to reconfigure the server!
    18301841[ grep    => ['(\+--------------------\+|Access denied for user)',
    18311842              $mythtv.'_mysqlshow_err.txt'],
    1832   exec    => ['C:\Program Files\MySQL\MySQL Server 5.1\bin\MySQLd-nt.exe '.
     1843  exec    => [$dosprogramfiles.'\MySQL\MySQL Server 5.1\bin\MySQLd-nt.exe '.
    18331844              '--standalone  -console', 'nocheck'],
    18341845  comment => 'See if we couldnt connect to a local mysql server. '.
    18351846             'Please re-configure the MySQL server to start as a service.'],
    … …  
    21272138      comment => 'Create Packaging directory'],
    21282139    # Move required files from inno setup to setup directory
    21292140    [ file    => $mythtv."build/isfiles/UninsHs.exe",
    2130       exec    => 'copy /Y "C:\Program Files\Inno Setup 5\UninsHs.exe" '.
     2141      exec    => 'copy /Y "'.$dosprogramfiles.'\Inno Setup 5\UninsHs.exe" '.
    21312142                 $dosmythtv.'build\isfiles\UninsHs.exe',
    21322143      comment => 'Copy UninsHs to setup directory' ],
    21332144    [ file    => $mythtv."build/isfiles/isxdl.dll",
    2134       exec    => 'copy /Y "C:\Program Files\ISTool\isxdl.dll" '.
     2145      exec    => 'copy /Y "'.$dosprogramfiles.'\ISTool\isxdl.dll" '.
    21352146                 $dosmythtv.'build\isfiles\isxdl.dll',
    21362147      comment => 'Copy isxdl.dll to setup directory' ],
    21372148    [ file    => $mythtv."build/isfiles/WizModernSmallImage-IS.bmp",
    2138       exec    => 'copy /Y "C:\Program Files\Inno Setup 5'.
     2149      exec    => 'copy /Y "'.$dosprogramfiles.'\Inno Setup 5'.
    21392150                 '\WizModernSmallImage-IS.bmp" '.
    21402151                 $dosmythtv.'build\isfiles\WizModernSmallImage-IS.bmp',
    21412152      comment => 'Copy WizModernSmallImage-IS.bmp to setup directory' ],
    … …  
    21752186# Run setup
    21762187#    [ newer   => [$mythtv.'setup/MythTvSetup.exe',
    21772188#                   $mythtv.'mythtv/last_build.txt'],
    2178 #      exec    => ['"c:\Program Files\Inno Setup 5\Compil32.exe" /cc "'.
     2189#      exec    => ['"'.$dosprogramfiles.'\Inno Setup 5\Compil32.exe" /cc "'.
    21792190#                  $dosmythtv.'build\isfiles\mythtvsetup.iss"' ]],
    21802191    [ newer    => [$mythtv.'setup/MythTvSetup.exe',
    21812192                    $mythtv.'mythtv/last_build.txt'],
    21822193      exec     => ['cd '.$dosmythtv.'build\isfiles && '.
    2183                    '"c:\Program Files\Inno Setup 5\iscc.exe" "'.
     2194                   '"'.$dosprogramfiles.'\Inno Setup 5\iscc.exe" "'.
    21842195                   $dosmythtv.'build\isfiles\mythtvsetup.iss"' ]],
    21852196
    21862197    ;