zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Zip task in build.xml replaced with VB script

Browse source
This commit is contained in:
feodor_fitsner 2012-10-26 14:33:55 -07:00
parent 0d0b1d2ff8
commit ace6802cee
2 changed files with 135 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

36
WebsitePanel/build.xml
View file

@ -559,12 +559,14 @@
<EnterpriseServerInstallFiles Include="$(EnterpriseServerInstall)\**\*.*" />
<ServerInstallFiles Include="$(ServerInstall)\**\*.*" />
<!--
<ImportCsvInstallFiles Include="$(ImportCsvInstall)\**\*.*" />
<HyperVUtilsInstallFiles Include="$(HyperVUtilsInstall)\**\*.*" />
<VMConfigInstallFiles Include="$(VMConfigInstall)\**\*.*" />
<HyperVUtilsInstallFiles Include="$(HyperVUtilsInstall)\**\*.*" />
<VMConfigInstallFiles Include="$(VMConfigInstall)\**\*.*" />
<ImportEnterpriseInstallFiles Include="$(ImportEnterpriseInstall)\**\*.*" />
<AWStatsViewerInstallFiles Include="$(AWStatsViewerInstall)\**\*.*" />
<WSPTransportAgentInstallFiles Include="$(WSPTransportAgentInstall)\**\*.*" />
-->
</ItemGroup>
<!-- Assemble "Standalone" package -->
@ -573,18 +575,26 @@
<Copy SourceFiles="@(ServerInstallFiles)" DestinationFolder="$(StandaloneInstall)\Server\%(RecursiveDir)" />
<!-- zip full distributives -->
<!-- zip full distributives
<ItemGroup>
<StandaloneInstallFiles Include="$(StandaloneInstall)\**\*.*" />
</ItemGroup>
-->
<!--
<Zip Files="@(PortalInstallFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-Portal-$(Version).zip" WorkingDirectory="$(PortalInstall)" />
<Zip Files="@(EnterpriseServerInstallFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version).zip" WorkingDirectory="$(EnterpriseServerInstall)" />
<Zip Files="@(ServerInstallFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-Server-$(Version).zip" WorkingDirectory="$(ServerInstall)" />
<Zip Files="@(StandaloneInstallFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-StandaloneServerSetup-$(Version).zip" WorkingDirectory="$(StandaloneInstall)" />
-->
<Exec Command="cscript $(TrunkFolder)\zip.vbs &quot;$(DeployFolder)\WebsitePanel-Portal-$(Version).zip&quot; &quot;$(PortalInstall)&quot;" />
<Exec Command="cscript $(TrunkFolder)\zip.vbs &quot;$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version).zip&quot; &quot;$(EnterpriseServerInstall)&quot;" />
<Exec Command="cscript $(TrunkFolder)\zip.vbs &quot;$(DeployFolder)\WebsitePanel-Server-$(Version).zip&quot; &quot;$(ServerInstall)&quot;" />
<Exec Command="cscript $(TrunkFolder)\zip.vbs &quot;$(DeployFolder)\WebsitePanel-StandaloneServerSetup-$(Version).zip&quot; &quot;$(StandaloneInstall)&quot;" />
<!-- zip updates -->
<!-- zip updates
<ItemGroup>
<PortalUpdateFiles Include="$(PortalUpdate)\**\*.*" />
<EnterpriseServerUpdateFiles Include="$(EnterpriseServerUpdate)\**\*.*" />
@ -593,19 +603,35 @@
<InstallerUpdateFiles Include="$(InstallerBuild)\**\*.*" />
</ItemGroup>
<Zip Files="@(PortalUpdateFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-Portal-$(Version)-Update.zip" WorkingDirectory="$(PortalUpdate)" />
<Zip Files="@(EnterpriseServerUpdateFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version)-Update.zip" WorkingDirectory="$(EnterpriseServerUpdate)" />
<Zip Files="@(ServerUpdateFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-Server-$(Version)-Update.zip" WorkingDirectory="$(ServerUpdate)" />
<Zip Files="@(ManualUpdateFiles)" ZipFileName="$(DeployFolder)\Manual-Update.zip" WorkingDirectory="$(UpdateFolder)" />
<Zip Files="@(InstallerUpdateFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-Installer-$(Version)-Update.zip" WorkingDirectory="$(InstallerBuild)" />
-->
<!-- zip tools -->
<Exec Command="cscript $(TrunkFolder)\zip.vbs &quot;$(DeployFolder)\WebsitePanel-Portal-$(Version)-Update.zip&quot; &quot;$(PortalUpdate)&quot;" />
<Exec Command="cscript $(TrunkFolder)\zip.vbs &quot;$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version)-Update.zip&quot; &quot;$(EnterpriseServerUpdate)&quot;" />
<Exec Command="cscript $(TrunkFolder)\zip.vbs &quot;$(DeployFolder)\WebsitePanel-Server-$(Version)-Update.zip&quot; &quot;$(ServerUpdate)&quot;" />
<Exec Command="cscript $(TrunkFolder)\zip.vbs &quot;$(DeployFolder)\Manual-Update.zip&quot; &quot;$(UpdateFolder)&quot;" />
<Exec Command="cscript $(TrunkFolder)\zip.vbs &quot;$(DeployFolder)\WebsitePanel-Installer-$(Version)-Update.zip&quot; &quot;$(InstallerBuild)&quot;" />
<!-- zip tools
<Zip Files="@(ImportCsvInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-Import-CsvBulk-$(Version).zip" WorkingDirectory="$(ImportCsvInstall)" />
<Zip Files="@(HyperVUtilsInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-HyperVUtils-$(Version).zip" WorkingDirectory="$(HyperVUtilsInstall)" />
<Zip Files="@(VMConfigInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-VMConfig-$(Version).zip" WorkingDirectory="$(VMConfigInstall)" />
<Zip Files="@(ImportEnterpriseInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-Import-Enterprise-$(Version).zip" WorkingDirectory="$(ImportEnterpriseInstall)" />
<Zip Files="@(AWStatsViewerInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-AWStatsViewer-$(Version).zip" WorkingDirectory="$(AWStatsViewerInstall)" />
<Zip Files="@(WSPTransportAgentInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-WSPTransportAgent-$(Version).zip" WorkingDirectory="$(WSPTransportAgentInstall)" />
-->
<Exec Command="cscript $(TrunkFolder)\zip.vbs &quot;$(DeployFolder)\WebsitePanel-Import-CsvBulk-$(Version)-Update.zip&quot; &quot;$(ImportCsvInstall)&quot;" />
<Exec Command="cscript $(TrunkFolder)\zip.vbs &quot;$(DeployFolder)\WebsitePanel-HyperVUtils-$(Version)-Update.zip&quot; &quot;$(HyperVUtilsInstall)&quot;" />
<Exec Command="cscript $(TrunkFolder)\zip.vbs &quot;$(DeployFolder)\WebsitePanel-VMConfig-$(Version)-Update.zip&quot; &quot;$(VMConfigInstall)&quot;" />
<Exec Command="cscript $(TrunkFolder)\zip.vbs &quot;$(DeployFolder)\WebsitePanel-Import-Enterprise-$(Version)-Update.zip&quot; &quot;$(ImportEnterpriseInstall)&quot;" />
<Exec Command="cscript $(TrunkFolder)\zip.vbs &quot;$(DeployFolder)\WebsitePanel-AWStatsViewer-$(Version)-Update.zip&quot; &quot;$(AWStatsViewerInstall)&quot;" />
<Exec Command="cscript $(TrunkFolder)\zip.vbs &quot;$(DeployFolder)\WebsitePanel-WSPTransportAgent-$(Version)-Update.zip&quot; &quot;$(WSPTransportAgentInstall)&quot;" />
</Target>

104
WebsitePanel/zip.vbs Normal file
View file

@ -0,0 +1,104 @@
If WScript.Arguments.Count <> 2 Then
WScript.Echo "Usage: cscript zip.vbs <zipPath> <dirToZip>"
Else
CreateZip WScript.Arguments(0), WScript.Arguments(1)
End If
Sub NewZip(pathToZipFile)
'WScript.Echo "Newing up a zip file (" & pathToZipFile & ") "
Dim fso
Set fso = CreateObject("Scripting.FileSystemObject")
Dim file
Set file = fso.CreateTextFile(pathToZipFile)
file.Write Chr(80) & Chr(75) & Chr(5) & Chr(6) & String(18, 0)
file.Close
Set fso = Nothing
Set file = Nothing
WScript.Sleep 500
End Sub
Sub CreateZip(pathToZipFile, dirToZip)
'WScript.Echo "Creating zip (" & pathToZipFile & ") from (" & dirToZip & ")"
Dim fso
Set fso= Wscript.CreateObject("Scripting.FileSystemObject")
pathToZipFile = fso.GetAbsolutePathName(pathToZipFile)
dirToZip = fso.GetAbsolutePathName(dirToZip)
If fso.FileExists(pathToZipFile) Then
'WScript.Echo "That zip file already exists - deleting it."
fso.DeleteFile pathToZipFile
End If
If Not fso.FolderExists(dirToZip) Then
'WScript.Echo "The directory to zip does not exist."
Exit Sub
End If
NewZip pathToZipFile
dim sa
set sa = CreateObject("Shell.Application")
Dim zip
Set zip = sa.NameSpace(pathToZipFile)
'WScript.Echo "opening dir (" & dirToZip & ")"
Dim d
Set d = sa.NameSpace(dirToZip)
' Look at http://msdn.microsoft.com/en-us/library/bb787866(VS.85).aspx
' for more information about the CopyHere function.
zip.CopyHere d.items, 4
Do Until d.Items.Count <= zip.Items.Count
Wscript.Sleep(200)
Loop
End Sub
Sub ExtractFilesFromZip(pathToZipFile, dirToExtractFiles)
Dim fso
Set fso = CreateObject("Scripting.FileSystemObject")
pathToZipFile = fso.GetAbsolutePathName(pathToZipFile)
dirToExtractFiles = fso.GetAbsolutePathName(dirToExtractFiles)
If (Not fso.FileExists(pathToZipFile)) Then
WScript.Echo "Zip file does not exist: " & pathToZipFile
Exit Sub
End If
If Not fso.FolderExists(dirToExtractFiles) Then
WScript.Echo "Directory does not exist: " & dirToExtractFiles
Exit Sub
End If
dim sa
set sa = CreateObject("Shell.Application")
Dim zip
Set zip = sa.NameSpace(pathToZipFile)
Dim d
Set d = sa.NameSpace(dirToExtractFiles)
' Look at http://msdn.microsoft.com/en-us/library/bb787866(VS.85).aspx
' for more information about the CopyHere function.
d.CopyHere zip.items, 4
Do Until zip.Items.Count <= d.Items.Count
Wscript.Sleep(200)
Loop
End Sub