Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-21 16:38:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build script to properly create ZIP files. Added progress messages to build script.

Browse Source 
Signed-off-by: thrilleratplay <thilleratplay@gmail.com>
This commit is contained in:
Riley McArdle
2010-12-02 14:36:54 -06:00
committed by thrilleratplay
parent f24b1b5cec
commit 2eb2dc56bd
3 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
BUILD.CMD
View File

@@ -3,30 +3,40 @@
SET VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
SET DEVENV="devenv.exe"
SET MAKENSIS="%ProgramFiles(x86)%\NSIS\makensis.exe"
<<<<<<< HEAD
SET RAR="%ProgramFiles%\WinRAR\WinRAR.exe"
SET BINARYZIP="%~dp0\Release\mRemoteNG-1.63.zip"
SET PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-1.63.zip"
=======
SET RAR="%ProgramFiles%\WinRAR\Rar.exe"
SET BINARYZIP="%~dp0\Release\mRemoteNG-1.64.zip"
SET PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-1.64.zip"
>>>>>>> f24b1b5cec015433e7f47e36aac2ad20256f1a37
call %VCVARSALL% x86
call %VCVARSALL% x86 > NUL 2>&1
rmdir /s /q "%~dp0\mRemoteV1\bin"
rmdir /s /q "%~dp0\mRemoteV1\obj"
rmdir /s /q "%~dp0\mRemoteV1\bin" > NUL 2>&1
rmdir /s /q "%~dp0\mRemoteV1\obj" > NUL 2>&1
echo Building release version...
%DEVENV% "%~dp0\mRemoteV1.sln" /build "Release"
echo Building portable version...
%DEVENV% "%~dp0\mRemoteV1.sln" /build "Release Portable"
mkdir "%~dp0\Release"
echo Creating installer package...
%MAKENSIS% "%~dp0\Installer\mRemote.nsi"
del /f /q %BINARYZIP%
echo Creating release ZIP file...
del /f /q %BINARYZIP% > NUL 2>&1
%RAR% a -m5 -r -ep1 -afzip -inul %BINARYZIP% "%~dp0\mRemoteV1\bin\Release\*.*"
%RAR% a -m5 -r -ep1 -afzip -inul %BINARYZIP% "%~dp0\Installer\Dependencies\*.*"
%RAR% a -m5 -ep -afzip -inul %BINARYZIP% "%~dp0\*.TXT"
%RAR% a -m5 -r -ep1 %BINARYZIP% "%~dp0\mRemoteV1\bin\Release\*.*"
%RAR% a -m5 -r -ep1 %BINARYZIP% "%~dp0\Installer\Dependencies\*.*"
%RAR% a -m5 -ep %BINARYZIP% "%~dp0\*.TXT"
del /f /q %PORTABLEZIP%
%RAR% a -m5 -r -ep1 %PORTABLEZIP% "%~dp0\mRemoteV1\bin\Release Portable\*.*"
%RAR% a -m5 -r -ep1 %PORTABLEZIP% "%~dp0\Installer\Dependencies\*.*"
%RAR% a -m5 -ep %PORTABLEZIP% "%~dp0\*.TXT"
echo Creating portable ZIP file...
del /f /q %PORTABLEZIP% > NUL 2>&1
%RAR% a -m5 -r -ep1 -afzip -inul %PORTABLEZIP% "%~dp0\mRemoteV1\bin\Release Portable\*.*"
%RAR% a -m5 -r -ep1 -afzip -inul %PORTABLEZIP% "%~dp0\Installer\Dependencies\*.*"
%RAR% a -m5 -ep -afzip -inul %PORTABLEZIP% "%~dp0\*.TXT"

6
mRemoteV1/Connection/Connection.Protocol.VNC.vb
View File

@@ -1,5 +1,6 @@
Imports mRemoteNG.App.Runtime
Imports System.ComponentModel
Imports System.Windows.Forms
Imports mRemoteNG.Tools.LocalizedAttributes
Namespace Connection
@@ -207,6 +208,7 @@ Namespace Connection
Try
AddHandler VNC.ConnectComplete, AddressOf VNCEvent_Connected
AddHandler VNC.ConnectionLost, AddressOf VNCEvent_Disconnected
AddHandler VNC.GotFocus, AddressOf VNCEvent_GotFocus
If Not String.IsNullOrEmpty(Info.Password) Then
VNC.GetPassword = AddressOf VNCEvent_Authenticate
End If
@@ -227,6 +229,10 @@ Namespace Connection
MyBase.Close()
End Sub
Private Sub VNCEvent_GotFocus(ByVal sender As Object, ByVal e As EventArgs)
Me.VNC.FillServerClipboard()
End Sub
Private Function VNCEvent_Authenticate() As String
Return Info.Password
End Function

36
mRemoteV1/mRemoteV1.vbproj
View File

@@ -92,6 +92,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>References\ADTree.dll</HintPath>
</Reference>
<Reference Include="AxInterop.WFICALib, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>do not check in\AxInterop.WFICALib.dll</HintPath>
</Reference>
<Reference Include="DiffieHellman, Version=0.0.0.0, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath>References\DiffieHellman.dll</HintPath>
@@ -100,6 +104,14 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>References\FilteredPropertyGrid.dll</HintPath>
</Reference>
<Reference Include="Interop.EOLWTSCOM, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>do not check in\Interop.EOLWTSCOM.dll</HintPath>
</Reference>
<Reference Include="Interop.WFICALib, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>do not check in\Interop.WFICALib.dll</HintPath>
</Reference>
<Reference Include="IPTextBox, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>References\IPTextBox.dll</HintPath>
@@ -894,22 +906,6 @@
<WrapperTool>aximp</WrapperTool>
<Isolated>False</Isolated>
</COMReference>
<COMReference Include="AxWFICALib">
<Guid>{238F6F80-B8B4-11CF-8771-00A024541EE3}</Guid>
<VersionMajor>2</VersionMajor>
<VersionMinor>7</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>aximp</WrapperTool>
<Isolated>False</Isolated>
</COMReference>
<COMReference Include="EOLWTSCOM">
<Guid>{96C3FA7A-3211-4D93-BFEA-4589DA4ABDE2}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>0</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>tlbimp</WrapperTool>
<Isolated>False</Isolated>
</COMReference>
<COMReference Include="MSTSCLib">
<Guid>{8C11EFA1-92C3-11D1-BC1E-00C04FA31489}</Guid>
<VersionMajor>1</VersionMajor>
@@ -934,14 +930,6 @@
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
</COMReference>
<COMReference Include="WFICALib">
<Guid>{238F6F80-B8B4-11CF-8771-00A024541EE3}</Guid>
<VersionMajor>2</VersionMajor>
<VersionMinor>7</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>tlbimp</WrapperTool>
<Isolated>False</Isolated>
</COMReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.