add windows 8 support via extracting the .net3 framwork out of the windows a test verison
This commit is contained in:
Mario Fetka
@@ -1,9 +1,3 @@
|
||||
DefVar $MSVersion$
|
||||
Set $MSVersion$ = GetMsVersionInfo
|
||||
|
||||
DefVar $java_reinstall$
|
||||
Set $java_reinstall$ = GetProductProperty("java_reinstall", "1")
|
||||
|
||||
DefVar $timer_value$
|
||||
Set $timer_value$ = GetProductProperty("timer_value", "40")
|
||||
DefVar $timer_enabled$
|
||||
|
||||
@@ -4,10 +4,8 @@
|
||||
; credits: http://www.opsi.org/en/credits/
|
||||
|
||||
|
||||
Set $UninstallProgram32$ = $InstallDir32$ + "\" + $UninstallProg32$
|
||||
Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
|
||||
|
||||
Set $UninstallProgram64$ = $InstallDir64$ + "\" + $UninstallProg64$
|
||||
Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini"
|
||||
|
||||
if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
; credits: http://www.opsi.org/en/credits/
|
||||
|
||||
[Actions]
|
||||
include_appent setup3264.inc
|
||||
|
||||
requiredWinstVersion >= "4.11.2.6"
|
||||
|
||||
DefVar $UninstallProgram32$
|
||||
@@ -30,6 +32,12 @@ DefVar $OnceUninstallDone64$
|
||||
Set $INST_SystemType$ = GetSystemType
|
||||
set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
|
||||
|
||||
DefVar $java_reinstall$
|
||||
Set $java_reinstall$ = GetProductProperty("java_reinstall", "1")
|
||||
|
||||
DefVar $MSVersion$
|
||||
Set $MSVersion$ = GetMsVersionInfo
|
||||
|
||||
Set $LogDir$ = "%SystemDrive%\tmp"
|
||||
|
||||
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
|
||||
@@ -84,6 +92,18 @@ else
|
||||
ChangeDirectory "%SCRIPTPATH%"
|
||||
comment "Copy files"
|
||||
Files_install_32 /32Bit
|
||||
|
||||
if ( $MSVersion$ = "6.2" ) and (($dotnet3.5$ = "install") or ($dotnet3.0$ = "install") or ($dotnet2.0$ = "install")) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll"))
|
||||
comment "Install Netframework 2.0 - 3.5 for Windows 8"
|
||||
if (FileExists("%ScriptPath%\Install\NET8\amd64_addinprocess32_b77a5c561934e089_6.2.9200.16384_none_d9d957a176ab19d8\addinprocess32.exe"))
|
||||
Message "Install Netframework 2.0 - 3.5 for Windows 8"
|
||||
Dosbatch_install_dotNet_2-3.5_8 winst /SysNative
|
||||
else
|
||||
LogError "Not compatible without Netframework 3.5 for Windows 8"
|
||||
isFatalError
|
||||
endif
|
||||
endif
|
||||
|
||||
if ($java_reinstall$ = "1")
|
||||
Message "Uninstalling " + "Java" + " 32 + 64 Bit..."
|
||||
Dosbatch_java_reinstall
|
||||
@@ -102,6 +122,18 @@ else
|
||||
ChangeDirectory "%SCRIPTPATH%"
|
||||
comment "Copy files"
|
||||
Files_install_64 /64Bit
|
||||
|
||||
if ( $MSVersion$ = "6.2" ) and (($dotnet3.5$ = "install") or ($dotnet3.0$ = "install") or ($dotnet2.0$ = "install")) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll"))
|
||||
comment "Install Netframework 2.0 - 3.5 for Windows 8"
|
||||
if (FileExists("%ScriptPath%\Install\NET8\amd64_addinprocess32_b77a5c561934e089_6.2.9200.16384_none_d9d957a176ab19d8\addinprocess32.exe"))
|
||||
Message "Install Netframework 2.0 - 3.5 for Windows 8"
|
||||
Dosbatch_install_dotNet_2-3.5_8 winst /SysNative
|
||||
else
|
||||
LogError "Not compatible without Netframework 3.5 for Windows 8"
|
||||
isFatalError
|
||||
endif
|
||||
endif
|
||||
|
||||
if ($java_reinstall$ = "1")
|
||||
Message "Uninstalling " + "Java" + " 32 + 64 Bit..."
|
||||
Dosbatch_java_reinstall
|
||||
@@ -118,8 +150,6 @@ else
|
||||
ExitWindows /Reboot
|
||||
endif
|
||||
|
||||
include_insert setup3264.inc
|
||||
|
||||
[Registry_install]
|
||||
; Example of setting some values of an registry key:
|
||||
;
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
[Dosbatch_install_dotNet_2-3.5_8]
|
||||
@echo off
|
||||
dism /online /enable-feature /featurename:NetFx3 /All /Source:%ScriptPath%\Install\NET8 /LimitAccess
|
||||
|
||||
[Dosbatch_java_reinstall]
|
||||
@echo off
|
||||
cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /keeponly
|
||||
|
||||
[Dosbatch_install_32]
|
||||
[DosInAnIcon_install_32]
|
||||
@echo off
|
||||
%ScriptDrive%
|
||||
cd "%ScriptPath%\Install"
|
||||
@@ -12,7 +17,7 @@ WinPKG.exe
|
||||
copy "$IniCfgFile$" "$InstallDir32$"
|
||||
copy -s "%ScriptPath%\Install\WinPKG.exe" "$InstallDir32$"
|
||||
|
||||
[Dosbatch_install_64]
|
||||
[DosInAnIcon_install_64]
|
||||
@echo off
|
||||
%ScriptDrive%
|
||||
cd "%ScriptPath%\Install"
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
; credits: http://www.opsi.org/en/credits/
|
||||
|
||||
[Actions]
|
||||
include_appent setup3264.inc
|
||||
|
||||
requiredWinstVersion >= "4.11.2.6"
|
||||
|
||||
DefVar $UninstallProgram32$
|
||||
@@ -30,6 +32,12 @@ DefVar $OnceUninstallDone64$
|
||||
Set $INST_SystemType$ = GetSystemType
|
||||
set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
|
||||
|
||||
DefVar $java_reinstall$
|
||||
Set $java_reinstall$ = GetProductProperty("java_reinstall", "1")
|
||||
|
||||
DefVar $MSVersion$
|
||||
Set $MSVersion$ = GetMsVersionInfo
|
||||
|
||||
Set $LogDir$ = "%SystemDrive%\tmp"
|
||||
|
||||
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
|
||||
@@ -84,11 +92,25 @@ else
|
||||
ChangeDirectory "%SCRIPTPATH%"
|
||||
comment "Copy files"
|
||||
Files_install_32 /32Bit
|
||||
|
||||
if ( $MSVersion$ = "6.2" ) and (($dotnet3.5$ = "install") or ($dotnet3.0$ = "install") or ($dotnet2.0$ = "install")) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll"))
|
||||
comment "Install Netframework 2.0 - 3.5 for Windows 8"
|
||||
if (FileExists("%ScriptPath%\Install\NET8\amd64_addinprocess32_b77a5c561934e089_6.2.9200.16384_none_d9d957a176ab19d8\addinprocess32.exe"))
|
||||
Message "Install Netframework 2.0 - 3.5 for Windows 8"
|
||||
Dosbatch_install_dotNet_2-3.5_8 winst /SysNative
|
||||
else
|
||||
LogError "Not compatible without Netframework 3.5 for Windows 8"
|
||||
isFatalError
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
if ($java_reinstall$ = "1")
|
||||
Message "Uninstalling " + "Java" + " 32 + 64 Bit..."
|
||||
Dosbatch_java_reinstall
|
||||
endif
|
||||
Dosbatch_install_32
|
||||
|
||||
DosInAnIcon_install_32
|
||||
Sub_check_exitcode
|
||||
comment "Patch Registry"
|
||||
Registry_install /32Bit
|
||||
@@ -102,15 +124,29 @@ else
|
||||
ChangeDirectory "%SCRIPTPATH%"
|
||||
comment "Copy files"
|
||||
Files_install_64 /64Bit
|
||||
|
||||
if ( $MSVersion$ = "6.2" ) and (($dotnet3.5$ = "install") or ($dotnet3.0$ = "install") or ($dotnet2.0$ = "install")) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll"))
|
||||
comment "Install Netframework 2.0 - 3.5 for Windows 8"
|
||||
if (FileExists("%ScriptPath%\Install\NET8\amd64_addinprocess32_b77a5c561934e089_6.2.9200.16384_none_d9d957a176ab19d8\addinprocess32.exe"))
|
||||
Message "Install Netframework 2.0 - 3.5 for Windows 8"
|
||||
Dosbatch_install_dotNet_2-3.5_8 winst /SysNative
|
||||
else
|
||||
LogError "Not compatible without Netframework 3.5 for Windows 8"
|
||||
isFatalError
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
if ($java_reinstall$ = "1")
|
||||
Message "Uninstalling " + "Java" + " 32 + 64 Bit..."
|
||||
Dosbatch_java_reinstall
|
||||
endif
|
||||
Dosbatch_install_64
|
||||
DosInAnIcon_install_64
|
||||
Sub_check_exitcode
|
||||
comment "Patch Registry"
|
||||
Registry_install /64Bit
|
||||
comment "Create shortcuts"
|
||||
|
||||
LinkFolder_install
|
||||
endif
|
||||
|
||||
@@ -118,8 +154,6 @@ else
|
||||
ExitWindows /Reboot
|
||||
endif
|
||||
|
||||
include_insert setup3264.inc
|
||||
|
||||
[Registry_install]
|
||||
; Example of setting some values of an registry key:
|
||||
;
|
||||
|
||||
Reference in New Issue
Block a user