Version from 2011-07-22. Updated test-pm-timing.bat

--- code/test-pm-timing.bat
+++ code/test-pm-timing.bat
@@ -31,42 +31,94 @@
 echo Test from %date% at %time% > %logfile%
 echo Test from %date% at %time% > %results%

-set CXX="%VCINSTALLDIR%\bin\cl.exe"
+set CXX=cl.exe
 rem /Zi /nologo /W3 /WX- /O2 /Ob2 /Oi /Ot /Oy- /GL  /GF /Gm- /MT /GS- /Gy- /fp:precise /Zc:wchar_t /Zc:forScope /Gr /analyze- /errorReport:queue
-set CXXFLAGS=/W4 /O2 /Ob2 /Oi /Ot /Og /GR /GL /GF /GS- /Gy- /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /I%BOOST%
+rem set CXXFLAGS=/W4 /O2 /Ob2 /Oi /Ot /Og /GR /GL /GF /GS- /Gy- /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /I%BOOST%
 rem /INCREMENTAL:NO /NOLOGO /SUBSYSTEM:CONSOLE /OPT:REF /OPT:ICF /LTCG /TLBID:1 /DYNAMICBASE:NO /NXCOMPAT /MACHINE:X86 /ERRORREPORT:QUEUE
-set LNKFLAGS=/LTCG /MACHINE:X86
+rem set LNKFLAGS=/LTCG /MACHINE:X86

-echo Building executables for Win32 using MS Visual C++ ...
+set CXXFLAGS=/I%BOOST% /Zi /nologo /W3 /WX- /O2 /Ob2 /Oi /Ot /Oy- /GL /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /Gm- /MT /GS- /Gy- /fp:precise /Zc:wchar_t /Zc:forScope /Gr /analyze- /errorReport:queue
+rem Slower: set CXXFLAGS=/I%BOOST% /Zi /nologo /W3 /WX- /O2 /Ob2 /Oi /Ot      /GL /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /Gm- /MT /GS- /Gy  /fp:precise /Zc:wchar_t /Zc:forScope /Gr           /errorReport:queue
+set LNKFLAGS=/INCREMENTAL:NO /NOLOGO "kernel32.lib" "user32.lib" "gdi32.lib" "winspool.lib" "comdlg32.lib" "advapi32.lib" "shell32.lib" "ole32.lib" "oleaut32.lib" "uuid.lib" "odbc32.lib" "odbccp32.lib" /MANIFEST:NO /ALLOWISOLATION /SUBSYSTEM:CONSOLE /OPT:REF /OPT:ICF /LTCG /TLBID:1 /DYNAMICBASE:NO /NXCOMPAT /ERRORREPORT:QUEUE
+
 echo [ MS Visual C++/Win32 ] ========================= >> %logfile%

-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='p' /DXTL_REP_TEST skeleton.cxx /Fetime-fwd-generic-poly-rep.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='p' /DXTL_SEQ_TEST skeleton.cxx /Fetime-fwd-generic-poly-seq.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='p' /DXTL_RND_TEST skeleton.cxx /Fetime-fwd-generic-poly-rnd.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='k' /DXTL_REP_TEST skeleton.cxx /Fetime-fwd-generic-kind-rep.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='k' /DXTL_SEQ_TEST skeleton.cxx /Fetime-fwd-generic-kind-seq.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='k' /DXTL_RND_TEST skeleton.cxx /Fetime-fwd-generic-kind-rnd.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='P' /DXTL_REP_TEST skeleton.cxx /Fetime-fwd-special-poly-rep.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='P' /DXTL_SEQ_TEST skeleton.cxx /Fetime-fwd-special-poly-seq.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='P' /DXTL_RND_TEST skeleton.cxx /Fetime-fwd-special-poly-rnd.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='K' /DXTL_REP_TEST skeleton.cxx /Fetime-fwd-special-kind-rep.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='K' /DXTL_SEQ_TEST skeleton.cxx /Fetime-fwd-special-kind-seq.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='K' /DXTL_RND_TEST skeleton.cxx /Fetime-fwd-special-kind-rnd.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='p' /DXTL_REP_TEST skeleton.cxx /Fetime-non-generic-poly-rep.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='p' /DXTL_SEQ_TEST skeleton.cxx /Fetime-non-generic-poly-seq.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='p' /DXTL_RND_TEST skeleton.cxx /Fetime-non-generic-poly-rnd.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='k' /DXTL_REP_TEST skeleton.cxx /Fetime-non-generic-kind-rep.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='k' /DXTL_SEQ_TEST skeleton.cxx /Fetime-non-generic-kind-seq.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='k' /DXTL_RND_TEST skeleton.cxx /Fetime-non-generic-kind-rnd.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='P' /DXTL_REP_TEST skeleton.cxx /Fetime-non-special-poly-rep.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='P' /DXTL_SEQ_TEST skeleton.cxx /Fetime-non-special-poly-seq.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='P' /DXTL_RND_TEST skeleton.cxx /Fetime-non-special-poly-rnd.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='K' /DXTL_REP_TEST skeleton.cxx /Fetime-non-special-kind-rep.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='K' /DXTL_SEQ_TEST skeleton.cxx /Fetime-non-special-kind-seq.exe /link %LNKFLAGS% >> %logfile% 2>&1
-%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='K' /DXTL_RND_TEST skeleton.cxx /Fetime-non-special-kind-rnd.exe /link %LNKFLAGS% >> %logfile% 2>&1
+rem Set up VC variables for x86 build
+call "%VCINSTALLDIR%vcvarsall.bat" x86

-echo [ Running Win32 timings ] ======================= >> %logfile%
+%CXX% %CXXFLAGS% exception_select_random.cpp /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% generic_select_kind.cpp     /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% generic_select_random.cpp   /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% generic_select_union.cpp    /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% hierarchy2.cpp              /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% ocaml_cmp.cpp               /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% ocaml_cmp_kind.cpp          /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% synthetic.cpp               /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% synthetic_dynamic_cast.cpp  /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% synthetic_select.cpp        /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% synthetic_select_kind.cpp   /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% synthetic_select_random.cpp /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% type_switch.cpp             /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1

-for %%i in (time-*.exe) do %%i >> %results% 2>&1
+goto END
+
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='p' /DXTL_REP_TEST skeleton.cxx /Fetime-32-fwd-generic-poly-rep.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='p' /DXTL_SEQ_TEST skeleton.cxx /Fetime-32-fwd-generic-poly-seq.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='p' /DXTL_RND_TEST skeleton.cxx /Fetime-32-fwd-generic-poly-rnd.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='k' /DXTL_REP_TEST skeleton.cxx /Fetime-32-fwd-generic-kind-rep.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='k' /DXTL_SEQ_TEST skeleton.cxx /Fetime-32-fwd-generic-kind-seq.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='k' /DXTL_RND_TEST skeleton.cxx /Fetime-32-fwd-generic-kind-rnd.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='P' /DXTL_REP_TEST skeleton.cxx /Fetime-32-fwd-special-poly-rep.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='P' /DXTL_SEQ_TEST skeleton.cxx /Fetime-32-fwd-special-poly-seq.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='P' /DXTL_RND_TEST skeleton.cxx /Fetime-32-fwd-special-poly-rnd.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='K' /DXTL_REP_TEST skeleton.cxx /Fetime-32-fwd-special-kind-rep.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='K' /DXTL_SEQ_TEST skeleton.cxx /Fetime-32-fwd-special-kind-seq.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='K' /DXTL_RND_TEST skeleton.cxx /Fetime-32-fwd-special-kind-rnd.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='p' /DXTL_REP_TEST skeleton.cxx /Fetime-32-non-generic-poly-rep.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='p' /DXTL_SEQ_TEST skeleton.cxx /Fetime-32-non-generic-poly-seq.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='p' /DXTL_RND_TEST skeleton.cxx /Fetime-32-non-generic-poly-rnd.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='k' /DXTL_REP_TEST skeleton.cxx /Fetime-32-non-generic-kind-rep.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='k' /DXTL_SEQ_TEST skeleton.cxx /Fetime-32-non-generic-kind-seq.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='k' /DXTL_RND_TEST skeleton.cxx /Fetime-32-non-generic-kind-rnd.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='P' /DXTL_REP_TEST skeleton.cxx /Fetime-32-non-special-poly-rep.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='P' /DXTL_SEQ_TEST skeleton.cxx /Fetime-32-non-special-poly-seq.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='P' /DXTL_RND_TEST skeleton.cxx /Fetime-32-non-special-poly-rnd.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='K' /DXTL_REP_TEST skeleton.cxx /Fetime-32-non-special-kind-rep.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='K' /DXTL_SEQ_TEST skeleton.cxx /Fetime-32-non-special-kind-seq.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='K' /DXTL_RND_TEST skeleton.cxx /Fetime-32-non-special-kind-rnd.exe /link %LNKFLAGS% /MACHINE:X86 >> %logfile% 2>&1
+
+echo [ MS Visual C++/x64 ] ========================= >> %logfile%
+
+rem Set up VC variables for x64 build
+call "%VCINSTALLDIR%vcvarsall.bat" x64
+
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='p' /DXTL_REP_TEST skeleton.cxx /Fetime-64-fwd-generic-poly-rep.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='p' /DXTL_SEQ_TEST skeleton.cxx /Fetime-64-fwd-generic-poly-seq.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='p' /DXTL_RND_TEST skeleton.cxx /Fetime-64-fwd-generic-poly-rnd.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='k' /DXTL_REP_TEST skeleton.cxx /Fetime-64-fwd-generic-kind-rep.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='k' /DXTL_SEQ_TEST skeleton.cxx /Fetime-64-fwd-generic-kind-seq.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='k' /DXTL_RND_TEST skeleton.cxx /Fetime-64-fwd-generic-kind-rnd.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='P' /DXTL_REP_TEST skeleton.cxx /Fetime-64-fwd-special-poly-rep.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='P' /DXTL_SEQ_TEST skeleton.cxx /Fetime-64-fwd-special-poly-seq.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='P' /DXTL_RND_TEST skeleton.cxx /Fetime-64-fwd-special-poly-rnd.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='K' /DXTL_REP_TEST skeleton.cxx /Fetime-64-fwd-special-kind-rep.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='K' /DXTL_SEQ_TEST skeleton.cxx /Fetime-64-fwd-special-kind-seq.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=1 /DXTL_DEFAULT_SYNTAX='K' /DXTL_RND_TEST skeleton.cxx /Fetime-64-fwd-special-kind-rnd.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='p' /DXTL_REP_TEST skeleton.cxx /Fetime-64-non-generic-poly-rep.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='p' /DXTL_SEQ_TEST skeleton.cxx /Fetime-64-non-generic-poly-seq.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='p' /DXTL_RND_TEST skeleton.cxx /Fetime-64-non-generic-poly-rnd.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='k' /DXTL_REP_TEST skeleton.cxx /Fetime-64-non-generic-kind-rep.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='k' /DXTL_SEQ_TEST skeleton.cxx /Fetime-64-non-generic-kind-seq.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='k' /DXTL_RND_TEST skeleton.cxx /Fetime-64-non-generic-kind-rnd.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='P' /DXTL_REP_TEST skeleton.cxx /Fetime-64-non-special-poly-rep.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='P' /DXTL_SEQ_TEST skeleton.cxx /Fetime-64-non-special-poly-seq.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='P' /DXTL_RND_TEST skeleton.cxx /Fetime-64-non-special-poly-rnd.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='K' /DXTL_REP_TEST skeleton.cxx /Fetime-64-non-special-kind-rep.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='K' /DXTL_SEQ_TEST skeleton.cxx /Fetime-64-non-special-kind-seq.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+%CXX% %CXXFLAGS% /DXTL_VISITOR_FORWARDING=0 /DXTL_DEFAULT_SYNTAX='K' /DXTL_RND_TEST skeleton.cxx /Fetime-64-non-special-kind-rnd.exe /link %LNKFLAGS% /MACHINE:X64 >> %logfile% 2>&1
+
+echo Running timings ...
+
+for %%i in (time-*.exe) do echo %%i & echo ==================[ %%i ]===================  >> %results% & %%i >> %results% 2>&1

 :END


Escape '<' and '>'

Escape '<' and '>'

git-svn-id: 79cef5a5a257cc9dbe40a45ac190115b4780e2d0@1834995 13f79535-47bb-0310-9956-ffa450edef68

--- bin/makebase.bat
+++ bin/makebase.bat
@@ -29,7 +29,7 @@

 if %BASE_TGT%.==. (
     rem target directory not provided; exit
-    echo Usage: makebase <path-to-target-directory>
+    echo Usage: makebase ^<path-to-target-directory^>
     goto :EOF
 )


Revised the packaging script for GDAL files for 64-bit Windows, so that the managed libraries of the C# bindings are in a separate subfolder.  Now the folders in the package clearly indicate which libraries are native versus managed.

--- external/gdal/packages/win/64/make-package.cmd
+++ external/gdal/packages/win/64/make-package.cmd
@@ -83,12 +83,19 @@
   echo GDAL libraries have already been copied to %NativeLibsDir% folder.
 )

+set ManagedLibsDir=%DistributionDir%\managed
+if not exist %ManagedLibsDir% (
+  echo Making directory "%ManagedLibsDir%" ...
+  mkdir %ManagedLibsDir%
+)
+
 set CSharpDir=%DownloadDir%\bin\gdal\csharp
-if exist %DistributionDir%\gdal_csharp.dll (
+if exist %ManagedLibsDir%\gdal_csharp.dll (
   echo C# bindings have already been copied to %DistributionDir% folder.
 ) else (
-  echo Copying C# bindings to %DistributionDir%\ ...
-  xcopy %CSharpDir%\*_csharp.dll %DistributionDir%
+  echo Copying managed libs of C# bindings to %ManagedLibsDir%\ ...
+  xcopy %CSharpDir%\*_csharp.dll %ManagedLibsDir%
+  echo Copying native libs of C# bindings to %NativeLibsDir%\ ...
   xcopy %CSharpDir%\*_wrap.dll %NativeLibsDir%
 )


Add missing copy step to script

Add missing copy step to script

Was missing a copy csv step, also add some doc

--- data/mil2525d/utilities/style-utilities/merge-stylx-utilities/AutomatedCopyandMerge.bat
+++ data/mil2525d/utilities/style-utilities/merge-stylx-utilities/AutomatedCopyandMerge.bat
@@ -1,5 +1,9 @@
 :: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 :: IMPORTANT/TODO: you must set/correct paths below: "TODO_"
+:: The expected workflow is to
+:: 1. Edit this file and save as "AutomatedCopyandMerge-local.bat"
+:: 2. Edit a version of "SqliteMergeStylx.sql" in this folder and save as "SqliteMergeStylx-local.sql"
+:: (The reason for the "-local" file naming/change is .gitignore is set to ignore that file pattern as a change)
 :: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

 :: INPUTS/SETTINGS:
@@ -20,8 +24,8 @@
 SET LOCAL_MIL_FEATURES_REPO_2525D=..\..\..

 :: (4) Name of the stylx file that has only the Point/SVG symbols
-:: IMPORTANT: the script assumes this file will be in the same folder:
-:: ...style-utilities\merge-stylx-utilities
+:: IMPORTANT: the script currently assumes this file will be in the same folder:
+:: ...style-utilities\merge-stylx-utilities (but you can add a path to this here if you want to)
 SET POINTS_ONLY_STYLX=mil2525d-points-only.stylx

 :: it is the default, but just in case, this enables the needed feature "goto :eof" ("exit/return")
@@ -58,10 +62,15 @@

 :prereqs_points_only_stylx_exists_ok

+:: Prerequisites have been verified, now copy all of the dependent files into the current folder
+
+copy "%LOCAL_JMSXML_REPO_CLONE%\samples\imagefile_name_category_tags\Military-All-Icons.csv .
+
 copy "%LOCAL_MIL_FEATURES_REPO_2525D%\core_data\stylxfiles\mil2525d-lines-areas-labels-base-template.stylx" mil2525d.stylx

 copy %POINTS_ONLY_STYLX% mil2525d-points-to-add-keys-labels.stylx

+:: TODO: (Possibly) you may also want to rename this "SqliteMergeStylx-local.sql" (if that is the version of the file you edited)
 "%SQLITE_PATH_AND_EXE%" < "%LOCAL_MIL_FEATURES_REPO_2525D%\utilities\style-utilities\merge-stylx-utilities\SqliteMergeStylx.sql"

 echo ******* IMPORTANT: Now verify the output and check for any errors *******


Force the installation of python and svn on windows.
Review URL: http://codereview.chromium.org/115063

git-svn-id: bd64dd6fa6f3f0ed0c0666d1018379882b742947@15501 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

--- gclient.bat
+++ gclient.bat
@@ -12,8 +12,11 @@
 :: We can't sync if .\.svn\. doesn't exist.
 IF NOT EXIST "%~dp0.svn\." GOTO :SKIP_UPDATE

-:: Will download svn and python if not already installed on the system.
-call "%~dp0bootstrap\win\win_tools.bat"
+:: Will download svn and python.
+:: If you don't want to install the depot_tools version of these tools, remove
+:: the 'force' option on the next command. The tools won't be installed only if
+:: not already in the PATH environment variable.
+call "%~dp0bootstrap\win\win_tools.bat" force
 if errorlevel 1 goto :EOF

 :: Sync the bootstrap directory *only after*.


Add cwebp batch file

Add cwebp batch file

error: pathspec 'bin/convert_to_cwebp.bat' did not match any file(s) known to git

--- bin/convert_to_cwebp.bat
+++ bin/convert_to_cwebp.bat
@@ -0,0 +1,8 @@
+pushd %1
+for /f "delims=" %%n in ('dir /b /s /a-d-h-s') do IF NOT ".webp" == "%%~xn" (
+"%~dp0cwebp.exe" -q 80 -mt -m 6 -sharpness 0 -hint graph "%%n" -o "%%n.webp")
+popd
+for %%i in (%1\*.*) do IF NOT ".webp" == "%%~xi" del "%%i"
+Rename %1\* *.
+Rename %1\* *.
+Rename %1\* *.webp


jenkins configuration

jenkins configuration

--- tools/jenkins/build_win.bat
+++ tools/jenkins/build_win.bat
@@ -10,6 +10,6 @@

 call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64

-qmake ../../../mne-cpp.pro -r
+qmake ../mne-cpp.pro -r

 nmake


reverted script

reverted script

--- get-tag.cmd
+++ get-tag.cmd
@@ -1,2 +1,2 @@
-for /f %%i in ('git describe --tags --abbrev^=0 --match release-*') do @set TAG=%%i
-echo "##teamcity[setParameter name='env.GIT_LATEST_TAG' value='12345']"
+for /f %%i in ('git describe --tags --abbrev^=0 --match release-*') do @echo %%i
+


copy python36.dll is not needed

copy python36.dll is not needed

--- build-scripts/3-copy.bat
+++ build-scripts/3-copy.bat
@@ -42,10 +42,6 @@
 rem include Python 3.6 from Appveyor
 xcopy /SIQY C:\Python36 "%TARGET_DIR%\Python36"

-echo Python36.dll
-rem add the mising python36.dll to the python folder
-copy C:\Windows\SysWOW64\python36.dll "%TARGET_DIR%\Python36"
-
 rem echo TDM-GCC-MINGW
 rem move "%EXTRACTED_DIR%\mingw" "%TARGET_DIR%"


generate wrapper.

generate wrapper.

--- gradlew.bat
+++ gradlew.bat
@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega


Pass arguments from far3-bootstrap.cmd to far3-bootstrap.sh.


Added gradlew script

Added gradlew script


Fix CRLF in gradlew.bat

Fix CRLF in gradlew.bat

--- gradlew.bat
+++ gradlew.bat
@@ -1,104 +1,104 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega


Fixed gradle bat

Fixed gradle bat

--- gradlew.bat
+++ gradlew.bat
@@ -87,4 +87,4 @@
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

-:omega
+:omega


fixed command line parameters with spaces reorganized help description fixed whitespace

--- install.bat
+++ install.bat
@@ -68,18 +68,16 @@
 /P [dir]       (REQUIRED) Where to install.
                Note that version; $VERSION, will be
                appended to this path.
-/CONFIG [dir]  Location where the config file should be installed.
-               Default is same place of installation
+
+Configuring the destinations:
 /TREE [dir]    Root of the local tree of installed rocks.
                Default is same place of installation
-/SCRIPTS [dir] Where to install scripts installed by rocks.
-               Default is TREE/bin.
-
+/SCRIPTS [dir] Where to install commandline scripts installed by
+               rocks. Default is TREE/bin.
+
+Configuring the Lua interpreter:
 /LV [version]  Lua version to use; either 5.1 or 5.2.
                Default is 5.1
-/L             Install LuaRocks' own copy of Lua even if detected,
-               this will always be a 5.1 installation.
-               (/LUA, /INC, /LIB, /BIN cannot be used with /L)
 /LUA [dir]     Location where Lua is installed - e.g. c:\lua\5.1\
                This is the base directory, the installer will look
                for subdirectories bin, lib, include. Alternatively
@@ -87,20 +85,25 @@
                /LIB, and /BIN options.
 /INC [dir]     Location of Lua includes - e.g. c:\lua\5.1\include
                If provided overrides sub directory found using /LUA.
-/LIB [dir]     Location of Lua libraries -e.g. c:\lua\5.1\lib
+/LIB [dir]     Location of Lua libraries (.dll) - e.g. c:\lua\5.1\lib
                If provided overrides sub directory found using /LUA.
 /BIN [dir]     Location of Lua executables - e.g. c:\lua\5.1\bin
                If provided overrides sub directory found using /LUA.
-
+/L             Install LuaRocks' own copy of Lua even if detected,
+               this will always be a 5.1 installation.
+               (/LUA, /INC, /LIB, /BIN cannot be used with /L)
+
+Compiler configuration:
 /MW            Use mingw as build system instead of MSVC

+Other options:
+/CONFIG [dir]  Location where the config file should be installed.
+               Default is same place of installation
 /FORCECONFIG   Use a single config location. Do not use the
                LUAROCKS_CONFIG variable or the user's home directory.
                Useful to avoid conflicts when LuaRocks
                is embedded within an application.
-
 /F             Remove installation directory if it already exists.
-
 /R             Load registry information to register '.rockspec'
                extension with LuaRocks commands (right-click).

@@ -197,7 +200,7 @@
 			print(S"       Found $LUA_BINDIR\\$LUA_INTERPRETER")
 			return true
 		end
-		die(S"Lua executable lua.exe, luajit.exe or lua$LUA_VERSION.exe not found in $LUA_BINDIR")
+		die(S"Lua executable lua.exe, luajit.exe, lua$LUA_SHORTV.exe or lua$LUA_VERSION.exe not found in $LUA_BINDIR")
 	end

 	for _, e in ipairs{ [[\]], [[\bin\]] } do
@@ -280,31 +283,31 @@

 local function get_runtime()
-    local f
+	local f
 	vars.LUA_RUNTIME, f = pe.msvcrt(vars.LUA_BINDIR.."\\"..vars.LUA_INTERPRETER)
 	if type(vars.LUA_RUNTIME) ~= "string" then
 		-- analysis failed, issue a warning
 		vars.LUA_RUNTIME = "MSVCR80"
 		print("*** WARNING ***: could not analyse the runtime used, defaulting to "..vars.LUA_RUNTIME)
-    else
+	else
 		print("    "..f.." uses "..vars.LUA_RUNTIME..".DLL as runtime")
 	end
 	return true
 end

 local function get_architecture()
-    -- detect processor arch interpreter was compiled for
-    local proc = (pe.parse(vars.LUA_BINDIR.."\\"..vars.LUA_INTERPRETER) or {}).Machine
-    if not proc then
-        die("Could not detect processor architecture used in "..vars.LUA_INTERPRETER)
-    end
-    proc = pe.const.Machine[proc]  -- collect name from constant value
-    if proc == "IMAGE_FILE_MACHINE_I386" then
-        proc = "x86"
-    else
-        proc = "x86_64"
-    end
-    return proc
+	-- detect processor arch interpreter was compiled for
+	local proc = (pe.parse(vars.LUA_BINDIR.."\\"..vars.LUA_INTERPRETER) or {}).Machine
+	if not proc then
+		die("Could not detect processor architecture used in "..vars.LUA_INTERPRETER)
+	end
+	proc = pe.const.Machine[proc]  -- collect name from constant value
+	if proc == "IMAGE_FILE_MACHINE_I386" then
+		proc = "x86"
+	else
+		proc = "x86_64"
+	end
+	return proc
 end

 local function look_for_lua_install ()
@@ -369,6 +372,16 @@
 	["/BIN"] = true,
 	["/LIB"] = true,
 }
+-- reconstruct argument values with spaces
+if #arg > 1 then
+	for i = #arg - 1, 1, -1 do
+		if (arg[i]:sub(1,1) ~= "/") and (arg[i+1]:sub(1,1) ~= "/") then
+			arg[i] = arg[i].." "..arg[i+1]
+			table.remove(arg, i+1)
+		end
+	end
+end
+
 local i = 1
 while i <= #arg do
 	local opt = arg[i]
@@ -409,10 +422,10 @@
 	vars.LUA_LIBDIR = vars.LIBDIR
 	vars.LUA_INCDIR = vars.INCDIR
 	vars.LUA_LIBNAME = "lua5.1.lib"
-    vars.LUA_RUNTIME = "MSVCR80"
-    vars.UNAME_M = "x86"
+	vars.LUA_RUNTIME = "MSVCR80"
+	vars.UNAME_M = "x86"
 else
-    vars.UNAME_M = get_architecture()
+	vars.UNAME_M = get_architecture()
 	print(S[[

 Will configure LuaRocks with the following paths:


Install support for non-standard Git locations

Install support for skipping NetFX checks.

Install support for custom installation location.

--- install.cmd
+++ install.cmd
@@ -5,23 +5,97 @@
 SET gitExtensionName="Microsoft Git Credential Manager for Windows"
 SET name=manager
 SET exeName=git-credential-%name%.exe
-SET destination=%~dp0
 SET installPath=%~dp0
 SET gitInstalled=0
 SET netfxInstalled=0
+SET pathToGit=""
+
+SET paramGitPath=""
+SET paramNetfx=0
+SET paramInstallTo=""

 :HELLO

     ECHO Hello! I'll install %gitExtensionName%.
     ECHO(
+
+
+:PARAMETERS
+
+    SETLOCAL ENABLEDELAYEDEXPANSION
+
+    :: if the value of %~1 is empty, there are no more parameters to parse so break
+    IF "%~1" EQU "" GOTO :PARAMETERS_END
+
+    :: check for help queries
+    IF "%~1" EQU "--help" (
+        GOTO :PRINT_HELP
+    )
+    IF "%~1" EQU "/?" (
+        GOTO :PRINT_HELP
+    )
+
+    :: check for --install-to options
+    IF "%~1" EQU "--install-to" (
+        IF EXIST "%~2" (
+            SET paramInstallTo="%~2"
+            CALL :DEQUOTE paramInstallTo
+
+            ECHO Install path set to "!paramInstallTo!".
+
+            SHIFT
+        )
+        IF NOT EXIST "%~2" (
+            ECHO Supplied install path "%~2" appears to be invalid.
+
+            EXIT /B 9
+        )
+    )
+
+    :: check for special git install locations
+    IF "%~1" EQU "--git-path" (
+        IF EXIST "%~2" (
+            IF EXIST "%~2\Cmd\Git.exe" (
+                SET paramGitPath = "%~2\Cmd\Git.exe"
+                CALL :DEQUOTE paramGitPath
+
+                ECHO Git path set to "!paramGitPath!".
+
+                SHIFT
+            )
+            IF NOT EXIST "%~2\Cmd\Git.exe" (
+                ECHO Supplied Git path "%~2" appears to be invalid.
+
+                EXIT /B 9
+            )
+        )
+        IF NOT EXIST "%~2" (
+            ECHO Supplied Git path "%~2" appears to be invalid.
+
+            EXIT /B 9
+        )
+    )
+
+    :: check for skipping NetFX detection
+    IF "%~1" EQU "--no-netfx" (
+        SET paramNetfx=1
+    )
+
+    SHIFT
+
+    GOTO :PARAMETERS
+
+:PARAMETERS_END
+
+    SETLOCAL DISABLEDELAYEDEXPANSION

 :CHECK_PERMISSIONS

     :: Installation requires elevated privileges to write to the `Program Files` directories
     net session >nul 2>&1
-    IF %errorLevel% == 0 (
+    IF %errorLevel% EQU 0 (
         GOTO :INSTALL
     ) ELSE (
         GOTO :NEED_ADMIN_ACCESS
@@ -40,74 +114,93 @@
     (REG QUERY %netfxClient%| findstr "Release"| findstr /I "0x5C786" 1>nul 2>&1) && SET netfxInstalled=1
     (REG QUERY %netfxClient%| findstr "Release"| findstr /I "0x5CBF5" 1>nul 2>&1) && SET netfxInstalled=1
     (REG QUERY %netfxClient%| findstr "Release"| findstr /I "0x6004F" 1>nul 2>&1) && SET netfxInstalled=1
-    (REG QUERY %netfxClient%| findstr "Release"| findstr /I "0x60050" 1>nul 2>&1) && SET netfxInstalled=1
     (REG QUERY %netfxClient%| findstr "Release"| findstr /I "0x60051" 1>nul 2>&1) && SET netfxInstalled=1

     (REG QUERY %netfxClient%| findstr "Release"| findstr /I "378675" 1>nul 2>&1) && SET netfxInstalled=1
     (REG QUERY %netfxClient%| findstr "Release"| findstr /I "378758" 1>nul 2>&1) && SET netfxInstalled=1
     (REG QUERY %netfxClient%| findstr "Release"| findstr /I "379893" 1>nul 2>&1) && SET netfxInstalled=1
     (REG QUERY %netfxClient%| findstr "Release"| findstr /I "393295" 1>nul 2>&1) && SET netfxInstalled=1
-    (REG QUERY %netfxClient%| findstr "Release"| findstr /I "393296" 1>nul 2>&1) && SET netfxInstalled=1
     (REG QUERY %netfxClient%| findstr "Release"| findstr /I "393297" 1>nul 2>&1) && SET netfxInstalled=1

     (REG QUERY %netfxFull%| findstr "Release"| findstr /I "0x5C733" 1>nul 2>&1) && SET netfxInstalled=1
     (REG QUERY %netfxFull%| findstr "Release"| findstr /I "0x5C786" 1>nul 2>&1) && SET netfxInstalled=1
     (REG QUERY %netfxFull%| findstr "Release"| findstr /I "0x5CBF5" 1>nul 2>&1) && SET netfxInstalled=1
     (REG QUERY %netfxFull%| findstr "Release"| findstr /I "0x6004F" 1>nul 2>&1) && SET netfxInstalled=1
-    (REG QUERY %netfxFull%| findstr "Release"| findstr /I "0x60050" 1>nul 2>&1) && SET netfxInstalled=1
     (REG QUERY %netfxFull%| findstr "Release"| findstr /I "0x60051" 1>nul 2>&1) && SET netfxInstalled=1

     (REG QUERY %netfxFull%| findstr "Release"| findstr /I "378675" 1>nul 2>&1) && SET netfxInstalled=1
     (REG QUERY %netfxFull%| findstr "Release"| findstr /I "378758" 1>nul 2>&1) && SET netfxInstalled=1
     (REG QUERY %netfxFull%| findstr "Release"| findstr /I "379893" 1>nul 2>&1) && SET netfxInstalled=1
     (REG QUERY %netfxFull%| findstr "Release"| findstr /I "393295" 1>nul 2>&1) && SET netfxInstalled=1
-    (REG QUERY %netfxFull%| findstr "Release"| findstr /I "393296" 1>nul 2>&1) && SET netfxInstalled=1
     (REG QUERY %netfxFull%| findstr "Release"| findstr /I "393297" 1>nul 2>&1) && SET netfxInstalled=1

-    IF %netfxInstalled% NEQ 1 (
-        GOTO :NO_NETFX_FOUND
-    )
-
-    :: See if and where Git installed
+    IF %paramNetfx% EQU 1 (
+        ECHO NetFX detection skipped.
+    )
+    IF %paramNetfx% NEQ 1 (
+        IF %netfxInstalled% EQU 1 (
+            ECHO NetFX found.
+        )
+        IF %netfxInstalled% NEQ 1 (
+            GOTO :NO_NETFX_FOUND
+        )
+    )
+
+    IF EXIST "%paramInstallTo%" (
+        :: custom location
+        ECHO Deploying to custom location...
+        ECHO(
+
+        CALL :PERFORM_SETUP "%paramInstallTo%" "<empty>"
+    )
+
+    :: See if and where Git installed (in order of desirability)
     ECHO Looking for Git installation(s)...
+
+
+    IF EXIST "%paramGitPath%\mingw64\libexec\git-core\" (
+        :: 64-bit Git for Windows 2.x
+        CALL :PERFORM_SETUP "%paramGitPath%\mingw64\libexec\git-core\" "%paramGitPath%\Git\Cmd"
+    )
+
+    IF EXIST "%paramGitPath%\mingw32\libexec\git-core\" (
+        :: 32-bit Git for Windows 2.x
+        CALL :PERFORM_SETUP "%paramGitPath%\mingw32\libexec\git-core\" "%paramGitPath%\Git\Cmd"
+    )
+
+    IF EXIST "%paramGitPath%\libexec\git-core\" (
+        :: 32-bit Git for Windows 1.x
+        CALL :PERFORM_SETUP "%paramGitPath%\libexec\git-core\" "%paramGitPath%\Git\Cmd"
+    )
+
+    IF EXIST "%ProgramFiles%\Git\mingw64\libexec\git-core\" (
+        :: 64-bit Git for Windows 2.x on 64-bit Windows
+        CALL :PERFORM_SETUP "%ProgramFiles%\Git\mingw64\libexec\git-core\" "%ProgramFiles%\Git\Cmd"
+    )
+
+    IF EXIST "%ProgramFiles%\Git\mingw32\libexec\git-core\" (
+        :: 32-bit Git for Windows 2.x on 32-bit Windows
+        CALL :PERFORM_SETUP "%ProgramFiles%\Git\mingw32\libexec\git-core\" "%ProgramFiles%\Git\Cmd"
+
+    )
+
+    IF EXIST "%ProgramFiles(x86)%\Git\mingw32\libexec\git-core\" (
+        :: 32-bit Git for Windows 2.x on 64-bit Windows
+        CALL :PERFORM_SETUP "%ProgramFiles(x86)%\Git\mingw32\libexec\git-core\" "%ProgramFiles(x86)%\Git\Cmd"
+    )

     IF EXIST "%ProgramFiles%\Git\libexec\git-core\" (
         :: 32-bit Git for Windows 1.x on 32-bit Windows
-        SET destination="%ProgramFiles%\Git\libexec\git-core\"
-
-        CALL :PERFORM_SETUP
+        CALL :PERFORM_SETUP "%ProgramFiles%\Git\libexec\git-core\" "%ProgramFiles%\Git\Cmd"
     )

     IF EXIST "%ProgramFiles(x86)%\Git\libexec\git-core\" (
         :: 32-bit Git for Windows 1.x on 64-bit Windows
-        SET destination="%ProgramFiles(x86)%\Git\libexec\git-core\"
-
-        CALL :PERFORM_SETUP
-    )
-
-    IF EXIST "%ProgramFiles%\Git\mingw32\libexec\git-core\" (
-        :: 32-bit Git for Windows 2.x on 32-bit Windows
-        SET destination="%ProgramFiles%\Git\mingw64\libexec\git-core\"
-
-        CALL :PERFORM_SETUP
-    )
-
-    IF EXIST "%ProgramFiles(x86)%\Git\mingw32\libexec\git-core\" (
-        :: 32-bit Git for Windows 2.x on 64-bit Windows
-        SET destination="%ProgramFiles(x86)%\Git\mingw32\libexec\git-core\"
-
-        CALL :PERFORM_SETUP
-    )
-
-    IF EXIST "%ProgramFiles%\Git\mingw64\libexec\git-core\" (
-        :: 64-bit Git for Windows 2.x on 64-bit Windows
-        SET destination="%ProgramFiles%\Git\mingw64\libexec\git-core\"
-
-        CALL :PERFORM_SETUP
+        CALL :PERFORM_SETUP "%ProgramFiles(x86)%\Git\libexec\git-core\" "%ProgramFiles(x86)%\Git\Cmd"
     )

     :: Check if Git was found or not
-    IF %gitInstalled% == 1 (
+    IF %gitInstalled% EQU 1 (
         CALL :UPDATE_CONFIG
         GOTO :SUCCESS
     ) ELSE (
@@ -167,13 +260,38 @@

 :PERFORM_SETUP

-    ECHO(
-    ECHO Deploying from "%installPath%" to %destination%...
-    ECHO(
+    SET destination="%~1"
+    SET localGitPath="%~2"
+
+    CALL :DEQUOTE destination
+    CALL :DEQUOTE localGitPath
+
+    ECHO(
+    ECHO Deploying from "%installPath%" to "%destination%"...
+    ECHO(
+
+    CALL :DEQUOTE destination

     :: Copy all of the necessary files to the git lib-exec folder
-    (COPY /v /y "%installPath%"*.dll %destination%*.dll) || ((ECHO Oops! Fail to copy content from "%installPath%" to %destination%) && GOTO :FAILURE)
-    (COPY /v /y "%installPath%"*.exe %destination%*.exe) || ((ECHO Oops! Fail to copy content from "%installPath%" to %destination%) && GOTO :FAILURE)
+    (COPY /v /y "%installPath%"*.dll "%destination%"*.dll) || ((ECHO Oops! Fail to copy content from "%installPath%" to "%destination%") && GOTO :FAILURE)
+    (COPY /v /y "%installPath%"*.exe "%destination%"*.exe) || ((ECHO Oops! Fail to copy content from "%installPath%" to "%destination%") && GOTO :FAILURE)
+
+    CALL :DEQUOTE pathToGit
+
+    IF NOT EXIST "%pathToGit%" (
+        IF EXIST "%localGitPath%" (
+
+            SET pathToGit="%localGitPath%"
+            CALL :DEQUOTE pathToGit
+
+            SETLOCAL ENABLEDELAYEDEXPANSION
+
+            ECHO(
+            ECHO Path to Git is "!pathToGit!".
+
+            SETLOCAL DISABLEDELAYEDEXPANSION
+        )
+    )

     SET gitInstalled=1

@@ -185,7 +303,19 @@
     :: Pre-configure it
     ECHO(

-    (git config --global credential.helper %name% && (ECHO Updated your ~\.gitconfig [git config --global])) || GOTO :FAILURE
+    ("%pathToGit%\git.exe" config --global credential.helper %name% && (ECHO Updated your ~\.gitconfig [git config --global])) || GOTO :FAILURE

     GOTO :eof

+
+:DEQUOTE
+
+    FOR /f "delims=" %%A IN ('ECHO %%%1%%') do set %1=%%~A
+    GOTO :eof
+
+
+:PRINT_HELP
+
+    :: Print help information
+
+


Test new upload !errorlevel!

Test new upload !errorlevel!

--- conda/upload.bat
+++ conda/upload.bat
@@ -80,8 +80,7 @@

 set ANACONDA_BUILD_FLAGS=%ANACONDA_CHANNEL_FLAGS% %ANACONDA_BUILD_FLAGS%
 for %%i in (%ANACONDA_BUILD_RECIPES%) do (
-    for /f %%j in ('conda build %%i %ANACONDA_BUILD_FLAGS% --output') do set ANACONDA_UPLOAD_RECIPE=%%j
-    anaconda upload !ANACONDA_UPLOAD_RECIPE! --user %ANACONDA_CHANNEL% %ANACONDA_UPLOAD_FLAGS%
+    for /f %%j in ('conda build %%i %ANACONDA_BUILD_FLAGS% --output') do anaconda upload %%i --user %ANACONDA_CHANNEL% %ANACONDA_UPLOAD_FLAGS%
 )

 anaconda logout


utility script

utility script

error: pathspec 'dev_tools/diff_code.bat' did not match any file(s) known to git

--- dev_tools/diff_code.bat
+++ dev_tools/diff_code.bat
@@ -0,0 +1,3 @@
+
+"C:\Python27\python.exe" diff_code.py
+


add: calculate folder size method

add: calculate folder size method

error: pathspec 'conf/shells/fileSize.bat' did not match any file(s) known to git

--- conf/shells/fileSize.bat
+++ conf/shells/fileSize.bat
@@ -0,0 +1,11 @@
+:: @author Jackie lin
+:: @Date 2014-3-25
+:: @Content deal with mime type
+@echo off&setlocal enabledelayedexpansion
+    set input=%1
+ 	cd /d %input%
+ 	set total=0
+ 	for /f "delims=" %%a in ('dir /b /s /a-d') do set /a total=(!total!+%%~za)
+ 	echo %total%
+pause
+exit


Fix windows-build-deps.cmd

Fix windows-build-deps.cmd

--- tools/windows-build-deps.cmd
+++ tools/windows-build-deps.cmd
@@ -406,20 +406,8 @@
    :: Debug build.
    MSBuild Assimp.sln /p:configuration=Debug /nologo /m:%NUMBER_OF_PROCESSORS%
    copy /Y "bin\Debug\assimpD.dll" "%TUNDRA_BIN%"
-<<<<<<< HEAD
-
-   :: Release or RelWithDebInfo build, depending on which type of release was preferred.
-   IF %BUILD_RELEASE% == TRUE (
-      MSBuild Assimp.sln /p:configuration=Release /nologo /m:%NUMBER_OF_PROCESSORS%
-      copy /Y "bin\Release\assimp.dll" "%TUNDRA_BIN%"
-   ) ELSE (
-      MSBuild Assimp.sln /p:configuration=RelWithDebInfo /nologo /m:%NUMBER_OF_PROCESSORS%
-      copy /Y "bin\RelWithDebInfo\assimp.dll" "%TUNDRA_BIN%"
-   )
-=======
    MSBuild Assimp.sln /p:configuration=%BUILD_TYPE% /nologo /m:%NUMBER_OF_PROCESSORS%
    copy /Y "bin\%BUILD_TYPE%\assimp.dll" "%TUNDRA_BIN%"
->>>>>>> remotes/origin/NoBoostVS2010
 ) ELSE (
    ::TODO Even if %DEPS%\assimp exists, we have no guarantee that assimp is built successfully for real
    cecho {0D}OpenAssetImport already built. Skipping.{# #}{\n}


Forgot to re-add Pro tests after checking tests

--- utils/test/TestKickStart.bat
+++ utils/test/TestKickStart.bat
@@ -41,7 +41,7 @@
 REM py -3.4 TestRunner.py %LOG%
 REM The location of python.exe will depend upon your installation
 REM of ArcGIS Pro. Modify the following line as necessary:
-REM "C:\Program Files\ArcGIS\Pro\bin\Python\envs\arcgispro-py3\python.exe" TestRunner.py %LOG%
+"C:\Program Files\ArcGIS\Pro\bin\Python\envs\arcgispro-py3\python.exe" TestRunner.py %LOG%

 ECHO Python 2.7 Tests ===============================
 REM py -2.7 TestRunner.py %LOG%


[skip travis] make AppVeyor publish binaries again

--- appveyor-build.bat
+++ appveyor-build.bat
@@ -129,7 +129,7 @@
 unit_tests\%Configuration%\server-tests.exe
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR

-IF NOT "%APPVEYOR_REPO_BRANCH%"=="develop" GOTO DONE
+IF NOT "%APPVEYOR_REPO_BRANCH%"=="master" GOTO DONE
 ECHO ========= CREATING PACKAGES ==========

 CD %PROJECT_DIR%\build\%Configuration%


setcepaths: add support for wincewm65professional-msvc200? mkspecs

Reviewed-by: mauricek

--- bin/setcepaths.bat
+++ bin/setcepaths.bat
@@ -79,6 +79,11 @@
 tmp_created_script_setup.bat
 del tmp_created_script_setup.bat
 echo Windows Mobile 6 Professional selected, environment is set up
+) ELSE IF "%1" EQU "wincewm65professional-msvc2005" (
+checksdk.exe -sdk "Windows Mobile 6 Professional SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Windows Mobile 6 Professional selected, environment is set up
 ) ELSE IF "%1" EQU "wincewm60standard-msvc2005" (
 checksdk.exe -sdk "Windows Mobile 6 Standard SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
 tmp_created_script_setup.bat
@@ -124,6 +129,11 @@
 tmp_created_script_setup.bat
 del tmp_created_script_setup.bat
 echo Windows Mobile 6 Professional selected, environment is set up
+) ELSE IF "%1" EQU "wincewm65professional-msvc2008" (
+checksdk.exe -sdk "Windows Mobile 6 Professional SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
+tmp_created_script_setup.bat
+del tmp_created_script_setup.bat
+echo Windows Mobile 6 Professional selected, environment is set up
 ) ELSE IF "%1" EQU "wincewm60standard-msvc2008" (
 checksdk.exe -sdk "Windows Mobile 6 Standard SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL
 tmp_created_script_setup.bat


add sublime.bat

add sublime.bat

error: pathspec 'batch/sublime.bat' did not match any file(s) known to git

--- batch/sublime.bat
+++ batch/sublime.bat
@@ -0,0 +1,25 @@
+@echo off
+
+setlocal enabledelayedexpansion
+
+set sublime=
+if defined ProgramFiles (
+	set sublime=!ProgramFiles:"=!\Sublime Text 3\sublime_text.exe
+	if exist "!sublime!" goto :found
+)
+if defined ProgramFiles(x86) (
+	set sublime=!ProgramFiles:"=!\Sublime Text 3\sublime_text.exe
+	if exist "!sublime!" goto :found
+)
+
+goto :notfound
+
+:found
+"!sublime!" %*
+goto :eof
+
+:notfound
+set /p ign="sublime not found, press enter key to exit ..."
+goto :eof
+
+endlocal


Update initialize_environment.bat

Update initialize_environment.bat

--- resources/functions/initialize_environment.bat
+++ resources/functions/initialize_environment.bat
@@ -6,8 +6,8 @@

 :: Tron Project version and date. These two variables determine the overall project version and date
-set TRON_VERSION=10.7.6
-set TRON_DATE=2019-02-xx
+set TRON_VERSION=10.7.7
+set TRON_DATE=2019-03-09

 :: Set window title
 title Tron v%TRON_VERSION% (%TRON_DATE%)