Code

Changeset 46d4b9 in vlc.mediaplayer


Ignore:
Timestamp:
04/07/2013 02:03:16 PM (7 years ago)
Author:
geos_one
Branches:
master
Children:
c3f5d0
Parents:
004d28
git-author:
Mario Fetka <mario.fetka@…> (04/07/2013 02:03:16 PM)
git-committer:
Mario Fetka <mario.fetka@…> (04/07/2013 02:03:16 PM)
Message:

add experimental 64 bit builds

Files:
4 added
1 deleted
2 edited
2 moved

Legend:

Unmodified
Added
Removed
  • CLIENT_DATA/setup3264.ins

    r004d28 r46d4b9  
    77requiredWinstVersion >= "4.11.2.6" 
    88 
    9 DefVar $UninstallProgram$ 
    10 DefVar $UninstallProgramOld$ 
    11 DefVar $IniFile$ 
     9DefVar $UninstallProgram32$ 
     10DefVar $UninstallProgramOld32$ 
     11DefVar $IniFile32$ 
     12DefVar $UninstallProgram64$ 
     13DefVar $UninstallProgramOld64$ 
     14DefVar $IniFile64$ 
    1215DefVar $IniCfgFile$ 
    1316DefVar $LogDir$ 
    1417DefVar $ProductId$   
    1518DefVar $MinimumSpace$ 
    16 DefVar $InstallDir$ 
     19DefVar $InstallDir32$ 
     20DefVar $InstallDir64$ 
    1721DefVar $ExitCode$ 
     22DefVar $INST_SystemType$ 
     23DefVar $INST_architecture$ 
    1824DefVar $OLD_VERSION$ 
    1925DefVar $OLD_CREATOR_TAG$ 
    2026DefVar $OLD_RELEASE$ 
     27 
     28Set $INST_SystemType$ = GetSystemType 
     29set $INST_architecture$ = GetProductProperty("install_architecture","system specific") 
    2130 
    2231Set $LogDir$ = "%SystemDrive%\tmp" 
     
    4049Set $MinimumSpace$    = "30 MB" 
    4150; the path were we find the product after the installation 
    42 Set $InstallDir$      = "%ProgramFiles32Dir%\VideoLAN\VLC" 
     51Set $InstallDir32$      = "%ProgramFiles32Dir%\VideoLAN\VLC" 
     52Set $InstallDir64$      = "%ProgramFiles64Dir%\VideoLAN\VLC" 
    4353; ---------------------------------------------------------------- 
    4454 
     
    4757if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$)) 
    4858        LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$ 
    49         isFatalError "No Space" 
     59        isFatalError 
    5060        ; Stop process and set installation status to failed 
    5161else 
     
    5363        ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ 
    5464         
    55         if FileExists("%ScriptPath%\delsub32.ins") 
     65        if FileExists("%ScriptPath%\delsub3264.ins") 
    5666                comment "Start uninstall sub section" 
    57                 Sub "%ScriptPath%\delsub32.ins" 
     67                Sub "%ScriptPath%\delsub3264.ins" 
    5868        endif 
    5969         
    60         Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..." 
    61          
    62         comment "Start setup program" 
    63         ChangeDirectory "%SCRIPTPATH%" 
    64         Winbatch_install 
    65         Sub_check_exitcode 
    66          
    67         comment "Copy files" 
    68         Files_install /32Bit 
    69          
    70         comment "Patch Registry" 
    71         Registry_install /32Bit 
    72          
    73         comment "Create shortcuts" 
    74         LinkFolder_install 
     70        comment "installing" 
     71 
     72        if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only") 
     73                Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..." 
     74                comment "Start setup program" 
     75                ChangeDirectory "%SCRIPTPATH%" 
     76                Winbatch_install_32 
     77                Sub_check_exitcode 
     78                comment "Copy files" 
     79                Files_install_32 /32Bit 
     80                comment "Patch Registry" 
     81                Registry_install /32Bit 
     82                comment "Create shortcuts" 
     83                LinkFolder_install 
     84        endif 
     85 
     86        if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only")) 
     87                Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..." 
     88                comment "Start setup program" 
     89                ChangeDirectory "%SCRIPTPATH%" 
     90                Winbatch_install_64 
     91                Sub_check_exitcode 
     92                comment "Copy files" 
     93                Files_install_64 /64Bit 
     94                comment "Patch Registry" 
     95                Registry_install /64Bit 
     96                comment "Create shortcuts" 
     97                LinkFolder_install 
     98        endif 
    7599         
    76100endif 
    77101 
    78 [Winbatch_install] 
    79 "$InstallExe$" /S 
     102[Winbatch_install_32] 
     103"$Install32Exe$" /S 
    80104 
    81 [Files_install] 
     105[Files_install_32] 
    82106; copy the ini file to the InstallDir 
    83 copy "$IniCfgFile$" "$InstallDir$" 
     107copy "$IniCfgFile$" "$InstallDir32$" 
    84108 
    85109; Example of recursively copying some files into the installation directory: 
    86110; 
    87 ; copy -s "%ScriptPath%\files\*.*" "$InstallDir$" 
     111; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$" 
     112 
     113[Winbatch_install_64] 
     114"$Install64Exe$" /S 
     115 
     116[Files_install_64] 
     117; copy the ini file to the InstallDir 
     118copy "$IniCfgFile$" "$InstallDir64$" 
     119 
     120; Example of recursively copying some files into the installation directory: 
     121; 
     122; copy -s "%ScriptPath%\files\*.*" "$InstallDir64$" 
    88123 
    89124[Registry_install] 
  • CLIENT_DATA/uninstall3264.ins

    r004d28 r46d4b9  
    77requiredWinstVersion >= "4.11.2.6" 
    88 
    9 DefVar $UninstallProgram$ 
    10 DefVar $UninstallProgramOld$ 
    11 DefVar $IniFile$ 
     9DefVar $UninstallProg32$ 
     10DefVar $UninstallProgram32$ 
     11DefVar $UninstallProgramOld32$ 
     12DefVar $IniFile32$ 
     13DefVar $UninstallProg64$ 
     14DefVar $UninstallProgram64$ 
     15DefVar $UninstallProgramOld64$ 
     16DefVar $IniFile64$ 
    1217DefVar $IniCfgFile$ 
    1318DefVar $LogDir$ 
    1419DefVar $ExitCode$ 
    1520DefVar $ProductId$ 
    16 DefVar $InstallDir$ 
     21DefVar $InstallDir32$ 
     22DefVar $InstallDir64$ 
     23DefVar $INST_SystemType$ 
     24DefVar $INST_architecture$ 
    1725DefVar $OLD_VERSION$ 
    1826DefVar $OLD_CREATOR_TAG$ 
    1927DefVar $OLD_RELEASE$ 
     28 
     29Set $INST_SystemType$ = GetSystemType 
     30set $INST_architecture$ = GetProductProperty("install_architecture","system specific") 
    2031 
    2132Set $LogDir$ = "%SystemDrive%\tmp" 
     
    3445; - Please edit the following values                             - 
    3546; ---------------------------------------------------------------- 
    36 Set $InstallDir$      = "%ProgramFiles32Dir%\VideoLAN\VLC" 
     47Set $InstallDir32$    = "%ProgramFiles32Dir%\VideoLAN\VLC" 
     48Set $InstallDir64$    = "%ProgramFiles64Dir%\VideoLAN\VLC" 
    3749; ---------------------------------------------------------------- 
    3850 
     
    4456Message "Uninstalling " + $ProductId$ + " ..." 
    4557 
    46 if FileExists("%ScriptPath%\delsub32.ins") 
     58if FileExists("%ScriptPath%\delsub3264.ins") 
    4759        comment "Start uninstall sub section" 
    48         Sub "%ScriptPath%\delsub32.ins" 
     60        Sub "%ScriptPath%\delsub3264.ins" 
    4961endif 
    5062 
  • OPSI/control

    r863ab3 r46d4b9  
    1414licenseRequired: False 
    1515productClasses:  
    16 setupScript: setup32.ins 
    17 uninstallScript: uninstall32.ins 
     16setupScript: setup3264.ins 
     17uninstallScript: uninstall3264.ins 
    1818updateScript:  
    1919alwaysScript:  
  • builder-product.cfg

    r004d28 r46d4b9  
    2020 
    2121DL_FILE[1]="vlc-${VERSION}-win32.exe" 
    22 DL_SOURCE[1]="http://sourceforge.net/projects/vlc/files/${VERSION}/win32/vlc-${VERSION}-win32.exe" 
     22DL_SOURCE[1]="http://download.videolan.org/pub/videolan/vlc/${VERSION}/win32/vlc-${VERSION}-win32.exe" 
    2323DL_ARCH[1]="X86" 
    24 DL_WINST_NAME[1]=InstallExe 
     24DL_WINST_NAME[1]=Install32Exe 
     25 
     26DL_FILE[2]="vlc-${VERSION}-win64.exe" 
     27DL_SOURCE[2]="http://download.videolan.org/pub/videolan/vlc/${VERSION}/win64/vlc-${VERSION}-win64.exe" 
     28DL_ARCH[2]="X86_64" 
     29DL_WINST_NAME[2]=Install64Exe 
    2530 
    2631# File array index for the image showing while installing the program 
     
    2833 
    2934OPSI_INI_SECTION[0]="X86" 
    30 OPSI_INI_OPTION[0]="UninstallProg" 
     35OPSI_INI_OPTION[0]="UninstallProg32" 
    3136OPSI_INI_VALUE[0]="uninstall.exe" 
     37 
     38OPSI_INI_SECTION[0]="X86_64" 
     39OPSI_INI_OPTION[0]="UninstallProg64" 
     40OPSI_INI_VALUE[0]="uninstall.exe" 
     41 
Note: See TracChangeset for help on using the changeset viewer.