go-opsi/sereby.aio
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add windows 8 support via extracting the .net3 framwork out of the windows a test verison

Browse Source
This commit is contained in:
Mario Fetka 2013-03-18 05:58:53 +01:00
parent c1755ed6fe
commit 71c4281418
9 changed files with 122 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO.sha1sum Normal file
View File

@ -0,0 +1 @@
0de8c1b561fcf52d6f0b49ac8b38191acbd337d0 /home/mario/.opsi-dist-cache/sereby.aio-2.0.3.1/X86/9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO

1
9200.16384.WIN8_RTM.120725-1247_X86FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X86FREE_DE-DE_DV5.ISO.sha1sum Normal file
View File

@ -0,0 +1 @@
c4ed4f602e5f3e14fa08f790e5efe2707da3faf5 /home/mario/.opsi-dist-cache/sereby.aio-2.0.3.1/X86/9200.16384.WIN8_RTM.120725-1247_X86FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X86FREE_DE-DE_DV5.ISO

6
CLIENT_DATA/config3264.ins
View File

@ -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$

2
CLIENT_DATA/delsub3264.ins
View File

@ -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")

34
CLIENT_DATA/once3264.ins
View File

@ -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:
;

9
CLIENT_DATA/setup3264.inc
View File

@ -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"

42
CLIENT_DATA/setup3264.ins
View File

@ -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:
;

54
builder-product.cfg
View File

@ -37,42 +37,42 @@ DL_ARCH[2]="X86"
DL_EXTRACT_FORMAT[2]="7zip"
DL_EXTRACT_TO[2]="dimpel"
#DL_FILE[3]="9200.16384.WIN8_RTM.120725-1247_X86FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X86FREE_DE-DE_DV5.ISO"
#DL_SOURCE[3]="http://care.dlservice.microsoft.com/dl/download/A/5/5/A55BCF48-BF3E-4D76-AC0A-2DEC2B7F5DE1/9200.16384.WIN8_RTM.120725-1247_X86FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X86FREE_DE-DE_DV5.ISO"
#DL_ARCH[3]="X86"
#DL_EXTRACT_FORMAT[3]="7zip"
#DL_EXTRACT_TO[3]="win8dotnet35"
DL_FILE[3]="9200.16384.WIN8_RTM.120725-1247_X86FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X86FREE_DE-DE_DV5.ISO"
DL_SOURCE[3]="http://care.dlservice.microsoft.com/dl/download/A/5/5/A55BCF48-BF3E-4D76-AC0A-2DEC2B7F5DE1/9200.16384.WIN8_RTM.120725-1247_X86FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X86FREE_DE-DE_DV5.ISO"
DL_ARCH[3]="X86"
DL_EXTRACT_FORMAT[3]="7zip"
DL_EXTRACT_TO[3]="win8dotnet35"
#DL_FILE[4]="9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO"
#DL_SOURCE[4]="http://care.dlservice.microsoft.com/dl/download/A/5/5/A55BCF48-BF3E-4D76-AC0A-2DEC2B7F5DE1/9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO"
#DL_ARCH[4]="X86"
#DL_EXTRACT_FORMAT[4]="7zip"
#DL_EXTRACT_TO[4]="win8dotnet35"
DL_FILE[4]="9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO"
DL_SOURCE[4]="http://care.dlservice.microsoft.com/dl/download/A/5/5/A55BCF48-BF3E-4D76-AC0A-2DEC2B7F5DE1/9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO"
DL_ARCH[4]="X86"
DL_EXTRACT_FORMAT[4]="7zip"
DL_EXTRACT_TO[4]="win8dotnet35"
##################
### Uninstallers
##################
DL_FILE[3]="dotnetfx_5F00_cleanup_5F00_tool.zip"
DL_SOURCE[3]="http://blogs.msdn.com/cfs-file.ashx/__key/CommunityServer-Components-PostAttachments/00-08-90-44-93/dotnetfx_5F00_cleanup_5F00_tool.zip"
DL_ARCH[3]="X86"
DL_EXTRACT_FORMAT[3]="unzip"
DL_EXTRACT_TO[3]="dotnet"
DL_FILE[4]="JavaRa-2.1.zip"
DL_SOURCE[4]="http://download.thewebatom.net/50f69935741f0/JavaRa-2.1.zip"
DL_ARCH[4]="X86"
DL_EXTRACT_FORMAT[4]="unzip"
DL_FILE[5]="uninstall_flash_player.exe"
DL_SOURCE[5]="http://download.macromedia.com/get/flashplayer/current/support/uninstall_flash_player.exe"
DL_FILE[5]="dotnetfx_5F00_cleanup_5F00_tool.zip"
DL_SOURCE[5]="http://blogs.msdn.com/cfs-file.ashx/__key/CommunityServer-Components-PostAttachments/00-08-90-44-93/dotnetfx_5F00_cleanup_5F00_tool.zip"
DL_ARCH[5]="X86"
DL_WINST_NAME[5]=UninstallFlashExe
DL_EXTRACT_FORMAT[5]="unzip"
DL_EXTRACT_TO[5]="dotnet"
DL_FILE[6]="uninstall_shock_player.exe"
DL_SOURCE[6]="http://fpdownload.macromedia.com/get/shockwave/uninstall/win/sw_uninstaller.exe"
DL_FILE[6]="JavaRa-2.1.zip"
DL_SOURCE[6]="http://download.thewebatom.net/50f69935741f0/JavaRa-2.1.zip"
DL_ARCH[6]="X86"
DL_WINST_NAME[6]=UninstallShockExe
DL_EXTRACT_FORMAT[6]="unzip"
DL_FILE[7]="uninstall_flash_player.exe"
DL_SOURCE[7]="http://download.macromedia.com/get/flashplayer/current/support/uninstall_flash_player.exe"
DL_ARCH[7]="X86"
DL_WINST_NAME[7]=UninstallFlashExe
DL_FILE[8]="uninstall_shock_player.exe"
DL_SOURCE[8]="http://fpdownload.macromedia.com/get/shockwave/uninstall/win/sw_uninstaller.exe"
DL_ARCH[8]="X86"
DL_WINST_NAME[8]=UninstallShockExe
##################

16
builder-targets-cb.sh
View File

@ -24,6 +24,19 @@ function cleanup() {
builder_cleanup
}
function retrieve() {
echo "Retrieve"
# work around big file download for verison change
local olddir=`echo $DIST_CACHE_DIR | sed -e "s/\/[^\/]*$//"`
echo $olddir
mv $olddir/${PN}-* tempsereby
mv tempsereby $DIST_CACHE_DIR
builder_retrieve
}
function create() {
echo "Create"
builder_create
@ -39,6 +52,9 @@ function create() {
rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/Flash/* $INST_DIR/CLIENT_DATA/Install/Packages/Flash
# rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/Shockwave/* $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave
# move the Windows 8 dotnet 2 - 3.5 in place
mv -v $INST_DIR/CLIENT_DATA/X86/win8dotnet35/sources/sxs $INST_DIR/CLIENT_DATA/Install/NET8
# sed everything to disabled
sed -e "s!\"1\"!\"0\"!g" -e "s!maximized=\"0\"!maximized=\"1\"!" $INST_DIR/CLIENT_DATA/X86/WinPKG.xml > $INST_DIR/CLIENT_DATA/Config/WinPKG.xml