Code

Changeset ddd9e5 in nerdcave.taskbarshuffle


Ignore:
Timestamp:
05/10/2012 04:06:21 PM (8 years ago)
Author:
geos_one
Branches:
master
Children:
9a93c2
Parents:
2172b8
git-author:
Mario Fetka <mario.fetka@…> (05/10/2012 04:06:21 PM)
git-committer:
Mario Fetka <mario.fetka@…> (05/10/2012 04:06:21 PM)
Message:

Move to new buildsystem and rename

Files:
4 added
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • CLIENT_DATA/delsub.ins

    r2172b8 rddd9e5  
    55 
    66 
    7 Set $MsiId32$ = '{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}' 
    87Set $UninstallProgram32$ = $InstallDir32$ + "\unins000.exe" 
    98 
    10 Set $MsiId64$ = '{23170F69-40C1-2702-0920-000001000000}' 
    119Set $UninstallProgram32$ = $InstallDir64$ + "\unins000.exe" 
    1210 
     
    2018        endif 
    2119 
    22         if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId32$ + "] DisplayName") = "") 
    23                 comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall" 
    24                 Winbatch_uninstall_msi_32 
    25                 sub_check_exitcode 
    26         endif 
    27          
    2820        comment "Delete files" 
    2921        Files_uninstall_32 /32Bit 
     
    4133        endif 
    4234 
    43         if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId64$ + "] DisplayName") = "") 
    44                 comment "MSI id " + $MsiId64$ + " found in registry, starting msiexec to uninstall" 
    45                 Winbatch_uninstall_msi_64 
    46                 sub_check_exitcode 
    47         endif 
    48          
    4935        comment "Delete files" 
    5036        Files_uninstall_64 /64Bit 
     
    5743 
    5844[Winbatch_uninstall_32] 
    59 ; Choose one of the following examples as basis for program uninstall 
    60 ; 
    61 ; === Nullsoft Scriptable Install System ================================================================ 
    6245"$UninstallProgram32$" /VERYSILENT 
    63  
    64  
    65 [Winbatch_uninstall_msi_32] 
    66 msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress 
    6746 
    6847[Files_uninstall_32] 
     
    7251 
    7352[Winbatch_uninstall_64] 
    74 ; Choose one of the following examples as basis for program uninstall 
    75 ; 
    76 ; === Nullsoft Scriptable Install System ================================================================ 
    7753"$UninstallProgram64$" /VERYSILENT 
    78  
    79  
    80 [Winbatch_uninstall_msi_64] 
    81 msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress 
    8254 
    8355[Files_uninstall_64] 
  • CLIENT_DATA/setup.ins

    r129995 rddd9e5  
    77requiredWinstVersion >= "4.10.8.6" 
    88 
    9 DefVar $MsiId32$ 
    109DefVar $UninstallProgram32$ 
    11 DefVar $MsiId64$ 
    1210DefVar $UninstallProgram64$ 
    1311DefVar $LogDir$ 
     
    1715DefVar $InstallDir64$ 
    1816DefVar $ExitCode$ 
    19 DefVar $LicenseRequired$ 
    20 DefVar $LicenseKey$ 
    21 DefVar $LicensePool$ 
    2217DefVar $INST_SystemType$ 
    2318DefVar $INST_architecture$ 
     
    3530; therefore please: only lower letters, no umlauts,  
    3631; no white space use '-' as a seperator 
    37 Set $ProductId$       = "taskbarshuffle" 
     32Set $ProductId$       = "nerdcave.taskbarshuffle" 
    3833Set $MinimumSpace$    = "3 MB" 
    3934; the path were we find the product after the installation 
    4035Set $InstallDir32$      = "%ProgramFiles32Dir%\Taskbar Shuffle" 
    4136Set $InstallDir64$      = "%ProgramFiles64Dir%\Taskbar Shuffle" 
    42 Set $LicenseRequired$ = "false" 
    43 Set $LicensePool$     = "p_" + $ProductId$ 
    4437; ---------------------------------------------------------------- 
    4538 
     
    5750        endif 
    5851         
    59         if $LicenseRequired$ = "true" 
    60                 comment "Licensing required, reserve license and get license key" 
    61                 Sub_get_licensekey 
    62         endif 
    63          
    64         comment "installing" 
    65  
    6652        if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only") 
    6753                Message "Installing " + $ProductId$ + " 32 Bit..." 
     
    9379 
    9480[Winbatch_install_32] 
    95 ; Choose one of the following examples as basis for your installation 
    96 ; You can use $LicenseKey$ var to pass a license key to the installer 
    97 ; 
    98 ; === Nullsoft Scriptable Install System ================================================================ 
    99 "%ScriptPath%\X86FILE" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- 
     81"$Install32Exe$" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- 
    10082 
    10183[Files_install_32] 
     
    10587 
    10688[Winbatch_install_64] 
    107 ; Choose one of the following examples as basis for your installation 
    108 ; You can use $LicenseKey$ var to pass a license key to the installer 
    109 ; 
    110 ; === MSI package ======================================================================================= 
    111 ; You may use the parameter PIDKEY=$Licensekey$ 
    112 "%ScriptPath%\AMD64FILE" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- 
     89"$Install64Exe$" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- 
    11390 
    11491[Files_install_64] 
     
    159136; end_link 
    160137 
    161 [Sub_get_licensekey] 
    162 if opsiLicenseManagementEnabled 
    163         comment "License management is enabled and will be used" 
    164  
    165         comment "Trying to get a license key" 
    166         Set $LicenseKey$ = demandLicenseKey ($LicensePool$) 
    167         ; If there is an assignment of exactly one licensepool to the product the following call is possible: 
    168         ; Set $LicenseKey$ = demandLicenseKey ("", $ProductId$) 
    169         ; 
    170         ; If there is an assignment of a license pool to a windows software id, it is possible to use: 
    171         ; DefVar $WindowsSoftwareId$ 
    172         ; $WindowsSoftwareId$ = "..." 
    173         ; Set $LicenseKey$ = demandLicenseKey ("", "", $WindowsSoftwareId$) 
    174          
    175         DefVar $ServiceErrorClass$ 
    176         set $ServiceErrorClass$ = getLastServiceErrorClass 
    177         comment "Error class: " + $ServiceErrorClass$ 
    178          
    179         if $ServiceErrorClass$ = "None" 
    180                 comment "Everything fine, we got the license key '" + $LicenseKey$ + "'" 
    181         else 
    182                 if $ServiceErrorClass$ = "LicenseConfigurationError" 
    183                         LogError "Fatal: license configuration must be corrected" 
    184                         LogError getLastServiceErrorMessage 
    185                         isFatalError 
    186                 else  
    187                         if $ServiceErrorClass$ = "LicenseMissingError" 
    188                                 LogError "Fatal: required license is not supplied" 
    189                                 isFatalError 
    190                         endif 
    191                 endif 
    192         endif 
    193 else 
    194         LogError "Fatal: license required, but license management not enabled" 
    195         isFatalError 
    196 endif 
    197  
    198  
    199138[Sub_check_exitcode] 
    200139comment "Test for installation success via exit code" 
  • CLIENT_DATA/uninstall.ins

    r129995 rddd9e5  
    77requiredWinstVersion >= "4.10.8.6" 
    88 
    9 DefVar $MsiId32$ 
    109DefVar $UninstallProgram32$ 
    11 DefVar $MsiId64$ 
    1210DefVar $UninstallProgram64$ 
    1311DefVar $LogDir$ 
     
    1614DefVar $InstallDir32$ 
    1715DefVar $InstallDir64$ 
    18 DefVar $LicenseRequired$ 
    19 DefVar $LicensePool$ 
    2016DefVar $INST_SystemType$ 
    2117DefVar $INST_architecture$ 
     
    3026; - Please edit the following values                             - 
    3127; ---------------------------------------------------------------- 
    32 Set $ProductId$       = "taskbarshuffle" 
     28Set $ProductId$       = "nerdcave.taskbarshuffle" 
    3329Set $InstallDir32$      = "%ProgramFiles32Dir%\Taskbar Shuffle" 
    3430Set $InstallDir64$      = "%ProgramFiles64Dir%\Taskbar Shuffle" 
     
    4844endif 
    4945 
    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  
  • OPSI/control

    r129995 rddd9e5  
    66[Product] 
    77type: localboot 
    8 id: taskbarshuffle 
     8id: nerdcave.taskbarshuffle 
    99name: Taskbar Shuffle 
    1010description: Taskbar Shuffle is a simple, small, free utility that lets you drag and drop your Windows taskbar buttons to rearrange them. 
Note: See TracChangeset for help on using the changeset viewer.