Code

Changeset a449c1 in vlc.mediaplayer


Ignore:
Timestamp:
02/24/2012 04:46:51 AM (8 years ago)
Author:
geos_one
Branches:
master
Children:
29bf5a
Parents:
447734
git-author:
Mario Fetka <mario.fetka@…> (02/24/2012 04:46:51 AM)
git-committer:
Mario Fetka <mario.fetka@…> (02/24/2012 04:46:51 AM)
Message:

remove msi and license parrt from *.ins

Location:
CLIENT_DATA
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • CLIENT_DATA/delsub32.ins

    rb76a0f ra449c1  
    55 
    66 
    7 Set $MsiId$ = '{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}' 
    87Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" 
    98 
     
    1312        comment "Uninstall program found, starting uninstall" 
    1413        Winbatch_uninstall 
    15         sub_check_exitcode 
    16 endif 
    17 if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId$ + "] DisplayName") = "") 
    18         comment "MSI id " + $MsiId$ + " found in registry, starting msiexec to uninstall" 
    19         Winbatch_uninstall_msi 
    2014        sub_check_exitcode 
    2115endif 
     
    3428; 
    3529"$UninstallProgram$" /S 
    36  
    37 [Winbatch_uninstall_msi] 
    38 msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress 
    3930 
    4031[Files_uninstall] 
  • CLIENT_DATA/setup32.ins

    r447734 ra449c1  
    77requiredWinstVersion >= "4.10.8.6" 
    88 
    9 DefVar $MsiId$ 
    109DefVar $UninstallProgram$ 
    1110DefVar $LogDir$ 
     
    1413DefVar $InstallDir$ 
    1514DefVar $ExitCode$ 
    16 DefVar $LicenseRequired$ 
    17 DefVar $LicenseKey$ 
    18 DefVar $LicensePool$ 
    1915 
    2016Set $LogDir$ = "%SystemDrive%\tmp" 
     
    4036; the path were we find the product after the installation 
    4137Set $InstallDir$      = "%ProgramFiles32Dir%\VideoLAN\VLC" 
    42 Set $LicenseRequired$ = "false" 
    43 Set $LicensePool$     = "p_" + $ProductId$ 
    4438; ---------------------------------------------------------------- 
    4539 
     
    5953        Message "Installing " + $ProductId$ + " ..." 
    6054         
    61         if $LicenseRequired$ = "true" 
    62                 comment "Licensing required, reserve license and get license key" 
    63                 Sub_get_licensekey 
    64         endif 
    65          
    6655        comment "Start setup program" 
    6756        Winbatch_install 
     
    7766        LinkFolder_install 
    7867         
    79         comment "Test for installation success" 
    80         ; Test if software marked as installed in registry 
    81         ; if (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}] DisplayName") = "") 
    82         ;       logError "Fatal: After Installation 32 bit [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}] not found" 
    83         ;       isFatalError 
    84         ; else 
    85         ;       comment "Successful Installation" 
    86         ; endif 
    87  
    8868endif 
    8969 
     
    141121; end_link 
    142122 
    143 [Sub_get_licensekey] 
    144 if opsiLicenseManagementEnabled 
    145         comment "License management is enabled and will be used" 
    146  
    147         comment "Trying to get a license key" 
    148         Set $LicenseKey$ = demandLicenseKey ($LicensePool$) 
    149         ; If there is an assignment of exactly one licensepool to the product the following call is possible: 
    150         ; Set $LicenseKey$ = demandLicenseKey ("", $ProductId$) 
    151         ; 
    152         ; If there is an assignment of a license pool to a windows software id, it is possible to use: 
    153         ; DefVar $WindowsSoftwareId$ 
    154         ; $WindowsSoftwareId$ = "..." 
    155         ; Set $LicenseKey$ = demandLicenseKey ("", "", $WindowsSoftwareId$) 
    156          
    157         DefVar $ServiceErrorClass$ 
    158         set $ServiceErrorClass$ = getLastServiceErrorClass 
    159         comment "Error class: " + $ServiceErrorClass$ 
    160          
    161         if $ServiceErrorClass$ = "None" 
    162                 comment "Everything fine, we got the license key '" + $LicenseKey$ + "'" 
    163         else 
    164                 if $ServiceErrorClass$ = "LicenseConfigurationError" 
    165                         LogError "Fatal: license configuration must be corrected" 
    166                         LogError getLastServiceErrorMessage 
    167                         isFatalError 
    168                 else  
    169                         if $ServiceErrorClass$ = "LicenseMissingError" 
    170                                 LogError "Fatal: required license is not supplied" 
    171                                 isFatalError 
    172                         endif 
    173                 endif 
    174         endif 
    175 else 
    176         LogError "Fatal: license required, but license management not enabled" 
    177         isFatalError 
    178 endif 
    179  
    180  
    181123[Sub_check_exitcode] 
    182124comment "Test for installation success via exit code" 
  • CLIENT_DATA/uninstall32.ins

    r447734 ra449c1  
    77requiredWinstVersion >= "4.10.8.6" 
    88 
    9 DefVar $MsiId$ 
    109DefVar $UninstallProgram$ 
    1110DefVar $LogDir$ 
     
    1312DefVar $ProductId$ 
    1413DefVar $InstallDir$ 
    15 DefVar $LicenseRequired$ 
    16 DefVar $LicensePool$ 
    1714 
    1815Set $LogDir$ = "%SystemDrive%\tmp" 
     
    3330Set $ProductId$       = "vlc" 
    3431Set $InstallDir$      = "%ProgramFiles32Dir%\VideoLAN\VLC" 
    35 Set $LicenseRequired$ = "false" 
    36 Set $LicensePool$     = "p_" + $ProductId$ 
    3732; ---------------------------------------------------------------- 
    3833 
     
    4742        Sub "%ScriptPath%\delsub32.ins" 
    4843endif 
    49  
    50 if $LicenseRequired$ = "true" 
    51         comment "Licensing required, free license used" 
    52         Sub_free_license 
    53 endif 
    54  
    55 [Sub_free_license] 
    56 if opsiLicenseManagementEnabled 
    57         comment "License management is enabled and will be used" 
    58  
    59         comment "Trying to free license used for the product" 
    60         DefVar $result$ 
    61         Set $result$ = FreeLicense($LicensePool$) 
    62         ; If there is an assignment of a license pool to the product, it is possible to use 
    63         ; Set $result$ = FreeLicense("", $ProductId$) 
    64         ; 
    65         ; If there is an assignment of a license pool to a windows software id, it is possible to use 
    66         ; DefVar $WindowsSoftwareId$ 
    67         ; $WindowsSoftwareId$ = "..." 
    68         ; set $result$ = FreeLicense("", "", $WindowsSoftwareId$) 
    69 else 
    70         LogError "Error: licensing required, but license management not enabled" 
    71         isFatalError 
    72 endif 
    73  
    74  
    75  
Note: See TracChangeset for help on using the changeset viewer.