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

First round on integrationg dotnet for win8.0 into winpkg

Browse Source
This commit is contained in:
Mario Fetka 2013-07-27 07:57:56 +02:00
parent f807b2bbe7
commit 367fdb0c38
2 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CLIENT_DATA/setup3264.ins
View File

@ -90,17 +90,6 @@ else
Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..." Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
comment "Start setup program" comment "Start setup program"
ChangeDirectory "%SCRIPTPATH%" ChangeDirectory "%SCRIPTPATH%"
if ( $MSVersion$ = "6.2" ) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll")) and (($sereby_dotnet3.5$ = "install") or ($sereby_dotnet3.0$ = "install") or ($sereby_dotnet2.0$ = "install"))
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_dotNet8 winst /SysNative
else
LogError "Not compatible without Netframework 3.5 for Windows 8"
isFatalError
endif
endif
Winbatch_install Winbatch_install
Sub_check_exitcode Sub_check_exitcode
comment "Copy files" comment "Copy files"
@ -115,17 +104,6 @@ else
Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..." Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
comment "Start setup program" comment "Start setup program"
ChangeDirectory "%SCRIPTPATH%" ChangeDirectory "%SCRIPTPATH%"
if ( $MSVersion$ = "6.2" ) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll")) and (($sereby_dotnet3.5$ = "install") or ($sereby_dotnet3.0$ = "install") or ($sereby_dotnet2.0$ = "install"))
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_dotNet8 winst /SysNative
else
LogError "Not compatible without Netframework 3.5 for Windows 8"
isFatalError
endif
endif
Winbatch_install Winbatch_install
Sub_check_exitcode Sub_check_exitcode
comment "Copy files" comment "Copy files"
@ -141,10 +119,6 @@ else
endif endif
[Dosbatch_install_dotNet8]
@echo off
dism /online /enable-feature /featurename:NetFx3 /All /Source:%ScriptPath%\Install\NET\WIN8.0 /LimitAccess
[Winbatch_install] [Winbatch_install]
"%ScriptPath%\Install\opsi-WinPKG.exe" "%ScriptPath%\Install\opsi-WinPKG.exe"

20
builder-targets-cb.sh
View File

@ -73,6 +73,26 @@ function create() {
echo "set arch=%1" >> $INST_DIR/CLIENT_DATA/Install/NET/3.5/_Install.bat echo "set arch=%1" >> $INST_DIR/CLIENT_DATA/Install/NET/3.5/_Install.bat
echo "call %~dp0\%arch%\_Install.bat" >> $INST_DIR/CLIENT_DATA/Install/NET/3.5/_Install.bat echo "call %~dp0\%arch%\_Install.bat" >> $INST_DIR/CLIENT_DATA/Install/NET/3.5/_Install.bat
# disable std .net installers on win8+
for NETVER in 1.1 2.0 3.0 3.5
do
sed 's/.*\t<\/install>.*/\t\t<check type="os" condition="<" value="6.2.9200.0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
done
# Integrate .net for win8.0 into winpkg
for NETVER in 2.0 3.0 3.5
do
sed -e '/^<\/package>/d' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
echo "<install>" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
echo "<cmd path=\"_Install80.bat\" />" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
echo "<check type=\"file\" condition=\"notexist\" path=\"%Windir%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll\" />" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
echo "<check type=\"os\" condition=\">=\" value=\"6.2.9200.0\" />" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
echo "</install>" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
echo "</package>" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install80.bat
echo "dism /online /enable-feature /featurename:NetFx3 /All /Source:%~dp0\..\WIN8.0 /LimitAccess" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install80.bat
done
# sed everything to disabled # 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 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