Ticket #5203: 5203.patch

File 5203.patch, 2.0 KB (added by arnonm@…, 12 years ago)

Fix to find isxdl.dll

  • mythtv/contrib/Win32/build/win32-packager.pl

     
    403403 [ file => $sources.'bin/unrar.exe', shell => ["cd ".$sources, "unzip/unzip.exe unrar-3.4.3-bin.zip"]],
    404404 [ file => 'C:/Program Files/Inno Setup 5/UninsHs.exe', shell => ['cd /c/program\ files/inno\ setup\ 5', $sources.'bin/unrar.exe e '.$sources.'UninsHs.rar'],comment => 'Install innosetup' ],
    405405 [ archive => $sources.'istool-5.2.1.exe', 'fetch' => 'http://downloads.sourceforge.net/sourceforge/istool/istool-5.2.1.exe', comment => 'fetching istool' ],
    406  [ file => "c:/Program Files/Inno Setup 5/isxdl.dll", exec => $dossources.'istool-5.2.1/exe /silent', comment => 'Install istool'],
     406 [ file => "c:/Program Files/istool/isxdl.dll", exec => $dossources.'istool-5.2.1/exe /silent', comment => 'Install istool'],
    407407 [ file => $mythtv.'build/package_flag_', shell => ["rm ".$unixmythtv."build/package_flag",'nocheck'],comment => '' ],
    408408;
    409409}
     
    11961196              $dosmythtv.'build\isfiles\UninsHs.exe',
    11971197      comment => 'Copy UninsHs to setup directory' ],
    11981198    [ file => $mythtv."build/isfiles/isxdl.dll",
    1199       exec => 'copy /Y "C:\Program Files\Inno Setup 5\isxdl.dll" '.
     1199      exec => 'copy /Y "C:\Program Files\istool\isxdl.dll" '.
    12001200              $dosmythtv.'build\isfiles\isxdl.dll',
    12011201      comment => 'Copy isxdl.dll to setup directory' ],
    12021202    [ file => $mythtv."build/isfiles/WizModernSmallImage-IS.bmp",
    12031203      exec => 'copy /Y "C:\Program Files\Inno Setup 5\WizModernSmallImage-IS.bmp" '.
    12041204              $dosmythtv.'build\isfiles\WizModernSmallImage-IS.bmp',
    1205       comment => 'Copy isxdl.dll to setup directory' ],
     1205      comment => 'Copy WizModernSmallImage-IS.bmp to setup directory' ],
    12061206    # Check for temporary situation, required files have all
    12071207    # been loaded to same directory as batch file, and not svn],
    12081208    [ file => $mythtv.'mythtv/contrib/win32/build/mythtvsetup.iss',