? Releasex64 ? bug6818.txt ? fix_merge_2009.txt ? winrel64 ? {TARGET} ? WorkspaceViewer/Debug ? WorkspaceViewer/Release ? control-panel/Debug ? control-panel/Release ? cvsagent/win32/Debug ? cvsagent/win32/Release ? cvsapi/Debug ? cvsapi/MSG00001.bin ? cvsapi/Release ? cvsapi/Releasex64 ? cvsapi/ServiceMsg.h ? cvsapi/ServiceMsg.rc ? cvsapi/apiloader/Debug ? cvsapi/apiloader/Release ? cvsdelta/Debug ? cvsdelta/Release ? cvsdelta/Releasex64 ? cvsgui/Debug ? cvsgui/Release ? cvsgui/Releasex64 ? cvsntcpl/Debug ? cvsntcpl/Release ? cvstools/Debug ? cvstools/Release ? cvstools/Releasex64 ? cvstools/trigger_h.h ? cvstools/trigger_i.c ? cvstools/win32/trigger.tlb ? diff/Debug ? diff/Release ? diff/Releasex64 ? doc/cvs.chm ? doc/cvsnt-pdk.chm ? doc/version.inc ? expat/vcnet/Debug ? expat/vcnet/Release ? expat/vcnet/Releasex64 ? extnt/Debug ? extnt/Release ? genbuild/Debug ? genbuild/Release ? genbuild/Releasex64 ? genkey/Debug ? genkey/Release ? installer/crt.wixobj ? installer/cvs-sngle-2010-6145-xp.msi ? installer/cvs-sngle-2010-6145.msi ? installer/cvs-suite-2010-6145-xp.msi ? installer/cvs-suite-2010-6145.msi ? installer/cvs-suite-installer.wixobj ? installer/cvs-suite-trial-2010-6145-xp.msi ? installer/cvs-suite-trial-2010-6145.msi ? installer/cvs-twoul-2010-6145-xp.msi ? installer/cvs-twoul-2010-6145.msi ? installer/cvsnt.wixobj ? installer/ebook.wixobj ? installer/releasemanager.wixobj ? installer/scci.wixobj ? installer/server.wixobj ? installer/tortoisecvs.wixobj ? installer/triggers.wixobj ? installer/ui.wixobj ? installer/unison.wixobj ? installer/wait4cvs.wixobj ? installer/wincvs.wixobj ? installer/winmerge.wixobj ? installer/wizard.wixobj ? installer/workspacemanager.wixobj ? installer/preinst/Debug ? installer/preinst/Release ? lib/Debug ? lib/Release ? lib/Releasex64 ? lockservice/Debug ? lockservice/Release ? mdnsclient/Debug ? mdnsclient/Release ? mdnsclient/Releasex64 ? pcre/Debug ? pcre/Release ? pcre/Releasex64 ? plink/Debug ? plink/Release ? postinst/Debug ? postinst/Release ? rcs/Debug ? rcs/Release ? simcvs/Debug ? simcvs/Release ? su/Debug ? su/Release ? triggers/Debug ? triggers/Release ? triggers/script_trigger.tlb ? triggers/server_h.h ? triggers/server_i.c ? ufc-crypt/Debug ? ufc-crypt/Release ? ufc-crypt/Releasex64 ? uninsthlp/Debug ? uninsthlp/Release ? windows-NT/chkmanifest/Debug ? windows-NT/chkmanifest/Release ? windows-NT/cvsdiag/Debug ? windows-NT/cvsdiag/Release ? windows-NT/gss-ad/Debug ? windows-NT/gss-ad/Release ? windows-NT/installer/Debug ? windows-NT/installer/Release ? windows-NT/ntsetuid/Debug ? windows-NT/ntsetuid/Release ? windows-NT/posixdir/cvsflt/Debug ? windows-NT/posixdir/cvsflt/Release ? windows-NT/posixdir/cvsflt/Releasex64 ? windows-NT/posixdir/setci/Debug ? windows-NT/posixdir/setci/Release ? windows-NT/setuid/libsuid/Debug ? windows-NT/setuid/libsuid/Release ? windows-NT/setuid/libsuid/Releasex64 ? windows-NT/setuid/setuid/Debug ? windows-NT/setuid/setuid/Release ? xdiff/Debug ? xdiff/Release ? zlib/win32/Debug ? zlib/win32/Release ? zlib/win32/Releasex64 Index: cvsapi/cvsapi.vcproj =================================================================== RCS file: /cvs/cvsnt/cvsapi/cvsapi.vcproj,v retrieving revision 1.1.2.45.4.20 diff -c -r1.1.2.45.4.20 cvsapi.vcproj *** cvsapi/cvsapi.vcproj 29 Oct 2015 21:37:02 -0000 1.1.2.45.4.20 --- cvsapi/cvsapi.vcproj 26 Oct 2016 07:18:19 -0000 *************** *** 198,204 **** Name="VCCustomBuildTool"/> = 1400 ) + // this is VS2003.NET x64 compile which doesn't support assembler, but supports __debugbreak(); + // https://msdn.microsoft.com/en-us/library/f408b4et(v=vs.71).aspx + __debugbreak(); + #endif #endif } Index: osx/BuildNo.xcconfig =================================================================== RCS file: /cvs/cvsnt/osx/BuildNo.xcconfig,v retrieving revision 1.1.2.59 diff -c -r1.1.2.59 BuildNo.xcconfig *** osx/BuildNo.xcconfig 25 Oct 2016 03:22:07 -0000 1.1.2.59 --- osx/BuildNo.xcconfig 26 Oct 2016 07:18:24 -0000 *************** *** 2,8 **** // BuildNo.xcconfig // cvsnt // ! // Created by genbuild on 25.09.2016 // CVSNT_Version_Buildnumber = 6145 CVSNT_Version_Major = 2 --- 2,8 ---- // BuildNo.xcconfig // cvsnt // ! // Created by genbuild on 26.09.2016 // CVSNT_Version_Buildnumber = 6145 CVSNT_Version_Major = 2 Index: src/main.cpp =================================================================== RCS file: /cvs/cvsnt/src/main.c,v retrieving revision 1.71.2.151.6.99 diff -c -r1.71.2.151.6.99 main.cpp *** src/main.cpp 20 Jul 2016 03:20:07 -0000 1.71.2.151.6.99 --- src/main.cpp 26 Oct 2016 02:50:21 -0000 *************** *** 1245,1250 **** --- 1245,1257 ---- _asm int 3 break; #endif + #if defined ( _WIN32 ) && ( _M_AMD64 == 100 ) && ( _MSC_VER >= 1400 ) + // this is VS2003.NET x64 compile which doesn't support assembler, but supports __debugbreak(); + // https://msdn.microsoft.com/en-us/library/f408b4et(v=vs.71).aspx + case 9: + __debugbreak(); + break; + #endif #endif case 1: /* --help-commands */ Index: src/subr.cpp =================================================================== RCS file: /cvs/cvsnt/src/subr.c,v retrieving revision 1.62.2.81.6.27 diff -c -r1.62.2.81.6.27 subr.cpp *** src/subr.cpp 20 Jul 2016 03:20:07 -0000 1.62.2.81.6.27 --- src/subr.cpp 26 Oct 2016 02:50:21 -0000 *************** *** 14,20 **** --- 14,25 ---- //#define DEBUG_MALLOC #if defined(_DEBUG) && defined(DEBUG_MALLOC) && defined(_WIN32) + #if !defined ( _WIN32 ) || ( _M_AMD64 != 100 ) || ( _MSC_VER != 1400 ) #define MALLOC_CHECK() if(!_CrtCheckMemory()) _asm int 3 + #endif + #if defined ( _WIN32 ) && ( _M_AMD64 == 100 ) && ( _MSC_VER >= 1400 ) + #define MALLOC_CHECK() if(!_CrtCheckMemory()) __debugbreak(); + #endif #else #define MALLOC_CHECK() do { } while(0); #endif Index: tonys scripts/release_builder.sh =================================================================== RCS file: /cvs/cvsnt/tonys scripts/release_builder.sh,v retrieving revision 1.10.2.32.4.36 diff -c -r1.10.2.32.4.36 release_builder.sh *** tonys scripts/release_builder.sh 26 Oct 2016 02:42:21 -0000 1.10.2.32.4.36 --- tonys scripts/release_builder.sh 26 Oct 2016 06:22:21 -0000 *************** *** 217,224 **** if [[ "$OPTIONS" =~ "issmart" ]]; then cp /cygdrive/d/cvsdeps/SmartLoader_2_5_03/* /cygdrive/d/cvsdeps/SmartLoader fi ! cp /cygdrive/d/cvsdeps/sysfiles_2503/* /cygdrive/d/cvsdeps/sysfiles ! cp /cygdrive/d/cvsdeps/sysfiles_2503/x64/* /cygdrive/d/cvsdeps/sysfiles/x64 cp /cygdrive/d/cvsdeps/SmartLoader_2_5_03/SmartLoader.dll /cygdrive/d/cvsbin/sysfiles cp /cygdrive/d/cvsdeps/SmartLoader_2_5_03/SmartLoader.dll /cygdrive/d/cvsdeps/sysfiles if [ ! -x /cygdrive/d/cvsbin/sysfiles/SmartLoader.dll ]; then --- 217,229 ---- if [[ "$OPTIONS" =~ "issmart" ]]; then cp /cygdrive/d/cvsdeps/SmartLoader_2_5_03/* /cygdrive/d/cvsdeps/SmartLoader fi ! # if [ "x$2" == "xCVSNT_BRANCH_2_8_01" -a "x$1" == "xCVSNT_BRANCH_2_5_03_2382" ]; then ! # cp /cygdrive/d/cvsdeps/sysfiles_2802/* /cygdrive/d/cvsdeps/sysfiles ! # cp /cygdrive/d/cvsdeps/sysfiles_2802/x64/* /cygdrive/d/cvsdeps/sysfiles/x64 ! # else ! cp /cygdrive/d/cvsdeps/sysfiles_2503/* /cygdrive/d/cvsdeps/sysfiles ! cp /cygdrive/d/cvsdeps/sysfiles_2503/x64/* /cygdrive/d/cvsdeps/sysfiles/x64 ! # fi cp /cygdrive/d/cvsdeps/SmartLoader_2_5_03/SmartLoader.dll /cygdrive/d/cvsbin/sysfiles cp /cygdrive/d/cvsdeps/SmartLoader_2_5_03/SmartLoader.dll /cygdrive/d/cvsdeps/sysfiles if [ ! -x /cygdrive/d/cvsbin/sysfiles/SmartLoader.dll ]; then