Code

Changeset 14bf43 in oracle.java745


Ignore:
Timestamp:
12/10/2013 02:27:11 PM (6 years ago)
Author:
Dennis Trinks <dennis.trinks@…>
Branches:
master
Parents:
709e37
git-author:
Dennis Trinks <dennis.trinks@…> (12/10/2013 02:27:11 PM)
git-committer:
Dennis Trinks <dennis.trinks@…> (12/10/2013 02:27:11 PM)
Message:

cleaned, unistallscript old java versions, testing

Files:
3 added
15 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • CLIENT_DATA/delsub32.ins

    r6f431c r14bf43  
    33; and published under the Terms of the General Public License. 
    44; credits: http://www.opsi.org/credits/ 
     5Set $MsiId$ = '{26A24AE4-039D-4CA4-87B4-2F83217045FF}' 
    56 
     7Message "Uninstalling " + $ProductId$ + " ..." 
     8      
     9       dosinanicon_install 
     10       DosBatch_jre_uninstall 
    611 
    7 Set $MsiId32$ = '{E7C06D29-B16A-4D88-A917-55422FAB4E9D}' 
    8 Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe" 
     12;if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId$ + "] DisplayName") = "") 
     13;       DosBatch_jre_uninstall 
     14;       dosinanicon_install 
     15;       Winbatch_uninstall_msi 
     16;       sub_check_exitcode 
     17;endif 
    918 
    10 Set $MsiId64$ = '{8D7DDFA2-3A50-49A4-99C5-6D8BE66FE0B9}' 
    11 Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.exe" 
     19[dosinanicon_install] 
     20taskkill /f /im iexplore.exe /t 
    1221 
    13 if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only") 
    14         Message "Uninstalling " + $ProductId$ + " 32 Bit..." 
     22[Winbatch_uninstall_msi] 
     23msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress 
    1524 
    16         if FileExists($UninstallProgram32$) 
    17                 comment "Uninstall program found, starting uninstall" 
    18                 Winbatch_uninstall_32 
    19                 sub_check_exitcode 
    20         endif 
    21  
    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          
    28         comment "Delete files" 
    29         Files_uninstall_32 /32Bit 
    30         comment "Cleanup registry" 
    31         Registry_uninstall /32Bit 
    32 endif 
    33  
    34 if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only")) 
    35         Message "Uninstalling " + $ProductId$ + " 64 Bit..." 
    36  
    37         if FileExists($UninstallProgram64$) 
    38                 comment "Uninstall program found, starting uninstall" 
    39                 Winbatch_uninstall_64 
    40                 sub_check_exitcode 
    41         endif 
    42  
    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          
    49         comment "Delete files" 
    50         Files_uninstall_64 /64Bit 
    51         comment "Cleanup registry" 
    52         Registry_uninstall /64Bit 
    53 endif 
    54  
    55 comment "Delete program shortcuts" 
    56 LinkFolder_uninstall 
    57  
    58 [Winbatch_uninstall_32] 
    59 ; Choose one of the following examples as basis for program uninstall 
    60 ; 
    61 ; === Nullsoft Scriptable Install System ================================================================ 
    62 ; "$UninstallProgram32$" /S 
    63 ; 
    64 ; === Inno Setup ======================================================================================== 
    65 ; "$UninstallProgram32$" /silent /norestart /SUPPRESSMSGBOXES 
    66  
    67  
    68 [Winbatch_uninstall_msi_32] 
    69 msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress 
    70  
    71 [Files_uninstall_32] 
    72 ; Example for recursively deleting the installation directory (don't forget the trailing backslash): 
    73 ; 
    74 ; delete -sf "$InstallDir32$\" 
    75  
    76 [Winbatch_uninstall_64] 
    77 ; Choose one of the following examples as basis for program uninstall 
    78 ; 
    79 ; === Nullsoft Scriptable Install System ================================================================ 
    80 ; "$UninstallProgram64$" /S 
    81 ; 
    82 ; === Inno Setup ======================================================================================== 
    83 ; "$UninstallProgram64$" /silent /norestart /SUPPRESSMSGBOXES 
    84  
    85  
    86 [Winbatch_uninstall_msi_64] 
    87 msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress 
    88  
    89 [Files_uninstall_64] 
    90 ; Example for recursively deleting the installation directory (don't forget the trailing backslash): 
    91 ; 
    92 ; delete -sf "$InstallDir64$\" 
    93  
    94 [Registry_uninstall] 
    95 ; Example of deleting a registry key: 
    96 ; 
    97 ; deletekey [HKEY_LOCAL_MACHINE\Software\$ProductId$] 
    98  
    99 [LinkFolder_uninstall] 
    100 ; Example of deleting a folder from AllUsers startmenu: 
    101 ; 
    102 ; set_basefolder common_programs 
    103 ; delete_subfolder $ProductId$ 
    104 ; 
    105 ; Example of deleting a shortcut from AllUsers desktop: 
    106 ; 
    107 ; set_basefolder common_desktopdirectory 
    108 ; set_subfolder "" 
    109 ; delete_element $ProductId$ 
     25[DosBatch_jre_uninstall] 
     26@echo off 
     27cscript /nologo "%ScriptPath%\JavaUninstallScript.vbs" /keeponly 
    11028 
    11129[Sub_check_exitcode] 
  • CLIENT_DATA/setup32.ins

    r6f431c r14bf43  
    77requiredWinstVersion >= "4.10.8.6" 
    88 
    9 DefVar $MsiId32$ 
     9DefVar $MsiId$ 
    1010DefVar $UninstallProgram32$ 
    11 DefVar $MsiId64$ 
    12 DefVar $UninstallProgram64$ 
    1311DefVar $LogDir$ 
    1412DefVar $ProductId$   
    1513DefVar $MinimumSpace$ 
    16 DefVar $InstallDir32$ 
    17 DefVar $InstallDir64$ 
    1814DefVar $ExitCode$ 
    1915DefVar $LicenseRequired$ 
    2016DefVar $LicenseKey$ 
    2117DefVar $LicensePool$ 
    22 DefVar $INST_SystemType$ 
    23 DefVar $INST_architecture$ 
    24 DefVar $JAVA32_17EXE$ 
    25 DefVar $JAVA32_17VER$ 
    2618DefVar $InstallPlugins$ 
    2719 
    28  
    29 Set $INST_SystemType$ = GetSystemType 
    30 set $INST_architecture$ = GetProductProperty("install_architecture","system specific") 
    31  
    32 set $JAVA32_17EXE$="jre-7u45-windows-i586.exe" 
    33 set $JAVA32_17VER$="jre1.7.0_45" 
    3420set $InstallPlugins$ = "IEXPLORER=1 MOZILLA=1" 
    3521 
     
    5238; therefore please: only lower letters, no umlauts,  
    5339; no white space use '-' as a seperator 
    54 Set $ProductId$       = "Java7u45" 
     40Set $ProductId$       = "java745" 
    5541Set $MinimumSpace$    = "1 MB" 
    5642; the path were we find the product after the installation 
    57 Set $InstallDir32$      = "%ProgramFiles32Dir%\<path to the product>" 
    58 Set $InstallDir64$      = "%ProgramFiles64Dir%\<path to the product>" 
    5943Set $LicenseRequired$ = "false" 
    6044Set $LicensePool$     = "p_" + $ProductId$ 
     
    8064         
    8165        comment "installing" 
    82  
    8366        Message "Installing " + $ProductId$ + " 32 Bit..." 
    8467        comment "Start setup program" 
    85         Winbatch_java_1_7_silent_install_32 
     68        dosinanicon_install 
     69        Winbatch_java_install 
    8670        Sub_check_exitcode 
    87         comment "Copy files" 
    88         Files_install_32 /32Bit 
    89         comment "Patch Registry" 
    90         Registry_install /32Bit 
    91         comment "Create shortcuts" 
    92         LinkFolder_install 
    93  
    9471endif    
    9572 
     
    12097endif 
    12198 
    122 [Winbatch_java_1_7_silent_install_32] 
    123 %SCRIPTPATH%\custom\$JAVA32_17EXE$ /s /v"/qb-! /lie c:\tmp\$JAVA32_17VER$.log ADDLOCAL=ALL $InstallPlugins$  REBOOT=ReallySuppess SYSTRAY=0 JAVAUPDATE=0 JU=0 AUTOUPDATECHECK=0 ARPURLUPDATEINFO='http://www.opsi.org'" 
     99[dosinanicon_install] 
     100taskkill /f /im iexplore.exe /t 
    124101 
    125  
    126 [Winbatch_install] 
    127 ; === MSI package ======================================================================================= 
    128 ;msiexec /i "%ScriptPath%\custom\capicom_dc_sdk.msi" /qb-! 
    129  
    130 [dosinanicon_install] 
    131 ;regsvr32 /s "C:\Programme\Microsoft CAPICOM 2.1.0.2 SDK\Lib\X86\capicom.dll" 
    132 ;cscript "C:\Programme\Microsoft CAPICOM 2.1.0.2 SDK\Samples\vbs\CStore.vbs" import c:\Sky\PZ-7462673.pfx t1akXk9Zpi 
     102[Winbatch_java_install] 
     103"$Install32Exe$" /s /v "/qb-! ADDLOCAL=ALL $InstallPlugins$  REBOOT=ReallySuppess SYSTRAY=0 JAVAUPDATE=0 JU=0 AUTOUPDATECHECK=0" 
  • CLIENT_DATA/uninstall32.ins

    r6f431c r14bf43  
    77requiredWinstVersion >= "4.10.8.6" 
    88 
    9 DefVar $MsiId32$ 
    10 DefVar $UninstallProgram32$ 
    11 DefVar $MsiId64$ 
    12 DefVar $UninstallProgram64$ 
     9DefVar $MsiId$ 
    1310DefVar $LogDir$ 
    1411DefVar $ExitCode$ 
    1512DefVar $ProductId$ 
    16 DefVar $InstallDir32$ 
    17 DefVar $InstallDir64$ 
    18 DefVar $LicenseRequired$ 
    19 DefVar $LicensePool$ 
    20 DefVar $INST_SystemType$ 
    21 DefVar $INST_architecture$ 
    22  
    23 Set $INST_SystemType$ = GetSystemType 
    24 set $INST_architecture$ = GetProductProperty("install_architecture","system specific") 
    25  
    2613 
    2714Set $LogDir$ = "%SystemDrive%\tmp" 
     
    4027; - Please edit the following values                             - 
    4128; ---------------------------------------------------------------- 
    42 Set $ProductId$       = "adobeflash" 
    43 Set $InstallDir32$    = "%ProgramFiles32Dir%\<path to the product>" 
    44 Set $InstallDir64$    = "%ProgramFiles64Dir%\<path to the product>" 
    45 Set $LicenseRequired$ = "false" 
    46 Set $LicensePool$     = "p_" + $ProductId$ 
     29Set $ProductId$       = "java745" 
    4730; ---------------------------------------------------------------- 
    4831 
     
    5336Message "Uninstalling " + $ProductId$ + " ..." 
    5437 
    55 if FileExists("%ScriptPath%\delsub3264.ins") 
     38if FileExists("%ScriptPath%\delsub32.ins") 
    5639        comment "Start uninstall sub section" 
    57         Sub "%ScriptPath%\delsub3264.ins" 
     40        Sub "%ScriptPath%\delsub32.ins" 
    5841endif 
    5942 
    60 if $LicenseRequired$ = "true" 
    61         comment "Licensing required, free license used" 
    62         Sub_free_license 
    63 endif 
    6443 
    65 [Sub_free_license] 
    66 comment "License management is enabled and will be used" 
    67  
    68 comment "Trying to free license used for the product" 
    69 DefVar $result$ 
    70 Set $result$ = FreeLicense($LicensePool$) 
    71 ; If there is an assignment of a license pool to the product, it is possible to use 
    72 ; Set $result$ = FreeLicense("", $ProductId$) 
    73 ; 
    74 ; If there is an assignment of a license pool to a windows software id, it is possible to use 
    75 ; DefVar $WindowsSoftwareId$ 
    76 ; $WindowsSoftwareId$ = "..." 
    77 ; set $result$ = FreeLicense("", "", $WindowsSoftwareId$) 
    78  
    79  
  • OPSI/control

    r6f431c r14bf43  
    66[Product] 
    77type: localboot 
    8 id: oracle.java7u45 
    9 name: java7u45 
    10 description: Java Pakage 
     8id: oracle.java745 
     9name: java745 
     10description: Java for 32bit browser 
    1111advice: ADVICE 
    1212version: VERSION 
     
    2121customScript: 
    2222userLoginScript: 
    23  
    24 [ProductProperty] 
    25 type: unicode 
    26 name: install_architecture 
    27 multivalue: False 
    28 editable: False 
    29 description: which architecture (32/64 bit) has to be installed 
    30 values: ["32 only", "64 only", "both", "system specific"] 
    31 default: ["system specific"] 
  • builder-product.cfg

    r6f431c r14bf43  
    33############################ 
    44VENDOR="oracle.com" 
    5 PN="oracle.java7u45" 
     5PN="oracle.java745" 
    66VERSION="1" 
    77RELEASE="1" 
     
    1313TYPE="public" 
    1414 
    15 DL_FILE[0]="adobeflash.png" 
    16 DL_SOURCE[0]="http://www.veryicon.com/icon/png/Application/Adobe%20Symbolism%20CS3/Flash%20Player.png" 
     15DL_FILE[0]="java745.png" 
     16DL_SOURCE[0]="http://www.veryicon.com/icon/128/System/Cristal%20Intense/Java.png" 
     17 
     18DL_FILE[1]="java745.exe" 
     19DL_SOURCE[1]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=81819" 
     20DL_ARCH[1]="X86" 
     21DL_WINST_NAME[1]=Install32Exe 
     22 
    1723 
    1824# File array index for the image showing while installing the program 
Note: See TracChangeset for help on using the changeset viewer.