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

Integrate Richtendo's .NET 4.0 and 4.5 and move F-Sharp to its own package.xml and correct typo in msvc package xml and make some general cleanups and corrections

Browse Source
This commit is contained in:
Mario Fetka
2013-09-04 23:13:44 +02:00
parent af337d872b
commit c6336eba28
18 changed files with 163 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CLIENT_DATA/AdobeAIR_7zip_config.txt
View File

@@ -1,6 +1,6 @@
;!@Install@!UTF-8!
RunProgram="air3-8_win.exe -silent -eulaAccepted"
ExtractTitle="Geos One Adobe Air 3.8 Installer"
ExtractDialogText="Extracting Adobe AIR 3.8"
RunProgram="air3-9_win.exe -silent -eulaAccepted"
ExtractTitle="Geos One Adobe Air 3.9 Installer"
ExtractDialogText="Extracting Adobe AIR 3.9"
GUIMode="1"
;!@InstallEnd@!

0
CLIENT_DATA/GeosOne_BR_package.xml Executable file → Normal file
View File

6
CLIENT_DATA/Ricktendo_FS_package.xml Normal file
View File

@@ -0,0 +1,6 @@
<package id="msfsharp" name="Microsoft Visual F-Sharp 2.0 SE" group="Sonstige Runtimes" prereq="msjsharp">
<check type="file" condition="notexist" path="%Windir%\Microsoft.NET\Framework\v4.0.30319\FSharp.Core.dll" />
<install>
<cmd name="Microsoft Visual F-Sharp 2.0" path="fsharpredist2.0.msi" param="/qb!"/>
</install>
</package>

8
CLIENT_DATA/Ricktendo_JS_package.xml
View File

@@ -1,9 +1,7 @@
<package id="msjsharp" name="Microsoft Visual J/F-Sharp 2.0 SE" group="Sonstige Runtimes">
<package id="msjsharp" name="Microsoft Visual J-Sharp 2.0 SE" group="Sonstige Runtimes">
<check type="file" condition="notexist" path="%Windir%\Microsoft.NET\Framework\VJSharp\vjshost.dll" />
<install>
<cmd name="Microsoft Visual J-Sharp 2.0 SE" path="vjsharp\x86\jsredist.msi" param="/qb!" arch="x86" />
<cmd name="Microsoft Visual F-Sharp 2.0" path="fsharp\fsharpredist2.0.msi" param="/qb!" arch="x86" />
<cmd name="Microsoft Visual J-Sharp 2.0 SE x64" path="vjsharp\x64\jsredist.msi" param="/qb!" arch="x64" />
<cmd name="Microsoft Visual F-Sharp 2.0 x64" path="fsharp\fsharpredist2.0.msi" param="/qb!" arch="x64" />
<cmd name="Microsoft Visual J-Sharp 2.0 SE" path="x86\jsredist.msi" param="/qb!" arch="x86" />
<cmd name="Microsoft Visual J-Sharp 2.0 SE x64" path="x64\jsredist.msi" param="/qb!" arch="x64" />
</install>
</package>

11
CLIENT_DATA/Ricktendo_NET40_package.xml Normal file
View File

@@ -0,0 +1,11 @@
<package id="net4.0" name=".NET Framework 4.0 + Hotfixes" group="Microsoft .NET Framework" priority="43">
<check type="os" condition="<" value="6.0.6002.0" />
<check type="file" condition="notexist" path="%Windir%\Microsoft.NET\Framework\v4.0.30319\System.dll" />
<install>
<cmd arch="x86" name=".NET Framework 4.0 - Core" path="netfx_core_x86.msi" param="/norestart /qb-!" />
<cmd arch="x86" name=".NET Framework 4.0 - Extended" path="netfx_extended_x86.msi" param="/norestart /qb-!" />
<cmd arch="x64" name=".NET Framework 4.0 x64 - Core" path="netfx_core_x64.msi" param="/norestart /qb-!" />
<cmd arch="x64" name=".NET Framework 4.0 x64 - Extended" path="netfx_extended_x64.msi" param="/norestart /qb-!" />
</install>
</package>

10
CLIENT_DATA/Ricktendo_NET45_package.xml Normal file
View File

@@ -0,0 +1,10 @@
<package id="net4.5" name=".NET Framework 4.5" group="Microsoft .NET Framework" priority="44">
<check type="os" condition=">" value="6.0.6002.0" />
<check type="os" condition="<" value="6.2.9200.0" />
<check type="file" condition="notexist" path="%Windir%\Microsoft.NET\Framework\v4\System.dll" />
<check type="file" condition="notexist" path="%Windir%\Microsoft.NET\Framework\v4.0.30319\Config\NetFx45_IIS_schema_update.xml" />
<install>
<cmd arch="x86" path="netfx_Full_x86.msi" param="/norestart /qb-!" />
<cmd arch="x64" path="netfx_Full_x64.msi" param="/norestart /qb-!" />
</install>
</package>

20
CLIENT_DATA/Ricktendo_VC_package.xml
View File

@@ -2,44 +2,44 @@
<variable name="NAME" value="Visual C++" />
<install>
<cmd name="%NAME% 2005" path="2005\x86\vcredist.msi" param="/qb!">
<cmd name="%NAME% 2005" path="2005\x86\vcredist.msi" param="/qb! REBOOT=ReallySuppress">
<check type="file" condition="<" path="%commonprogramfiles%\microsoft shared\VC\msdia80.dll" value="5.0.50727.6229" arch="x86" />
<check type="file" condition="<" path="%programfiles(x86)%\Common Files\microsoft shared\VC\msdia80.dll" value="5.0.50727.6229" arch="x64" />
</cmd>
<cmd name="%NAME% 2008" path="2008\x86\vc_red.msi" param="/qb!">
<cmd name="%NAME% 2008" path="2008\x86\vc_red.msi" param="/qb! REBOOT=ReallySuppress">
<check type="file" condition="<" path="%commonprogramfiles%\microsoft shared\VC\msdia90.dll" value="5.0.30729.7523" arch="x86" />
<check type="file" condition="<" path="%programfiles(x86)%\Common Files\microsoft shared\VC\msdia90.dll" value="5.0.30729.7523" arch="x64" />
</cmd>
<cmd name="%NAME% 2010" path="2010\x86\vc_red.msi" param="/qb!">
<cmd name="%NAME% 2010" path="2010\x86\vc_red.msi" param="/qb! REBOOT=ReallySuppress">
<check type="file" condition="<" path="%commonprogramfiles%\microsoft shared\VC\msdia100.dll" value="50.0.40219.1" arch="x86" />
<check type="file" condition="<" path="%programfiles(x86)%\Common Files\microsoft shared\VC\msdia100.dll" value="50.0.40219.1" arch="x64" />
</cmd>
<cmd name="%NAME% 2012 Minimum" path="2012\x86\vc_runtimeMinimum_x86.msi" param="/qb!">
<cmd name="%NAME% 2012 Minimum" path="2012\x86\vc_runtimeMinimum_x86.msi" param="/qb! REBOOT=ReallySuppress">
<check type="os" condition=">" value="6.0.6002.0" />
<check type="file" condition="<" path="%windir%\system32\atl110.dll" value="51.0.60610.1" arch="x86" />
<check type="file" condition="<" path="%windir%\syswow64\atl110.dll" value="51.0.60610.1" arch="x64" />
</cmd>
<cmd name="%NAME% 2012 Additional" path="2012\x86\vc_runtimeAdditional_x86.msi" param="/qb!">
<cmd name="%NAME% 2012 Additional" path="2012\x86\vc_runtimeAdditional_x86.msi" param="/qb! REBOOT=ReallySuppress">
<check type="os" condition=">" value="6.0.6002.0" />
<check type="file" condition="<" path="%windir%\system32\atl110.dll" value="51.0.60610.1" arch="x86" />
<check type="file" condition="<" path="%windir%\syswow64\atl110.dll" value="51.0.60610.1" arch="x64" />
</cmd>
<cmd arch="x64" name="%NAME% 2005 x64" path="2005\x64\vcredist.msi" param="/q">
<cmd arch="x64" name="%NAME% 2005 x64" path="2005\x64\vcredist.msi" param="/qb! REBOOT=ReallySuppress">
<check type="file" condition="<" path="%programfiles(x86)%\Common Files\microsoft shared\VC\amd64\msdia80.dll" value="5.0.50727.6229"/>
</cmd>
<cmd arch="x64" name="%NAME% 2008 x64" path="2008\x64\vc_red.msi" param="/qb!">
<cmd arch="x64" name="%NAME% 2008 x64" path="2008\x64\vc_red.msi" param="/qb! REBOOT=ReallySuppress">
<check type="file" condition="<" path="%commonprogramfiles%\Microsoft Shared\VC\msdia90.dll" value="5.0.30729.7523"/>
</cmd>
<cmd arch="x64" name="%NAME% 2010 x64" path="2010\x64\vc_red.msi" param="/qb!">
<cmd arch="x64" name="%NAME% 2010 x64" path="2010\x64\vc_red.msi" param="/qb! REBOOT=ReallySuppress">
<check type="file" condition="<" path="%commonprogramfiles%\Microsoft Shared\VC\msdia100.dll" value="50.0.40219.1"/>
</cmd>
<cmd arch="x64" name="%NAME% 2012 Minimum x64" path="2012\x64\vc_runtimeMinimum_x64.msi" param="/qb!">
<cmd arch="x64" name="%NAME% 2012 Minimum x64" path="2012\x64\vc_runtimeMinimum_x64.msi" param="/qb! REBOOT=ReallySuppress">
<check type="os" condition=">" value="6.0.6002.0" />
<check type="file" condition="<" path="%windir%\syswow64\atl110.dll" value="51.0.60610.1"/>
</cmd>
<cmd arch="x64" name="%NAME% 2012 Additional x64" path="2012\x64\vc_runtimeAdditional_x64.msi" param="/qb!">
<cmd arch="x64" name="%NAME% 2012 Additional x64" path="2012\x64\vc_runtimeAdditional_x64.msi" param="/qb! REBOOT=ReallySuppress">
<check type="os" condition=">" value="6.0.6002.0" />
<check type="file" condition="<" path="%windir%\syswow64\atl110.dll" value="51.0.60610.1"/>
</cmd>

16
CLIENT_DATA/cleanup3264.ins
View File

@@ -73,6 +73,11 @@ if ($sereby_msjsharp$ = "reinstall")
opsiservicecall_msjsharp_uninstall
Set $reboot$ = "true"
endif
if ($sereby_msfsharp$ = "reinstall")
Winbatch_msfsharp_uninstall
opsiservicecall_msfsharp_uninstall
Set $reboot$ = "true"
endif
if ($sereby_silver$ = "reinstall")
Winbatch_silver_uninstall
opsiservicecall_silver_uninstall
@@ -208,6 +213,17 @@ endif
"%opsiserviceUser%"
]
[Winbatch_msfsharp_uninstall]
[opsiservicecall_msfsharp_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_msfsharp",
"install",
"%opsiserviceUser%"
]
[Winbatch_silver_uninstall]
; wmic product where caption='Microsoft Silverlight' call uninstall
"%ScriptPath%\UnInstall\Package\Silverlight\CleanSilverlight.cmd"

7
CLIENT_DATA/config3264.ins
View File

@@ -22,6 +22,9 @@ endif
if ($sereby_msjsharp$ = "install")
DosInAnIcon_msjsharp_config
endif
if ($sereby_msfsharp$ = "install")
DosInAnIcon_msfsharp_config
endif
if ($sereby_silver$ = "install")
DosInAnIcon_silver_config
endif
@@ -89,6 +92,10 @@ xml ed -O -u "/settings/set[@component='net4.5']/@checked" -v 1 "$LogDir$\WinPKG
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='msjsharp']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[DosInAnIcon_msfsharp_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='msfsharp']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[DosInAnIcon_silver_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='silver']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"

2
CLIENT_DATA/define3264.inc
View File

@@ -18,6 +18,8 @@ DefVar $sereby_dotnet4.5$
Set $sereby_dotnet4.5$ = GetProductProperty("sereby_dotnet4.5", "install")
DefVar $sereby_msjsharp$
Set $sereby_msjsharp$ = GetProductProperty("sereby_msjsharp", "install")
DefVar $sereby_msfsharp$
Set $sereby_msfsharp$ = GetProductProperty("sereby_msfsharp", "install")
DefVar $sereby_silver$
Set $sereby_silver$ = GetProductProperty("sereby_silver", "install")
DefVar $sereby_jre$