[X2Go-Commits] [x2goclient] 01/01: copy-deps-win32.bat: actually let xcopy error correctly.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit be52b79aca6b60826fc158baef81e50487fcb06c
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri May 22 17:56:38 2015 +0200

    copy-deps-win32.bat: actually let xcopy error correctly.
---
 copy-deps-win32.bat |   28 ++++++++++++++--------------
 debian/changelog    |    1 +
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/copy-deps-win32.bat b/copy-deps-win32.bat
index 901f1ca..c026305 100755
--- a/copy-deps-win32.bat
+++ b/copy-deps-win32.bat
@@ -2,19 +2,19 @@ if "%~3"=="" (
 	echo "Usage: copy-deps-win32.bat path-to-x2goclient-contrib path-to-OpenSSL-Win32 destination"
 	goto :a
 )
-xcopy /C /Y    %1\cygwin\20150425-2_bin %3\ || exit /b  %errorlevel%
+xcopy /E /Y    %1\cygwin\20150425-2_bin %3\ || exit /b  %errorlevel%
 del %3\nxproxy.exe.unstripped %3\libXcomp.a %3\libXcomp.dll.a || exit /b  %errorlevel%
-xcopy /C /Y    %1\libssh\0.7.0-x2go1-mingw482_bin\bin\libssh.dll %3\ || exit /b  %errorlevel%
-xcopy /C /Y    %1\libzip\0.9.3_bin\bin\libzip.dll %3\ || exit /b  %errorlevel%
-xcopy /C /Y    %1\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libgcc_s_dw2-1.dll %3\ || exit /b  %errorlevel%
-xcopy /C /Y    %1\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libstdc++-6.dll %3\ || exit /b  %errorlevel%
-xcopy /C /Y    %1\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libwinpthread-1.dll %3\ || exit /b  %errorlevel%
-xcopy /C /Y    %1\MSVC-DLLs\2008-9.0.21022.8-x86 %3\ || exit /b  %errorlevel%
-xcopy /C /Y    %1\pulse\6.0-11.1_bin %3\ || exit /b  %errorlevel%
-xcopy /C /Y    %1\PuTTY\0.64_bin %3\ || exit /b  %errorlevel%
-xcopy /C /Y /I %1\VcXsrv\1.17.0.0-1_bin %3\VcXsrv || exit /b  %errorlevel%
-xcopy /C /Y    %1\zlib\1.2.8_bin\zlib1.dll %3\ || exit /b  %errorlevel%
-xcopy /C /Y    %1\zlib\x86-mingw4-1.2.7-1_bin\bin\libz.dll %3\ || exit /b  %errorlevel%
-xcopy /C /Y    %2\bin\ssleay32.dll %3\ || exit /b  %errorlevel%
-xcopy /C /Y    %2\bin\libeay32.dll %3\ || exit /b  %errorlevel%
+xcopy /E /Y    %1\libssh\0.7.0-x2go1-mingw482_bin\bin\libssh.dll %3\ || exit /b  %errorlevel%
+xcopy /E /Y    %1\libzip\0.9.3_bin\bin\libzip.dll %3\ || exit /b  %errorlevel%
+xcopy /E /Y    %1\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libgcc_s_dw2-1.dll %3\ || exit /b  %errorlevel%
+xcopy /E /Y    %1\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libstdc++-6.dll %3\ || exit /b  %errorlevel%
+xcopy /E /Y    %1\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libwinpthread-1.dll %3\ || exit /b  %errorlevel%
+xcopy /E /Y    %1\MSVC-DLLs\2008-9.0.21022.8-x86 %3\ || exit /b  %errorlevel%
+xcopy /E /Y    %1\pulse\6.0-11.1_bin %3\ || exit /b  %errorlevel%
+xcopy /E /Y    %1\PuTTY\0.64_bin %3\ || exit /b  %errorlevel%
+xcopy /E /Y /I %1\VcXsrv\1.17.0.0-1_bin %3\VcXsrv || exit /b  %errorlevel%
+xcopy /E /Y    %1\zlib\1.2.8_bin\zlib1.dll %3\ || exit /b  %errorlevel%
+xcopy /E /Y    %1\zlib\x86-mingw4-1.2.7-1_bin\bin\libz.dll %3\ || exit /b  %errorlevel%
+xcopy /E /Y    %2\bin\ssleay32.dll %3\ || exit /b  %errorlevel%
+xcopy /E /Y    %2\bin\libeay32.dll %3\ || exit /b  %errorlevel%
 :a
diff --git a/debian/changelog b/debian/changelog
index 03950c1..d830bc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -401,6 +401,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
     - onmainwindow.cpp: workaround https://bugreports.qt.io/browse/QTBUG-25973.
     - onmainwindow.h: revert const-qualifier for get_translator(). It's static
       and can't have any cv-qualifier.
+    - copy-deps-win32.bat: actually let xcopy error correctly.
 
   [ Fernando Pedemonte ]
   * New upstream release (4.0.4.0):

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git