Zip utility changed to 7z
This commit is contained in:
feodor_fitsner
parent
ace6802cee
commit
6cc1f1e8cc
2 changed files with 16 additions and 119 deletions
|
|
@ -20,6 +20,7 @@
|
|||
|
||||
<DiffCmd>$(TrunkFolder)\Tools\Diff.exe</DiffCmd>
|
||||
<SqlCmd>"C:\Program Files\Microsoft SQL Server\110\Tools\Binn\sqlcmd.exe" -S (local)\SQLEXPRESS -E</SqlCmd>
|
||||
<ZipCmd>"C:\Program Files\7-Zip\7z.exe"</ZipCmd>
|
||||
|
||||
<MSDeployPath Condition="Exists('$(ProgramFiles)\IIS\Microsoft Web Deploy\msdeploy.exe')">"$(ProgramFiles)\IIS\Microsoft Web Deploy\msdeploy.exe"</MSDeployPath>
|
||||
<MSDeployPath Condition="Exists('$(ProgramFiles)\IIS\Microsoft Web Deploy V3\msdeploy.exe')">"$(ProgramFiles)\IIS\Microsoft Web Deploy V3\msdeploy.exe"</MSDeployPath>
|
||||
|
|
@ -588,10 +589,10 @@
|
|||
<Zip Files="@(StandaloneInstallFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-StandaloneServerSetup-$(Version).zip" WorkingDirectory="$(StandaloneInstall)" />
|
||||
-->
|
||||
|
||||
<Exec Command="cscript $(TrunkFolder)\zip.vbs "$(DeployFolder)\WebsitePanel-Portal-$(Version).zip" "$(PortalInstall)"" />
|
||||
<Exec Command="cscript $(TrunkFolder)\zip.vbs "$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version).zip" "$(EnterpriseServerInstall)"" />
|
||||
<Exec Command="cscript $(TrunkFolder)\zip.vbs "$(DeployFolder)\WebsitePanel-Server-$(Version).zip" "$(ServerInstall)"" />
|
||||
<Exec Command="cscript $(TrunkFolder)\zip.vbs "$(DeployFolder)\WebsitePanel-StandaloneServerSetup-$(Version).zip" "$(StandaloneInstall)"" />
|
||||
<Exec Command="$(ZipCmd) a "$(DeployFolder)\WebsitePanel-Portal-$(Version).zip" "$(PortalInstall)\*"" />
|
||||
<Exec Command="$(ZipCmd) a "$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version).zip" "$(EnterpriseServerInstall)\*"" />
|
||||
<Exec Command="$(ZipCmd) a "$(DeployFolder)\WebsitePanel-Server-$(Version).zip" "$(ServerInstall)\*"" />
|
||||
<Exec Command="$(ZipCmd) a "$(DeployFolder)\WebsitePanel-StandaloneServerSetup-$(Version).zip" "$(StandaloneInstall)\*"" />
|
||||
|
||||
|
||||
<!-- zip updates
|
||||
|
|
@ -611,11 +612,11 @@
|
|||
<Zip Files="@(InstallerUpdateFiles)" ZipFileName="$(DeployFolder)\WebsitePanel-Installer-$(Version)-Update.zip" WorkingDirectory="$(InstallerBuild)" />
|
||||
-->
|
||||
|
||||
<Exec Command="cscript $(TrunkFolder)\zip.vbs "$(DeployFolder)\WebsitePanel-Portal-$(Version)-Update.zip" "$(PortalUpdate)"" />
|
||||
<Exec Command="cscript $(TrunkFolder)\zip.vbs "$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version)-Update.zip" "$(EnterpriseServerUpdate)"" />
|
||||
<Exec Command="cscript $(TrunkFolder)\zip.vbs "$(DeployFolder)\WebsitePanel-Server-$(Version)-Update.zip" "$(ServerUpdate)"" />
|
||||
<Exec Command="cscript $(TrunkFolder)\zip.vbs "$(DeployFolder)\Manual-Update.zip" "$(UpdateFolder)"" />
|
||||
<Exec Command="cscript $(TrunkFolder)\zip.vbs "$(DeployFolder)\WebsitePanel-Installer-$(Version)-Update.zip" "$(InstallerBuild)"" />
|
||||
<Exec Command="$(ZipCmd) a "$(DeployFolder)\WebsitePanel-Portal-$(Version)-Update.zip" "$(PortalUpdate)\*"" />
|
||||
<Exec Command="$(ZipCmd) a "$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version)-Update.zip" "$(EnterpriseServerUpdate)\*"" />
|
||||
<Exec Command="$(ZipCmd) a "$(DeployFolder)\WebsitePanel-Server-$(Version)-Update.zip" "$(ServerUpdate)\*"" />
|
||||
<Exec Command="$(ZipCmd) a "$(DeployFolder)\Manual-Update.zip" "$(UpdateFolder)\*"" />
|
||||
<Exec Command="$(ZipCmd) a "$(DeployFolder)\WebsitePanel-Installer-$(Version)-Update.zip" "$(InstallerBuild)\*"" />
|
||||
|
||||
<!-- zip tools
|
||||
<Zip Files="@(ImportCsvInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-Import-CsvBulk-$(Version).zip" WorkingDirectory="$(ImportCsvInstall)" />
|
||||
|
|
@ -626,12 +627,12 @@
|
|||
<Zip Files="@(WSPTransportAgentInstallFiles)" ZipFileName="$(ToolsFolder)\WebsitePanel-WSPTransportAgent-$(Version).zip" WorkingDirectory="$(WSPTransportAgentInstall)" />
|
||||
-->
|
||||
|
||||
<Exec Command="cscript $(TrunkFolder)\zip.vbs "$(DeployFolder)\WebsitePanel-Import-CsvBulk-$(Version)-Update.zip" "$(ImportCsvInstall)"" />
|
||||
<Exec Command="cscript $(TrunkFolder)\zip.vbs "$(DeployFolder)\WebsitePanel-HyperVUtils-$(Version)-Update.zip" "$(HyperVUtilsInstall)"" />
|
||||
<Exec Command="cscript $(TrunkFolder)\zip.vbs "$(DeployFolder)\WebsitePanel-VMConfig-$(Version)-Update.zip" "$(VMConfigInstall)"" />
|
||||
<Exec Command="cscript $(TrunkFolder)\zip.vbs "$(DeployFolder)\WebsitePanel-Import-Enterprise-$(Version)-Update.zip" "$(ImportEnterpriseInstall)"" />
|
||||
<Exec Command="cscript $(TrunkFolder)\zip.vbs "$(DeployFolder)\WebsitePanel-AWStatsViewer-$(Version)-Update.zip" "$(AWStatsViewerInstall)"" />
|
||||
<Exec Command="cscript $(TrunkFolder)\zip.vbs "$(DeployFolder)\WebsitePanel-WSPTransportAgent-$(Version)-Update.zip" "$(WSPTransportAgentInstall)"" />
|
||||
<Exec Command="$(ZipCmd) a "$(DeployFolder)\WebsitePanel-Import-CsvBulk-$(Version)-Update.zip" "$(ImportCsvInstall)\*"" />
|
||||
<Exec Command="$(ZipCmd) a "$(DeployFolder)\WebsitePanel-HyperVUtils-$(Version)-Update.zip" "$(HyperVUtilsInstall)\*"" />
|
||||
<Exec Command="$(ZipCmd) a "$(DeployFolder)\WebsitePanel-VMConfig-$(Version)-Update.zip" "$(VMConfigInstall)\*"" />
|
||||
<Exec Command="$(ZipCmd) a "$(DeployFolder)\WebsitePanel-Import-Enterprise-$(Version)-Update.zip" "$(ImportEnterpriseInstall)\*"" />
|
||||
<Exec Command="$(ZipCmd) a "$(DeployFolder)\WebsitePanel-AWStatsViewer-$(Version)-Update.zip" "$(AWStatsViewerInstall)\*"" />
|
||||
<Exec Command="$(ZipCmd) a "$(DeployFolder)\WebsitePanel-WSPTransportAgent-$(Version)-Update.zip" "$(WSPTransportAgentInstall)\*"" />
|
||||
|
||||
</Target>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,104 +0,0 @@
|
|||
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
|
||||
Loading…
Add table
Add a link
Reference in a new issue