the Windows batch file works without JAVA_HOME and with white space in directory names

--- cli-distro/bin/gdi.bat
+++ cli-distro/bin/gdi.bat
@@ -1,39 +1,46 @@
-@echo off
-setlocal ENABLEDELAYEDEXPANSION
-
-SET PRJ_BIN=%~dp0
-SET PRJ=%PRJ_BIN%..
-
-if not "%JAVA_HOME%" == "" goto jhomeok
-
-echo.
-echo ERROR: JAVA_HOME not found in your environment.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation
-echo.
-goto error
-
-:jhomeok
-if exist "%JAVA_HOME%\bin\java.exe" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory.
-echo JAVA_HOME = "%JAVA_HOME%"
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation
-echo.
-goto error
-
-:execute
-
-if defined CLASSPATH (set CLSPTH=%CLASSPATH%;%PRJ%;.) else (set CLSPTH=%PRJ%)
-FOR /R %PRJ%\lib %%G IN (*.jar) DO set CLSPTH=!CLSPTH!;%%G
-
-"%JAVA_HOME%\bin\java.exe" -Xmx512M -Dlog4j.configuration=%PRJ%\log4j.configuration -Dderby.system.home=%PRJ%\db -Djava.io.tmpdir=%PRJ%\tmp -classpath %CLSPTH% com.gooddata.processor.GdcDI %*
-goto end
-
-:error
-@REM error sink
-
-:end
-@REM end of the script+@echo off
+setlocal ENABLEDELAYEDEXPANSION
+
+SET PRJ_BIN=%~dp0
+SET PRJ=%PRJ_BIN%..
+
+if not "%JAVA_HOME%" == "" goto jhomeok
+
+if not "%JAVA_HOME%" == "" goto javaHomeAlreadySet
+for %%P in (%PATH%) do if exist %%P\java.exe set JAVA_EXE=%%P\java.exe
+
+if not "%JAVA_EXE%" == "" goto execute
+
+echo.
+echo ERROR: JAVA_HOME not found in your environment.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation
+echo.
+goto error
+
+:jhomeok
+set JAVA_EXE=%JAVA_HOME%\bin\java.exe
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory.
+echo JAVA_HOME = "%JAVA_HOME%"
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation
+echo.
+goto error
+
+:execute
+
+if defined CLASSPATH (set CLSPTH=%CLASSPATH%;%PRJ%;.) else (set CLSPTH=%PRJ%)
+
+FOR /R "%PRJ%\lib" %%G IN (*.jar) DO set CLSPTH=!CLSPTH!;%%G
+
+"%JAVA_EXE%" -Xmx512M -Dlog4j.configuration="%PRJ%\log4j.configuration" -Dderby.system.home="%PRJ%\db" -Djava.io.tmpdir="%PRJ%\tmp" -classpath "%CLSPTH%" com.gooddata.processor.GdcDI %*
+goto end
+
+:error
+@REM error sink
+
+:end
+@REM end of the script


Fix a typo about toolset.

Fix a typo about toolset.

--- src/Native/Windows/gen-buildsys-win.bat
+++ src/Native/Windows/gen-buildsys-win.bat
@@ -10,7 +10,7 @@

 setlocal
 set __sourceDir=%~dp0
-:: VS 2015 is the minimum supported OS
+:: VS 2015 is the minimum supported toolset
 set __VSString=14 2015

 :: Set the target architecture to a format cmake understands. ANYCPU defaults to x64


fixed bug in installer script (not all template files were copied for the FRENCH version)


Update generate_solution.bat

Update generate_solution.bat

--- script/generate_solution.bat
+++ script/generate_solution.bat
@@ -1,4 +1,3 @@
 mkdir build
 cd build
 cmake ..
-cd ..


to Revision: 65919

to Revision: 65919

git-svn-id: 8e6dadeb865701f38789a88d039ad73f285cd5d0@65920 954022d7-b5bf-4e40-9824-e11837661b57

--- install_file_converter.bat
+++ install_file_converter.bat
@@ -6,15 +6,15 @@
 ECHO svn update
 ECHO ----------------------------------------

-TortoiseProc.exe /command:update /path:"%~dp0" /closeonend:0
-TortoiseProc.exe /command:update /path:"%~dp0\..\OfficeWeb" /closeonend:0
-TortoiseProc.exe /command:update /path:"%~dp0\..\ServerComponents\SDK\lib\win_32" /closeonend:0
-TortoiseProc.exe /command:update /path:"%~dp0\..\ServerComponents\SDK\lib\DoctRenderer.config" /closeonend:0
-TortoiseProc.exe /command:update /path:"%~dp0\..\ServerComponents\SDK\bin\windows" /closeonend:0
-TortoiseProc.exe /command:update /path:"%~dp0\..\ServerComponents\SDK\bin\AllFontsGen" /closeonend:0
-TortoiseProc.exe /command:update /path:"%~dp0\..\ServerComponents\UnicodeConverter\icubuilds\win32\bin" /closeonend:0
-TortoiseProc.exe /command:update /path:"%~dp0\..\ServerComponents\DesktopEditor\ChromiumBasedEditors\app\cefbuilds\win32" /closeonend:0
-TortoiseProc.exe /command:update /path:"%~dp0\..\AsyncServerComponents\Bin\Windows" /closeonend:0
+TortoiseProc.exe /command:update /path:"%~dp0" /closeonend:1
+TortoiseProc.exe /command:update /path:"%~dp0\..\OfficeWeb" /closeonend:1
+TortoiseProc.exe /command:update /path:"%~dp0\..\ServerComponents\SDK\lib\win_32" /closeonend:1
+TortoiseProc.exe /command:update /path:"%~dp0\..\ServerComponents\SDK\lib\DoctRenderer.config" /closeonend:1
+TortoiseProc.exe /command:update /path:"%~dp0\..\ServerComponents\SDK\bin\windows" /closeonend:1
+TortoiseProc.exe /command:update /path:"%~dp0\..\ServerComponents\SDK\bin\AllFontsGen" /closeonend:1
+TortoiseProc.exe /command:update /path:"%~dp0\..\ServerComponents\UnicodeConverter\icubuilds\win32\bin" /closeonend:1
+TortoiseProc.exe /command:update /path:"%~dp0\..\ServerComponents\DesktopEditor\ChromiumBasedEditors\app\cefbuilds\win32" /closeonend:1
+TortoiseProc.exe /command:update /path:"%~dp0\..\AsyncServerComponents\Bin\Windows" /closeonend:1

 ECHO ----------------------------------------
 ECHO copy file to converter


lenya servlet is now the default action. a double click will now launch lenya properly

git-svn-id: f6f45834fccde298d83fbef5743c9fd7982a26a3@41757 13f79535-47bb-0310-9956-ffa450edef68


adding windows bootstram.cmd

adding windows bootstram.cmd

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

--- bin/bootstrap.cmd
+++ bin/bootstrap.cmd
@@ -0,0 +1,17 @@
+REM Install Chocolatey
+@powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin
+
+REM install git
+c:\programdata\chocolatey\bin\choco.exe install git wget puppet -y
+
+REM install r10k
+"c:\Program Files\Puppet Labs\Puppet\sys\ruby\bin\gem" install r10k
+
+REM retrieve Puppetfile
+cd c:\ProgramData\PuppetLabs\puppet\etc\
+
+c:\programdata\chocolatey\bin\wget.exe -cv https://raw.githubusercontent.com/ppouliot/puppet-Puppetfile_Env/master/Puppetfile.windows -o Puppetfile
+
+REM Execute Puppet
+"c:\Program Files\Puppet Labs\Puppet\bin\puppet.bat" apply --debug --trace --verbose --modulepath=c:\ProgramData\PuppetLabs\puppet\etc\modules c:\ProgramData\PuppetLabs\puppet\etc\manifests
+


[bouqueau] update batch installer

[bouqueau] update batch installer

--- generate_installer.bat
+++ generate_installer.bat
@@ -12,7 +12,9 @@
 REM ============================================

 set NSIS_EXEC="%PROGRAMFILES%\NSIS\makensis.exe"
-echo   Assuming NSIS at default location %NSIS_EXEC%
+if not exist "%PROGRAMFILES%\NSIS\makensis.exe" echo   NSIS couldn't be found at default location %NSIS_EXEC%
+if not exist "%PROGRAMFILES%\NSIS\makensis.exe" goto Abort
+echo   Found NSIS at default location %NSIS_EXEC%

 echo:
@@ -20,7 +22,7 @@
 echo Retrieving version/revision information
 REM ============================================
 if not exist include/gpac/version.h echo   version couldn't be found - check include/gpac/version.h exists
-if not exist include/gpac/version.h goto abort
+if not exist include/gpac/version.h goto Abort

 REM execute svnversion and check if the result if found within version.h
 for /f "delims=" %%i in ('svnversion.exe') do Set VarRevisionSVN=%%i
@@ -30,9 +32,11 @@
 for /f "delims=" %%i in ('echo %VarRevisionSVN% ^| findstr /i /r P^"') do goto RevisionAbort
 for /f "delims=" %%i in ('echo %VarRevisionSVN% ^| findstr /i /r :^"') do goto RevisionAbort
 for /f "delims=" %%i in ('type include\gpac\version.h ^| findstr /i /r "%VarRevisionSVN%"') do Set VarRevisionBuild=%%i
-if !"%VarRevisionBuild%"==!"" echo   local revision and last build revision are not congruent - please consider rebuilding before generating an installer
-if !"%VarRevisionBuild%"==!"" goto abort
-echo   version found: %VarRevisionSVN%
+echo VarRevisionBuild = %VarRevisionBuild%
+echo VarRevisionSVN   = %VarRevisionSVN%
+if !"%VarRevisionBuild%"==!"%VarRevisionSVN%" echo   local revision and last build revision are not congruent - please consider rebuilding before generating an installer
+if !"%VarRevisionBuild%"==!"%VarRevisionSVN%" goto Abort
+REM echo   version found: %VarRevisionSVN%

 move bin\win32\release\nsis_install\default.out bin\win32\release\nsis_install\default.out_
 echo Name "GPAC Framework ${GPAC_VERSION} revision %VarRevisionSVN%" > bin\win32\release\nsis_install\default.out
@@ -57,14 +61,16 @@
 REM ============================================
 echo Windows GPAC installer generated - goodbye!
 REM ============================================
-exit/b
+goto LeaveBatch

 :RevisionAbort
 echo   SVN revision "%VarRevisionSVN%" is not a simple number, you may have local modification (please check 'svnrevision' flags meaning or execute the NSIS script manually)

-:abort
+:Abort
 echo:
 echo  *** ABORTING: CHECK ERROR MESSAGES ABOVE ***
+
+:LeaveBatch
 set VarRevisionSVN=
 set VarRevisionBuild=
 cd /d %OLDDIR%


Update RingMySQL - extensions/ringmysql/buildvc.bat

--- extensions/ringmysql/buildvc.bat
+++ extensions/ringmysql/buildvc.bat
@@ -1,5 +1,5 @@
 cls
 call ../../src/locatevc.bat
-cl /c /DEBUG ring_vmmysql.c -I"..\..\include" -I"..\..\libdepwin\mysql\include"
-link /DEBUG ring_vmmysql.obj  ..\..\lib\ring.lib ..\..\libdepwin\MySQL\lib\libmysql.lib /DLL /OUT:..\..\bin\ring_mysql.dll /SUBSYSTEM:CONSOLE,"5.01"
+cl /c /DEBUG ring_vmmysql.c -I"..\..\include" -I"..\..\extensions\libdepwin\mysql\include"
+link /DEBUG ring_vmmysql.obj  ..\..\lib\ring.lib ..\..\extensions\libdepwin\MySQL\lib\libmysql.lib /DLL /OUT:..\..\bin\ring_mysql.dll /SUBSYSTEM:CONSOLE,"5.01"
 del ring_vmmysql.obj


add ipset.bat -- the Windows Quick IP Setter;

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

--- ipset.bat
+++ ipset.bat
@@ -0,0 +1,56 @@
+@echo off
+
+echo ---------------------------------------------------------------------------
+echo                             Quick IP Setter
+echo               Copyright (c) 2014 Cai Guanhao (Choi Goon-ho)
+
+:start
+echo ---------------------------------------------------------------------------
+
+for /f %%A in ('"prompt $H &echo on &for %%B in (1) do rem"') do set BS=%%A
+
+:hostipaddr
+set /p hostipaddr="%BS%              XenServer Host IP: "
+if [%hostipaddr%]==[] goto hostipaddr
+
+:vmposition
+set /p vmposition="%BS%      Position of this VM [1-4]: "
+if [%vmposition%]==[] goto vmposition
+
+set /p subnetmask="%BS%  Subnet mask [255.255.255.248]: "
+if [%subnetmask%]==[] set subnetmask="255.255.255.248"
+
+set /p local_conn="%BS%   Connection [LocalConnection]: "
+if [%local_conn%]==[] set local_conn="LocalConnection"
+
+set subnetmask=%subnetmask:"=%
+set local_conn=%local_conn:"=%
+
+for /f "tokens=1-4 delims=." %%a in ("%hostipaddr%") do (
+  set first=%%a.%%b.%%c
+  set /a minus=%%d-1
+  set /a add=%%d+%vmposition%
+)
+
+echo ---------------------------------------------------------------------------
+echo                         Gateway:  %first%.%minus%
+echo               XenServer Host IP:  %hostipaddr%
+echo                      IP address:  %first%.%add%
+echo                     Subnet Mask:  %subnetmask%
+
+echo ---------------------------------------------------------------------------
+set /p OK="%BS%    [Enter to Yes, others to No]  Is this OK? "
+
+if [%OK%]==[] netsh interface ip set address name="%local_conn%"^
+  static %first%.%add% %subnetmask% %first%.%minus% 1
+if [%OK%]==[] netsh interface ip set dns name="%local_conn%"^
+  static 8.8.8.8 >nul
+if [%OK%]==[] netsh interface ip add dns name="%local_conn%"^
+  8.8.4.4 index=2 >nul
+
+if %ERRORLEVEL% GEQ 1 goto start
+
+if [%OK%]==[] ^
+echo                          Status:  Completed! Press enter to leave.
+
+pause >nul


Add OpenWithSublimeText3 context menu Windows script

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

--- vendor/OpenWithSublimeText3.bat
+++ vendor/OpenWithSublimeText3.bat
@@ -0,0 +1,13 @@
+@echo off
+SET st2Path=C:\Program Files\Sublime Text 3\sublime_text.exe
+
+rem add it for all file types
+@reg add "HKEY_CLASSES_ROOT\*\shell\Open with Sublime Text 3"         /t REG_SZ /v "" /d "Open with Sublime Text 3"   /f
+@reg add "HKEY_CLASSES_ROOT\*\shell\Open with Sublime Text 3"         /t REG_EXPAND_SZ /v "Icon" /d "%st2Path%,0" /f
+@reg add "HKEY_CLASSES_ROOT\*\shell\Open with Sublime Text 3\command" /t REG_SZ /v "" /d "%st2Path% \"%%1\"" /f
+
+rem add it for folders
+@reg add "HKEY_CLASSES_ROOT\Folder\shell\Open with Sublime Text 3"         /t REG_SZ /v "" /d "Open with Sublime Text 3"   /f
+@reg add "HKEY_CLASSES_ROOT\Folder\shell\Open with Sublime Text 3"         /t REG_EXPAND_SZ /v "Icon" /d "%st2Path%,0" /f
+@reg add "HKEY_CLASSES_ROOT\Folder\shell\Open with Sublime Text 3\command" /t REG_SZ /v "" /d "%st2Path% \"%%1\"" /f
+pause


Update extract_includes.bat to include new public headers in rev 120.

--- vsprojects/extract_includes.bat
+++ vsprojects/extract_includes.bat
@@ -8,6 +8,7 @@
 md include\google\protobuf\compiler\java
 md include\google\protobuf\compiler\python
 copy ..\src\google\protobuf\stubs\common.h include\google\protobuf\stubs\common.h
+copy ..\src\google\protobuf\stubs\once.h include\google\protobuf\stubs\once.h
 copy ..\src\google\protobuf\descriptor.h include\google\protobuf\descriptor.h
 copy ..\src\google\protobuf\descriptor.pb.h include\google\protobuf\descriptor.pb.h
 copy ..\src\google\protobuf\descriptor_database.h include\google\protobuf\descriptor_database.h
@@ -23,6 +24,7 @@
 copy ..\src\google\protobuf\wire_format.h include\google\protobuf\wire_format.h
 copy ..\src\google\protobuf\wire_format_inl.h include\google\protobuf\wire_format_inl.h
 copy ..\src\google\protobuf\io\coded_stream.h include\google\protobuf\io\coded_stream.h
+copy ..\src\google\protobuf\io\gzip_stream.h include\google\protobuf\io\gzip_stream.h
 copy ..\src\google\protobuf\io\printer.h include\google\protobuf\io\printer.h
 copy ..\src\google\protobuf\io\tokenizer.h include\google\protobuf\io\tokenizer.h
 copy ..\src\google\protobuf\io\zero_copy_stream.h include\google\protobuf\io\zero_copy_stream.h


Changed window title to Apache Lenya

Changed window title to Apache Lenya

git-svn-id: c334bb69c16d150e1b06e84516f7aa90b3181ca2@158355 13f79535-47bb-0310-9956-ffa450edef68

--- lenya.bat
+++ lenya.bat
@@ -57,7 +57,7 @@

 if not "%EXEC%" == "" goto gotExec
 if not "%OS%" == "Windows_NT" goto noExecNT
-set EXEC=start "Lenya" /D. /MAX
+set EXEC=start "Apache Lenya" /D. /MAX
 goto gotExec
 :noExecNT
 set EXEC=


Updated batch file

Updated batch file

--- workspace/git_batch.bat
+++ workspace/git_batch.bat
@@ -1,45 +1,56 @@
 git submodule add git://github.com/pointybeard/asdc.git extensions/asdc
+git submodule add git://github.com/Solutions-Nitriques/anti_brute_force.git extensions/anti_brute_force
+git submodule add git://github.com/Solutions-Nitriques/auto_collapse_fields.git extensions/auto_collapse_fields
+
+git submodule add git://github.com/davjand/better_forms.git extensions/better_forms
+git submodule add git://github.com/davjand/configuration.git extensions/configuration
+git submodule add git://github.com/remie/CDI.git extensions/cdi
+
+git submodule add git://github.com/kanduvisla/symphony-ckeditor.git extensions/ckeditor
+git submodule add git://github.com/czheng/datemodified.git extensions/datemodified
+git submodule add git://github.com/czheng/documenter.git extensions/documenter
+
 git submodule add git://github.com/nickdunn/dashboard.git extensions/dashboard
-git submodule add git://github.com/makenosound/dynamic_event_redirect.git extensions/dynamic_event_redirect
+git submodule add git://github.com/nilshoerrmann/datetime.git extensions/datetime
+git submodule add git://github.com/brendo/default_event_values.git extensions/default_event_values
+
+git submodule add git://github.com/nils-werner/dump_db.git extensions/dump_db
+git submodule add git://github.com/creativedutchmen/email_template_manager.git extensions/email_template_manager
+git submodule add git://github.com/eKoeS/edui.git extensions/edui
 git submodule add git://github.com/nickdunn/entity_diagram.git extensions/entity_diagram
-git submodule add git://github.com/czheng/datemodified.git extensions/datemodified
+
+git submodule add git://github.com/rowan-lewis/globalresourceloader.git extensions/globalresourceloader
 git submodule add git://github.com/nickdunn/html_panel.git extensions/html_panel
-git submodule add git://github.com/klaftertief/imagecropper.git extensions/imagecropper
-git submodule add git://github.com/michael-e/uniqueuploadfield.git extensions/uniqueuploadfield
-git submodule add git://github.com/nickdunn/incrementnumberfield.git extensions/incrementnumberfield
-git submodule add git://github.com/symphonycms/numberfield.git extensions/numberfield
-
-git submodule add git://github.com/srowan-lewis/emailtemplatefilter.git extensions/emailtemplatefilter
-git submodule add git://github.com/rowan-lewis/globalresourceloader.git extensions/globalresourceloader
 git submodule add git://github.com/kanduvisla/importcsv.git extensions/importcsv

+git submodule add git://github.com/klaftertief/imagecropper.git extensions/imagecropper
+git submodule add git://github.com/nickdunn/incrementnumberfield.git extensions/incrementnumberfield
+git submodule add git://github.com/klaftertief/jit_image_manipulation.git extensions/jit_image_manipulation
+
+git submodule add git://github.com/symphonycms/numberfield.git extensions/numberfield
 git submodule add git://github.com/nickdunn/order_entries.git extensions/order_entries
+git submodule add git://github.com/nickdunn/publish_tabs.git extensions/publish_tabs

-git submodule add git://github.com/nickdunn/publishfiltering.git extensions/publishfiltering
-git submodule add git://github.com/nickdunn/publish_tabs.git extensions/publish_tabs
+git submodule add git://github.com/davjand/publishfiltering.git extensions/publishfiltering
 git submodule add git://github.com/knupska/quickds.git extensions/quickds
 git submodule add git://github.com/knupska/quickevent.git extensions/quickevent
+
+git submodule add git://github.com/czheng/referencelink.git extensions/referencelink
+git submodule add git://github.com/ahwayakchih/sortdatasourcebyparam.git extensions/sortdatasourcebyparam
 git submodule add git://github.com/nickdunn/search_index.git extensions/search_index
-git submodule add git://github.com/vlad-ghita/static_section.git extensions/static_section

+git submodule add git://github.com/nickdunn/sitemap.git extensions/sitemap
+git submodule add git://github.com/nickdunn/symql.git extensions/symql
 git submodule add git://github.com/nilshoerrmann/subsectionmanager.git extensions/subsectionmanager

-git submodule add git://github.com/nickdunn/symql.git extensions/symql
-git submodule add git://github.com/kanduvisla/symphony-ckeditor.git extensions/ckeditor
-
-git submodule add git://github.com/makenosound/jquery_date_picker.git extensions/jquery_date_picker
-git submodule add git://github.com/eKoeS/better_forms.git extensions/better_forms
-git submodule add git://github.com/creativedutchmen/email_template_manager.git extensions/email_template_manager
-git submodule add git://github.com/kanduvisla/involve_your_client.git extensions/involve_your_client
-git submodule add git://github.com/czheng/documenter.git extensions/documenter
-git submodule add git://github.com/bauhouse/configuration.git extensions/configuration
-git submodule add git://github.com/ahwayakchih/sortdatasourcebyparam.git extensions/sortdatasourcebyparam
-git submodule add git://github.com/eKoeS/edui.git extensions/edui
-git submodule add git://github.com/nickdunn/db_sync.git extensions/db_sync
-git submodule add git://github.com/nickdunn/sitemap.git extensions/sitemap
-git submodule add git://github.com/nils-werner/dump_db.git extensions/dump_db
+git submodule add git://github.com/superminge/sitemap_xml.git extensions/sitemap_xml
+git submodule add git://github.com/vlad-ghita/static_section.git extensions/static_section
+git submodule add git://github.com/michael-e/uniqueuploadfield.git extensions/uniqueuploadfield

+
+
+


Update myget script

Update myget script

--- myget.bat
+++ myget.bat
@@ -1,28 +1,26 @@
-call dnvm use 1.0.0-rc1-update1 -r clr
-IF ERRORLEVEL 1 EXIT /B 1
-call dnu restore
-IF ERRORLEVEL 1 EXIT /B 1
-call dnu build src\Google.Api.CommonProtos
-IF ERRORLEVEL 1 EXIT /B 1
-call dnu build src\Google.Api.Gax
-IF ERRORLEVEL 1 EXIT /B 1
-call dnu build src\Google.Api.Gax.Rest
-IF ERRORLEVEL 1 EXIT /B 1
-call dnu build testing\Google.Api.Gax.Testing
-IF ERRORLEVEL 1 EXIT /B 1
-call dnu build test\Google.Api.Gax.Tests
-IF ERRORLEVEL 1 EXIT /B 1
-call dnu build test\Google.Api.Gax.Rest.Tests
-IF ERRORLEVEL 1 EXIT /B 1
-call dnx -p test\Google.Api.Gax.Tests test
-IF ERRORLEVEL 1 EXIT /B 1
-call dnx -p test\Google.Api.Gax.Rest.Tests test
-IF ERRORLEVEL 1 EXIT /B 1
-call dnu pack src\Google.Api.CommonProtos
-IF ERRORLEVEL 1 EXIT /B 1
-call dnu pack src\Google.Api.Gax
-IF ERRORLEVEL 1 EXIT /B 1
-call dnu pack src\Google.Api.Gax.Rest
-IF ERRORLEVEL 1 EXIT /B 1
-call dnu pack testing\Google.Api.Gax.Testing
-IF ERRORLEVEL 1 EXIT /B 1
+call dnvm use 1.0.0-rc1-update1 -r clr || goto error
+call dnu restore || goto error
+
+set PROJECTS=src\Google.Api.CommonProtos src\Google.Api.Gax src\Google.Api.Gax.Rest testing\Google.Api.Gax.Testing
+set TESTS=test\Google.Api.Gax.Tests test\Google.Api.Gax.Rest.Tests
+
+for %%P in (%PROJECTS%) do (
+  call dnu build --configuration %Configuration% %%P || goto error
+)
+
+for %%P in (%TESTS%) do (
+  call dnu build --configuration %Configuration% %%P || goto error
+  call dnx --configuration %Configuration% -p %%P test || goto error
+)
+
+for %%P in (%PROJECTS%) do (
+  call dnu pack --configuration %Configuration% %%P || goto error
+)
+
+goto end
+
+:error
+echo Build failed due to error. Please address.
+exit /b 1
+
+:end


Delete mongod.cmd

Delete mongod.cmd

--- config/mongod.cmd
+++ config/mongod.cmd
@@ -1 +0,0 @@
-"C:\Program Files\MongoDB\Server\3.2\bin\mongod.exe" --dbpath "/data"


"compile.cmd -openmp" compiles ntt*m.exe, "compile.cmd rs -openmp" makes rs*m.exe

--- compile.cmd
+++ compile.cmd
@@ -1,9 +1,10 @@
 @echo off
 set name=ntt
 set main=main.cpp
-::set name=rs
-::set main=rs.cpp
-set options_ms=-MP -Gy -GR- -nologo -Fo%TEMP%\ -Fp%TEMP%\ %main% user32.lib shell32.lib ole32.lib advapi32.lib %* -link -LARGEADDRESSAWARE
+if "%1"=="rs" set name=rs
+if "%1"=="rs" set main=rs.cpp
+if "%1"=="rs" shift
+set options_ms=-MP -Gy -GR- -nologo -Fo%TEMP%\ -Fp%TEMP%\ %main% user32.lib shell32.lib ole32.lib advapi32.lib %1 %2 %3 %4 %5 %6 %7 %8 %9 -link -LARGEADDRESSAWARE
 set options_ms=-GL %options_ms%
 set options_ms_cl=-O2 -EHsc %options_ms%
 set options_ms_x86=-MACHINE:x86 -SUBSYSTEM:CONSOLE,5.01


Create install_pythainlp.bat

Create install_pythainlp.bat

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

--- install_pythainlp.bat
+++ install_pythainlp.bat
@@ -0,0 +1,3 @@
+pip install pipwin
+pipwin install marisa-trie
+pip install pythainlp


Dependencies should be already installed.

--- scripts/build-ott.bat
+++ scripts/build-ott.bat
@@ -13,9 +13,6 @@

 ECHO Creating generated markdown directory
 MKDIR markdown\generated
-
-ECHO Installing node modules and dependencies
-"C:\Program Files\nodejs\npm.cmd" install

 ECHO Setting environment variable
 SET TARGET_API=ott


Embed ssl into installer.

Embed ssl into installer.

--- scripts/win/build.bat
+++ scripts/win/build.bat
@@ -28,6 +28,8 @@
 mkdir iss\content
 copy /Y build\release\ScreenTranslator.exe iss\content\ScreenTranslator.exe
 copy /Y installed\bin\*.dll iss\content
+copy /Y c:\OpenSSL-Win32\bin\libeay32.dll iss\content
+copy /Y c:\OpenSSL-Win32\bin\ssleay32.dll iss\content
 mkdir iss\content\translations
 copy /Y %ROOT%\translations\*.qm iss\content\translations
 mkdir iss\content\translators


updated build script for libwdi to version 1.3.1

--- build/build_libwdi.cmd
+++ build/build_libwdi.cmd
@@ -7,14 +7,15 @@
 REM

 REM set this to the filename of the file to download
-set PREFIX=libwdi-1.3.0
+set VERSION=1.3.1
+set PREFIX=libwdi-%VERSION%
 set LIBUSB_WIN32_PREFIX=libusb-win32-bin-1.2.6.0

 REM set this to your Visual Studio installation folder
 set VSINSTALL=%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community

 REM download package
-set URL=https://netcologne.dl.sourceforge.net/project/libwdi/releases/%PREFIX%.tar.gz
+set URL=https://github.com/pbatard/libwdi/archive/v%VERSION%.tar.gz

 if not exist %PREFIX%.tar.gz powershell -Command "& {Invoke-WebRequest -Uri %URL% -Out %PREFIX%.tar.gz}"

@@ -23,7 +24,8 @@
 del %PREFIX%.tar
 "c:\Program Files\7-Zip\7z.exe" x %PREFIX%.tar.gz
 "c:\Program Files\7-Zip\7z.exe" x %PREFIX%.tar
-del %PREFIX%.tar
+del %PREFIX%.tar 2> nul
+del pax_global_header 2> nul

 REM also download libusb-win32
 set URL=https://netcologne.dl.sourceforge.net/project/libusb-win32/libusb-win32-releases/1.2.6.0/%LIBUSB_WIN32_PREFIX%.zip
@@ -43,24 +45,17 @@
 powershell -Command "& {(Get-Content config.h) -replace \"D:/libusb-win32\",$env:LIBUSB_WIN32_PATH | out-file config.h}"
 popd

-REM update Toolset to v142, in order to use VS2019
-pushd %PREFIX%\libwdi\.msvc
-powershell -Command "& {(Get-Content libwdi_dll.vcxproj) -replace \"v140\",\"v142\" | out-file libwdi_dll.vcxproj}"
-powershell -Command "& {(Get-Content detect_64build.vcxproj) -replace \"v140\",\"v142\" | out-file detect_64build.vcxproj}"
-powershell -Command "& {(Get-Content installer_x86.vcxproj) -replace \"v140\",\"v142\" | out-file installer_x86.vcxproj}"
-powershell -Command "& {(Get-Content installer_x64.vcxproj) -replace \"v140\",\"v142\" | out-file installer_x64.vcxproj}"
-powershell -Command "& {(Get-Content embedder.vcxproj) -replace \"v140\",\"v142\" | out-file embedder.vcxproj}"
-popd
-
 REM set up Visual Studio
 call "%VSINSTALL%\Common7\Tools\VsDevCmd.bat"

 REM compile
-msbuild %PREFIX%\libwdi\.msvc\libwdi_dll.vcxproj /m /property:Configuration=Release,Platform=Win32
+msbuild %PREFIX%\libwdi.sln /m /property:Configuration=Release,Platform=Win32

 REM copy artifacts
-copy "%PREFIX%\Win32\Debug\dll\libwdi.dll" ..\src\Thirdparty\libwdi\
-copy "%PREFIX%\Win32\Debug\dll\libwdi.pdb" ..\src\Thirdparty\libwdi\
-copy "%PREFIX%\Win32\Debug\dll\libwdi.lib" ..\src\Thirdparty\libwdi\
+copy "%PREFIX%\libwdi\libwdi.h" ..\src\Thirdparty\libwdi\
+copy "%PREFIX%\Win32\Release\lib\libwdi.lib" ..\src\Thirdparty\libwdi\
+REM copy "%PREFIX%\Win32\Release\dll\libwdi.dll" ..\src\Thirdparty\libwdi\
+REM copy "%PREFIX%\Win32\Release\dll\libwdi.pdb" ..\src\Thirdparty\libwdi\
+REM copy "%PREFIX%\Win32\Release\dll\libwdi.lib" ..\src\Thirdparty\libwdi\

 pause


*** empty log message ***

*** empty log message ***

--- get-cvs-modules.bat
+++ get-cvs-modules.bat
@@ -1,11 +1,26 @@
-echo off
-echo This script checks out libraries required by little b from SourceForge.net.  To work, cvs.exe (Concurrent Version System) must be in the path.
+@echo USAGE: get-cvs-modules.bat [name]
+@echo Where name = SourceForge login id for the littleb project.
+@echo              If name is missing, checkout is anonymous
+@echo This script checks out libraries required by little b from SourceForge.net.
+@echo To work, cvs.exe (Concurrent Version System) must be in the path.
+@echo And CVS_RSH=path/to/plink.exe

-rmdir lisa
-cvs -d :pserver:anonymous@littleb.cvs.sourceforge.net:/cvsroot/littleb export -r lisa
+rmdir /s /q lisa
+rmdir /s /q graph-tools
+rmdir /s /q slime

-rmdir graph-tools
-cvs -d :pserver:anonymous@littleb.cvs.sourceforge.net:/cvsroot/littleb co -P graph-tools
+@if (%1)==() goto anonymous_checkout
+@set protocol=:ext:%1
+@goto do_checkout
+@:anonymous_checkout
+@set protocol=:pserver:anonymous

-rmdir slime
-cvs -d :pserver:anonymous:anonymous@common-lisp.net:/project/slime/cvsroot co slime
+@:do_checkout
+cvs -z3 -d %protocol%@littleb.cvs.sourceforge.net:/cvsroot/littleb co -P lisa
+cvs -z3 -d %protocol%@littleb.cvs.sourceforge.net:/cvsroot/littleb co -P graph-tools
+cvs -z3 -d :pserver:anonymous@common-lisp.net:/project/slime/cvsroot co slime
+
+@echo Checked out lisa and graph-tools modules as %1 from littleb on Sourceforge
+@echo Checked out slime as anonymous from common-lisp.net
+
+


[build] : added flags for profiling and profiling of the GC activity

--- buildAndRunWindows.bat
+++ buildAndRunWindows.bat
@@ -1,4 +1,4 @@
 set VK_INSTANCE_LAYERS=VK_LAYER_LUNARG_api_dump

-rdmd --build-only -ofSwapchainTest1.exe gdi32.lib -g -wi src/d/SwapChainTest1.d
+rdmd --build-only -ofSwapchainTest1.exe gdi32.lib -g -wi -profile=gc -profile src/d/SwapChainTest1.d
 SwapChainTest1


std.gc and std.dynamic modules are build into nullclib.ncm files.

--- bin/BuildNULLClib.bat
+++ bin/BuildNULLClib.bat
@@ -1,2 +1,2 @@
-nullcl.exe -o nullclib.ncm ..\Modules\img\canvas.nc -m img.canvas ..\Modules\win\window_ex.nc -m win.window_ex ..\Modules\win\window.nc -m win.window ..\Modules\std\typeinfo.nc -m std.typeinfo ..\Modules\std\file.nc -m std.file ..\Modules\std\io.nc -m std.io ..\Modules\std\string.nc -m std.string ..\Modules\std\vector.nc -m std.vector ..\Modules\std\list.nc -m std.list ..\Modules\std\map.nc -m std.map ..\Modules\std\hashmap.nc -m std.hashmap ..\Modules\std\math.nc -m std.math ..\Modules\std\time.nc -m std.time ..\Modules\std\random.nc -m std.random ..\Modules\std\range.nc -m std.range
-nullcl_x64.exe -o nullclib_x64.ncm ..\Modules\img\canvas.nc -m img.canvas ..\Modules\win\window_ex.nc -m win.window_ex ..\Modules\win\window.nc -m win.window ..\Modules\std\typeinfo.nc -m std.typeinfo ..\Modules\std\file.nc -m std.file ..\Modules\std\io.nc -m std.io ..\Modules\std\string.nc -m std.string ..\Modules\std\vector.nc -m std.vector ..\Modules\std\list.nc -m std.list ..\Modules\std\map.nc -m std.map ..\Modules\std\hashmap.nc -m std.hashmap ..\Modules\std\math.nc -m std.math ..\Modules\std\time.nc -m std.time ..\Modules\std\random.nc -m std.random ..\Modules\std\range.nc -m std.range
+nullcl.exe -o nullclib.ncm ..\Modules\img\canvas.nc -m img.canvas ..\Modules\win\window_ex.nc -m win.window_ex ..\Modules\win\window.nc -m win.window ..\Modules\std\typeinfo.nc -m std.typeinfo ..\Modules\std\file.nc -m std.file ..\Modules\std\io.nc -m std.io ..\Modules\std\string.nc -m std.string ..\Modules\std\vector.nc -m std.vector ..\Modules\std\list.nc -m std.list ..\Modules\std\map.nc -m std.map ..\Modules\std\hashmap.nc -m std.hashmap ..\Modules\std\math.nc -m std.math ..\Modules\std\time.nc -m std.time ..\Modules\std\random.nc -m std.random ..\Modules\std\range.nc -m std.range ..\Modules\std\gc.nc -m std.gc ..\Modules\std\dynamic.nc -m std.dynamic
+nullcl_x64.exe -o nullclib_x64.ncm ..\Modules\img\canvas.nc -m img.canvas ..\Modules\win\window_ex.nc -m win.window_ex ..\Modules\win\window.nc -m win.window ..\Modules\std\typeinfo.nc -m std.typeinfo ..\Modules\std\file.nc -m std.file ..\Modules\std\io.nc -m std.io ..\Modules\std\string.nc -m std.string ..\Modules\std\vector.nc -m std.vector ..\Modules\std\list.nc -m std.list ..\Modules\std\map.nc -m std.map ..\Modules\std\hashmap.nc -m std.hashmap ..\Modules\std\math.nc -m std.math ..\Modules\std\time.nc -m std.time ..\Modules\std\random.nc -m std.random ..\Modules\std\range.nc -m std.range ..\Modules\std\gc.nc -m std.gc ..\Modules\std\dynamic.nc -m std.dynamic


Remove $id

Remove $id

git-svn-id: d3b254b790bfb0dc06e982e64646283fdd6e0f68@498487 13f79535-47bb-0310-9956-ffa450edef68

--- bin/jmeter-server.bat
+++ bin/jmeter-server.bat
@@ -1,6 +1,5 @@
 @echo off

-rem   $Id$
 rem   Licensed to the Apache Software Foundation (ASF) under one or more
 rem   contributor license agreements.  See the NOTICE file distributed with
 rem   this work for additional information regarding copyright ownership.


Update make.bat

Update make.bat

--- csbuild/make.bat
+++ csbuild/make.bat
@@ -3,8 +3,8 @@
 mkdir cmake-build\mingw-w64
 cd    cmake-build\mingw-w64
 cmake -G "MinGW Makefiles" ..\..
-cmake --build . --target cs               -- -j4
-cmake --build . --target cs_dbg           -- -j4
+cmake --build . --target cs               -- -j8
+cmake --build . --target cs_dbg           -- -j8
 cd ..\..
 rd /S /Q build
 mkdir build\bin


# Batch file fixed, based on commit PHPUnit commit 32b7c5d813b6401d0e18.

git-svn-id: cf2915278a84f215d13f4657d9fdfc39fabc5cca@293 0bc4ca42-642f-4eb8-9a60-dc4da71a2dd1

--- phpmd.bat
+++ phpmd.bat
@@ -36,5 +36,10 @@
 REM $Id$
 REM

-set PHPBIN="@php_bin@"
-"@php_bin@" "@bin_dir@\phpmd" %*
+if "%PHPBIN%" == "" set PHPBIN=@php_bin@
+if not exist "%PHPBIN%" if "%PHP_PEAR_PHP_BIN%" neq "" goto USE_PEAR_PATH
+GOTO RUN
+:USE_PEAR_PATH
+set PHPBIN=%PHP_PEAR_PHP_BIN%
+:RUN
+"%PHPBIN%" "@bin_dir@\phpmd" %*


Use ERRORLEVEL instead of %errorlevel% to compare git versions

%errorlevel% was always 0, even if the vendored git version was more current than the installed one
Usually exiting a batch script with "exit /b exitCode" as used in :compare_versions
sets %errorlevel% to the specified exit code
However, this may not work if %errorlevel% was set before with "Set errorlevel="
I didn't find the location where this might have happened,
but I saw the consequence of %errorlevel% always being 0
Thus I decided to use ERRORLEVEL instead as this will always work regardless of environment variable

For more information check https://ss64.com/nt/errorlevel.html

--- vendor/lib/lib_git.cmd
+++ vendor/lib/lib_git.cmd
@@ -231,15 +231,15 @@
 :::-------------------------------------------------------------------------------

 :compare_git_versions
-    if %errorlevel% geq 0 (
+    if ERRORLEVEL 0 (
         :: compare the user git version against the vendored version
         %lib_git% compare_versions USER VENDORED

         :: use the user provided git if its version is greater than, or equal to the vendored git
-        if %errorlevel% geq 0 if exist "%test_dir:~0,-4%\cmd\git.exe" (
+        if ERRORLEVEL 0 if exist "%test_dir:~0,-4%\cmd\git.exe" (
             set "GIT_INSTALL_ROOT=%test_dir:~0,-4%"
             set test_dir=
-        ) else if %errorlevel% geq 0 (
+        ) else if ERRORLEVEL 0 (
             set "GIT_INSTALL_ROOT=%test_dir%"
             set test_dir=
         ) else (
@@ -249,7 +249,7 @@
     ) else (
         :: compare the user git version against the vendored version
         :: if the user provided git executable is not found
-        if %errorlevel% equ -255 (
+        IF ERRORLEVEL -255 IF NOT ERRORLEVEL -254 (
             call :verbose_output No git at "%git_executable%" found.
             set test_dir=
         )


Updated update dependencies script to pull in CreateOutputStream exe

--- Build/Scripts/UpdateDependencies.bat
+++ Build/Scripts/UpdateDependencies.bat
@@ -94,6 +94,7 @@
 COPY /Y "%sourcetools%\LogFileViewer\LogFileViewer.exe" "%targettools%\LogFileViewer.exe"
 COPY /Y "%sourcetools%\UpdateTagNames\UpdateTagNames.exe" "%targettools%\UpdateTagNames.exe"
 COPY /Y "%sourcetools%\GEPDataExtractor\GEPDataExtractor.exe" "%targettools%\GEPDataExtractor.exe"
+COPY /Y "%sourcetools%\CreateOutputStream\CreateOutputStream.exe" "%targettools%\CreateOutputStream.exe"
 ECHO Updating Grafana Panels...
 XCOPY "%GrafanaSource%\GPA-PhasorMap" "%GrafanaTarget%\grafana-pmumap-panel\" /Y /E /U
 XCOPY "%GrafanaSource%\Grafana-oh-datadownload" "%GrafanaTarget%\openhistporian-datadownload-panel\" /Y /E /U


Nonadmin windows only v0.5

Nonadmin windows only v0.5

error: pathspec 'user.ps1.bat' did not match any file(s) known to git

--- user.ps1.bat
+++ user.ps1.bat
@@ -0,0 +1,22 @@
+@ 2>/dev/null # 2>nul&echo off&setlocal enabledelayedexpansion&title %~n0&cd %~dp0&echo|set /p=# >"%~nx0.temp.ps1"&type "%~nx0" >>"%~nx0.temp.ps1"
+# 2>nul&powershell -exec bypass -noprofile -file "%~nx0.temp.ps1" %*&set err=!errorlevel!
+# 2>nul&del "%~nx0.temp.ps1"&(if not !err! == 0 (if %0 == "%~0" (echo.&echo|set /p="Press any key to close..."&pause >nul)))&exit /b !err!
+if ($PSScriptRoot -eq $Null) {$PSScriptRoot = Split-Path -Parent -Path $MyInvocation.MyCommand.Definition}
+cd $PSScriptRoot
+function DropExt ($file,$repeat=1) {$a=$file.Split('.');[string]::Join('.', $a[0..($a.count-1-$repeat)])}
+$Host.UI.RawUI.WindowTitle = DropExt $MyInvocation.MyCommand.Name 3
+function pause {Write-Host -NoNewLine "`nPress any key to continue...";$null = $Host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")}
+function Write-Throw {for($i = $Error.count-1; $i -ge 0; $i--){$Er = $Error[$i];$Ii=$Er.InvocationInfo;$Ex=$Er.Exception;Write-Warning "$($Ii.MyCommand) : $($Ex.Message)`nAt$([char]0x00A0)$($Ii.ScriptName):$($Ii.ScriptLineNumber) char:$($Ii.OffsetInline)`n$($Ii.Line)"}}
+try{
+### github.com/RefinedSoftwareLLC/sh.bat - v0.5 - DO NOT MODIFY THESE LINES ###
+
+#################
+### .ps1 mode ###
+#################
+Write-Host passed: $args
+
+################
+### .ps1 end ###
+################
+}finally{if($Error[0]){Write-Throw;pause;exit 2}exit 0}
+### DO NOT MODIFY THIS LINE ###


Updated publish script.

Updated publish script.

--- Setup/Publish.cmd
+++ Setup/Publish.cmd
@@ -1,34 +1,72 @@
 @ECHO OFF

+SET            FILE_SETUP=".\VhdAttach.iss"
+SET         FILE_SOLUTION="..\Source\VhdAttach.sln"
+SET      FILES_EXECUTABLE="..\Binaries\VhdAttach.exe" "..\Binaries\VhdAttachService.exe"
+SET           FILES_OTHER="..\Binaries\ReadMe.txt"
+SET   CERTIFICATE_SUBJECT="Josip Medved"
+SET CERTIFICATE_TIMESTAMP=
+
+
+ECHO --- BUILD SOLUTION
+ECHO.
+
+RMDIR /Q /S "..\Binaries" 2> NUL
+"%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE\devenv.exe" /Build "Release" %FILE_SOLUTION%
+IF ERRORLEVEL 1 PAUSE && EXIT /B %ERRORLEVEL%

 ECHO.
-ECHO --- Sign executables

+ECHO --- SIGN SOLUTION
 ECHO.
-ECHO --- Setup
+
+IF [%CERTIFICATE_TIMESTAMP%]==[] (
+    "\Tools\SignTool\signtool.exe" sign /s "My" /n %CERTIFICATE_SUBJECT% /v %FILES_EXECUTABLE%
+) ELSE (
+    "\Tools\SignTool\signtool.exe" sign /s "My" /n %CERTIFICATE_SUBJECT% /t %CERTIFICATE_TIMESTAMP% /v %FILES_EXECUTABLE%
+)
+IF ERRORLEVEL 1 PAUSE && EXIT /B %ERRORLEVEL%
+
+ECHO.
+
+
+ECHO --- BUILD SETUP
+ECHO.

 RMDIR /Q /S ".\Temp" 2> NUL
-CALL "%PROGRAMFILES(x86)%\Inno Setup 5\iscc.exe" /O".\Temp" ".\VhdAttach.iss"
-IF ERRORLEVEL 1 EXIT /B %ERRORLEVEL%
+CALL "%PROGRAMFILES(x86)%\Inno Setup 5\iscc.exe" /O".\Temp" %FILE_SETUP%
+IF ERRORLEVEL 1 PAUSE && EXIT /B %ERRORLEVEL%

-FOR /F %%I IN ('DIR ".\Temp\*.exe" /B') DO SET SETUPEXE=%%I
-ECHO Setup is in file %SETUPEXE%
+FOR /F %%I IN ('DIR ".\Temp\*.exe" /B') DO SET _SETUPEXE=%%I
+ECHO Setup is in file %_SETUPEXE%
+
+ECHO.

+ECHO --- SIGN SETUP
 ECHO.
-ECHO --- Sign setup
+
+IF [%CERTIFICATE_TIMESTAMP%]==[] (
+    "\Tools\SignTool\signtool.exe" sign /s "My" /n %CERTIFICATE_SUBJECT% /v ".\Temp\%_SETUPEXE%"
+) ELSE (
+    "\Tools\SignTool\signtool.exe" sign /s "My" /n %CERTIFICATE_SUBJECT% /t %CERTIFICATE_TIMESTAMP% /v ".\Temp\%_SETUPEXE%"
+)
+IF ERRORLEVEL 1 PAUSE && EXIT /B %ERRORLEVEL%
+
+ECHO.

+ECHO --- RELEASE
 ECHO.
-ECHO --- Move to releases

 MOVE ".\Temp\*.*" "..\Releases\."
-IF ERRORLEVEL 1 EXIT /B %ERRORLEVEL%
+IF ERRORLEVEL 1 PAUSE && EXIT /B %ERRORLEVEL%
 RMDIR /Q /S ".\Temp"

+ECHO.

-ECHO.
+
 ECHO.
 ECHO Done.
 ECHO.


Initial commit

Initial commit

error: pathspec 'programs_manager/programs_manager_database/action_functions/test/test_action_enter_edit_organization_level.bat' did not match any file(s) known to git

--- programs_manager/programs_manager_database/action_functions/test/test_action_enter_edit_organization_level.bat
+++ programs_manager/programs_manager_database/action_functions/test/test_action_enter_edit_organization_level.bat
@@ -0,0 +1,8 @@
+REM test_action_enter_edit_organization_level
+
+"C:\Program Files\PostgreSQL\9.6\bin\psql.exe" -h localhost -U postgres -d program_manager_test_db  -p 5432 -f ..\action_enter_edit_organization_level.sql 1> test_action_enter_edit_organization_level.log 2>&1
+
+
+"C:\Program Files\PostgreSQL\9.6\bin\psql.exe" -h localhost -U postgres -d program_manager_test_db  -p 5432 -f test_action_enter_edit_organization_level.sql  1>> test_action_enter_edit_organization_level.log 2>>&1
+
+


Cleaned up windeploy.bat

Cleaned up windeploy.bat

--- winbuild.bat
+++ winbuild.bat
@@ -34,25 +34,8 @@
 )

 :: Let Qt collect DLLs
-windeployqt dist\KanColleTool\KCTViewer.exe
-windeployqt dist\KanColleTool\KanColleTool.exe
-
-:: Delete things we don't need at all
-rmdir /s /q dist\KanColleTool\accessible
-rmdir /s /q dist\KanColleTool\iconengines
-rmdir /s /q dist\KanColleTool\imageformats
-rmdir /s /q dist\KanColleTool\mediaservice
-rmdir /s /q dist\KanColleTool\playlistformats
-rmdir /s /q dist\KanColleTool\printsupport
-rmdir /s /q dist\KanColleTool\position
-rmdir /s /q dist\KanColleTool\qmltooling
-rmdir /s /q dist\KanColleTool\sensorgestures
-rmdir /s /q dist\KanColleTool\sensors
-
-:: Delete debug versions of frameworks
-del /q dist\KanColleTool\bearer\*d.dll
-del /q dist\KanColleTool\platforms\*d.dll
-del /q dist\KanColleTool\sqldrivers\*d.dll
+windeployqt --no-compiler-runtime --no-translations --no-svg dist\KanColleTool\KCTViewer.exe
+windeployqt --no-compiler-runtime --no-translations --no-svg dist\KanColleTool\KanColleTool.exe

 :: Delete all database drivers but sqlite
 del /q dist\KanColleTool\sqldrivers\qsqlmysql*


nodes\blessed\senv.bat, creates blessed with etc/hosts knowing about kv

error: pathspec 'nodes/blessed/senv.bat' did not match any file(s) known to git

--- nodes/blessed/senv.bat
+++ nodes/blessed/senv.bat
@@ -0,0 +1,18 @@
+@echo off
+setlocal enabledelayedexpansion
+
+set machine=blessed
+if not exist %USERPROFILE%\.docker\machine\machines\%machine% (
+	call dmcv %machine% kv
+)
+docker-machine ls %machine%
+for /f "delims=" %%A in ('docker-machine ip kv') do set "ipkv=%%A"
+echo ipkv='%ipkv%'
+FOR /F "tokens=* USEBACKQ" %%F IN (`dm ssh %machine% "if [ ^! -e /var/lib/boot2docker/bootsync.sh ]; then echo nobootsync; fi"`) DO (SET checkbootsync=%%F)
+if "%checkbootsync%"=="nobootsync" (
+	echo fix IP for %machine% at 99.101
+	call dmvbf %machine% 99 101
+	docker-machine ssh %machine% "sudo sh -c 'echo \"echo %ipkv% kv^>^>/etc/hosts\" | sudo tee -a /var/lib/boot2docker/bootsync.sh >/dev/null'"
+	dm regenerate-certs -f %machine%
+	dm restart %machine%
+)


Updated script for debugging

Updated script for debugging

--- deploy.cmd
+++ deploy.cmd
@@ -1,33 +1,24 @@
-@echo on
+set echo on

-echo Creating folders
 MKDIR %HOME%\site\wwwroot\gopath
 MKDIR %HOME%\site\wwwroot\gopath\bin
 MKDIR %HOME%\site\wwwroot\gopath\src

-echo Create app folder variable
-set hr=%time:~0,2%
-if "%hr:~0,1%" equ " " set hr=0%hr:~1,1%
-SET FOLDER=%date:~-4,4%%date:~-10,2%%date:~-7,2%_%hr%%time:~3,2%%time:~6,2%
+rem set hr=%time:~0,2%
+rem if "%hr:~0,1%" equ " " set hr=0%hr:~1,1%
+rem SET FOLDER=%date:~-4,4%%date:~-10,2%%date:~-7,2%_%hr%%time:~3,2%%time:~6,2%

-echo Create app folder
-MKDIR %HOME%\site\wwwroot\gopath\src\%FOLDER%
+rem MKDIR %HOME%\site\wwwroot\gopath\src\%FOLDER%

-echo Copy files
-xcopy %DEPLOYMENT_SOURCE%\site\repository %HOME%\site\wwwroot\gopath\src\%FOLDER% /Y
-xcopy /r %DEPLOYMENT_SOURCE%\site\repository\Web.Config %HOME%\site\wwwroot\Web.Config* /Y
+rem xcopy %DEPLOYMENT_SOURCE%\site\repository %HOME%\site\wwwroot\gopath\src\%FOLDER% /Y
+rem xcopy /r %DEPLOYMENT_SOURCE%\site\repository\Web.Config %HOME%\site\wwwroot\Web.Config* /Y

-echo Set env variables
-SET GOPATH=%HOME%\site\wwwroot\gopath
-SET GOROOT=%HOME%\site\wwwroot\go
-SET PATH=%PATH%;%GOPATH%\bin;%HOME%\site\wwwroot\go\bin
+rem SET GOPATH=%HOME%\site\wwwroot\gopath
+rem SET GOROOT=%HOME%\site\wwwroot\go
+rem SET PATH=%PATH%;%GOPATH%\bin;%HOME%\site\wwwroot\go\bin

-echo Go get
-go get %FOLDER%
+rem go get %FOLDER%

-echo Sed command
-sed -i 's/GOAPPBINARY/%FOLDER%.exe/g' %HOME%\site\wwwroot\Web.Config
+rem sed -i 's/GOAPPBINARY/%FOLDER%.exe/g' %HOME%\site\wwwroot\Web.Config

-echo Finished
-
-exit /b 1+rem exit /b 1


updated build steps

updated build steps

--- deploy.cmd
+++ deploy.cmd
@@ -66,10 +66,10 @@
 :: Generate Static Site
 :: --------------------

-echo "Generte Static Site"
+echo "Generate Static Site"

-SET RUBY_PATH = d:\home\site\ruby\bin
-SET RUBY_DEVKIT_PATH = d:\home\site\rubydevkit
+SET RUBY_PATH=d:\home\site\ruby\bin
+SET RUBY_DEVKIT_PATH=d:\home\site\rubydevkit

 echo "Path Set"


:rocket: :ambulance: Accidentally forgot a

--- deploy.cmd
+++ deploy.cmd
@@ -73,7 +73,7 @@
     SET NODE_EXE=node
   )

-  NPM_CMD="\"$NODE_EXE\" \"$PROGRAMFILES\\npm\\3.1.0\\
+  SET NPM_CMD="\"$NODE_EXE\" \"$PROGRAMFILES\\npm\\3.1.0\\
 ) ELSE (
   SET NPM_CMD=npm
   SET NODE_EXE=node


try to fix the nuget restore

try to fix the nuget restore

--- deploy.cmd
+++ deploy.cmd
@@ -89,9 +89,9 @@

 :: 3. Run DNU Restore, Nuget restore for specific projects
-call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\AllReadyApp\AllReady.Models\AllReady.Models.csproj" -SolutionDirectory .\AllReadyApp
+call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\AllReadyApp\AllReady.Models\AllReady.Models.csproj" -SolutionDirectory %DEPLOYMENT_SOURCE%\AllReadyApp
 IF !ERRORLEVEL! NEQ 0 goto error
-call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\AllReadyApp\NotificationsProcessor\NotificationsProcessor.csproj" -SolutionDirectory .\AllReadyApp
+call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\AllReadyApp\NotificationsProcessor\NotificationsProcessor.csproj" -SolutionDirectory %DEPLOYMENT_SOURCE%\AllReadyApp
 IF !ERRORLEVEL! NEQ 0 goto error

 :: 4. Run Our Custom build steps:


[misc] Explain why we're using non-BAT variable syntax in a BAT file...

--- xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/src/main/resources/start_xwiki.bat
+++ xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/src/main/resources/start_xwiki.bat
@@ -25,6 +25,7 @@
 set XWIKI_OPTS=-Xmx512m -XX:MaxPermSize=196m

 REM Location where XWiki stores generated data and where database files are.
+## ${xwikiDataDir} is a Velocity variable interpolated at build time, not a scripting variable.
 set XWIKI_DATA_DIR=${xwikiDataDir}
 set XWIKI_OPTS=%XWIKI_OPTS% -Dxwiki.data.dir=%XWIKI_DATA_DIR%


VS Profiling: Shutdown the profiler on error.

--- MCServer/profile_run.cmd
+++ MCServer/profile_run.cmd
@@ -45,7 +45,7 @@

-::Create the output directory, if it didn't exist
+:: Create the output directory, if it didn't exist
 mkdir %outputdir%

@@ -60,7 +60,7 @@

 :: Launch the application via the profiler
 %pt%\vsperfcmd /launch:%app%
-if errorlevel 1 goto haderror
+if errorlevel 1 goto haderrorshutdown

 :: Shut down the profiler (this command waits, until the application is terminated)
 %pt%\vsperfcmd /shutdown
@@ -86,6 +86,10 @@

+:haderrorshutdown
+echo An error was encountered, shutting down the profiler
+%pt%\vsperfcmd /shutdown
+
 :haderror
 echo An error was encountered
 pause


add clean script

add clean script

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

--- clean.bat
+++ clean.bat
@@ -0,0 +1,4 @@
+:: docker rmi $(docker images -a -q)
+:: docker rm $(docker ps -a -f status=exited -q)
+docker volume prune
+docker system prune


Revert "Update unity_RunAutoTests.bat (#511)" (#512)

This reverts commit 4a55c57ee15ead19d203412b02e1e33044bef55e.

--- SDKBuildScripts/unity_RunAutoTests.bat
+++ SDKBuildScripts/unity_RunAutoTests.bat
@@ -138,13 +138,7 @@
 :BuildPS4
 echo === Build PS4 Target ===
 cd "%ProjRootPath%\%SdkName%_TC"
-pushd "%WORKSPACE%/SDKGenerator/SDKBuildScripts"
-sh unity_copyTestTitleData.sh "%WORKSPACE%/sdks/UnitySDK/Testing/Resources" copy
-popd
 %UnityExe% -projectPath="%ProjRootPath%\%SdkName%_TC" -quit -batchmode -executeMethod PlayFab.Internal.PlayFabPackager.MakePS4Build -logFile "%ProjRootPath%\buildPS4Output.txt"
-pushd "%WORKSPACE%/SDKGenerator/SDKBuildScripts"
-sh unity_copyTestTitleData.sh "%WORKSPACE%/sdks/UnitySDK/Testing/Resources" delete
-popd
 if %errorLevel% NEQ 0 (
     type "%ProjRootPath%\buildPS4Output.txt"
     exit /b %errorLevel%


Dammit

Dammit

Keep forgetting this.

--- PortaDOOM/files/doom.bat
+++ PortaDOOM/files/doom.bat
@@ -1368,7 +1368,7 @@
 ECHO:

 REM # if you need to see what the final command will be:
-ECHO  "doom.bat" /D "%SAVES_WAD%" %FIX_PATH%\%ENGINE% %SCREENRES% %FULLSCREEN% %PARAMS% & PAUSE
+REM ECHO  "doom.bat" /D "%SAVES_WAD%" %FIX_PATH%\%ENGINE% %SCREENRES% %FULLSCREEN% %PARAMS% & PAUSE

 REM # outputting to console?
 REM # (only has an effect on Z-based engines)


Using 64 bit version of xunit runner

Using 64 bit version of xunit runner


update batch file

update batch file

--- Workbooks/EUR_Market.bat
+++ Workbooks/EUR_Market.bat
@@ -1,7 +1,7 @@

-SET XLL_PATH=.\utils\QuantLibXL-vc120-mt-s-1_7_0.xll
+SET XLL_PATH=..\xll\QuantLibXL-vc90-mt-s-1_8_0.xll
+SET XLS_PATH=.\EUR_Market\EUR_Market.xlsm
 @REM 30-SEP-2015
 SET EVAL_DATE=42277
-SET XLS_PATH=.\EUR_Market\EUR_Market.xlsm
 START "EXCEL" "EXCEL.EXE" /e .\init.xlam


fix Launcher auto build bat

fix Launcher auto build bat

--- tools/BuildNative.bat
+++ tools/BuildNative.bat
@@ -1,72 +1,72 @@
-@echo off
-::Build Native Tools Such as Launcher.
-::PowerShell Must input param
-::BuildNative.bat OS64BIT or OS32BIT or OSARM OSAArch64
-::Read http://msdn.microsoft.com/en-us/library/hs24szh9.aspx |http://msdn.microsoft.com/en-us/library/hs24szh9(v=vs.120).aspx
-::VisualStudio Express for Windows Desktop Support 32-bit X86 compiler X86_ x64 cross-compiler
-::VisualStudio Express for Windows Support 32-bit X86 compiler X86_ x64 cross-compiler X86_arm cross-compiler
-::This Tools Must use Visual Studio 11(2012) or Later
-IF /i "%1" =="OS64BIT" goto OS64BIT
-IF /i "%1" == "OS32BIT" goto OS32BIT
-IF /i "%1" == "OSARM" goto OSARM
-IF /i "%1" == "OSAArch64" goto OSAARCH64
-echo "Goto Default System 32BIT....."
-goto OS32BIT
-:OS64BIT
-goto VS120ENVCALL64C
-:OS32BIT
-if exist "%SystemRoot%\SysWOW64" goto OS64BIT
-goto VS120ENV86CALL
-:OSARM
-if not exist "%VS140COMNTOOLS%..\..\VC\bin\x86_arm" goto VAILDVSNOTFOUD
-call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"  x86_arm
-goto BuildNative
-
-:OSAARCH64
-echo "Not Open Support Now"
-goto :EOF
-
-
-::64BIT Build
-:VS120ENVCALL64C
-IF not exist "%VS120COMNTOOLS%..\..\VC\bin\x86_amd64"  goto VS110ENVCALL64C
-call "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"  x86_amd64
-goto BuildNative
-
-:VS110ENVCALL64C
-if not exist "%VS110COMNTOOLS%..\..\VC\bin\x86_amd64"  goto VS140ENVCALL64C
-call "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"  x86_amd64
-goto BuildNative
-
-:VS110ENVCALL64C
-if not exist "%VS140COMNTOOLS%..\..\VC\bin\x86_amd64"  goto VAILDVSNOTFOUD
-call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"  x86_amd64
-goto BuildNative
-
-::X86 Build
-:VS120ENV86CALL
-IF not exist "%VS120COMNTOOLS%"  goto VS10ENVC86ALL
-call "%VS120COMNTOOLS%.\VsDevCmd.bat"
-goto BuildNative
-
-:VS110ENVC86ALL
-if not exist %VS110COMNTOOLS%  goto VS140ENVC86ALL
-call "%VS110COMNTOOLS%\VsDevCmd.bat"
-goto BuildNative
-
-:VS140ENV86CALL
-if not exist %VS140COMNTOOLS%  goto VAILDVSNOTFOUD
-call "%VS140COMNTOOLS%\VsDevCmd.bat"
-goto BuildNative
-
-
-
-:BuildNative
-cd /d %~dp0Launcher
-nmake -f Makefile.mk
-
-
-goto :EOF
-:VAILDVSNOTFOUD
-echo Couldn't find valid VisualStudio
-
+@echo off
+::Build Native Tools Such as Launcher.
+::PowerShell Must input param
+::BuildNative.bat OS64BIT or OS32BIT or OSARM OSAArch64
+::Read http://msdn.microsoft.com/en-us/library/hs24szh9.aspx |http://msdn.microsoft.com/en-us/library/hs24szh9(v=vs.120).aspx
+::VisualStudio Express for Windows Desktop Support 32-bit X86 compiler X86_ x64 cross-compiler
+::VisualStudio Express for Windows Support 32-bit X86 compiler X86_ x64 cross-compiler X86_arm cross-compiler
+::This Tools Must use Visual Studio 11(2012) or Later
+IF /i "%1" =="OS64BIT" goto OS64BIT
+IF /i "%1" == "OS32BIT" goto OS32BIT
+IF /i "%1" == "OSARM" goto OSARM
+IF /i "%1" == "OSAArch64" goto OSAARCH64
+echo "Goto Default System 32BIT....."
+goto OS32BIT
+:OS64BIT
+goto VS120ENVCALL64C
+:OS32BIT
+if exist "%SystemRoot%\SysWOW64" goto OS64BIT
+goto VS120ENV86CALL
+:OSARM
+if not exist "%VS140COMNTOOLS%..\..\VC\bin\x86_arm" goto VAILDVSNOTFOUD
+call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"  x86_arm
+goto BuildNative
+
+:OSAARCH64
+echo "Not Open Support Now"
+goto :EOF
+
+
+::64BIT Build
+:VS120ENVCALL64C
+IF not exist "%VS120COMNTOOLS%..\..\VC\bin\x86_amd64"  goto VS110ENVCALL64C
+call "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"  x86_amd64
+goto BuildNative
+
+:VS110ENVCALL64C
+if not exist "%VS110COMNTOOLS%..\..\VC\bin\x86_amd64"  goto VS140ENVCALL64C
+call "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"  x86_amd64
+goto BuildNative
+
+:VS140ENVCALL64C
+if not exist "%VS140COMNTOOLS%..\..\VC\bin\x86_amd64"  goto VAILDVSNOTFOUD
+call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"  x86_amd64
+goto BuildNative
+
+::X86 Build
+:VS120ENV86CALL
+IF not exist "%VS120COMNTOOLS%"  goto VS110ENVC86ALL
+call "%VS120COMNTOOLS%.\VsDevCmd.bat"
+goto BuildNative
+
+:VS110ENVC86ALL
+if not exist %VS110COMNTOOLS%  goto VS140ENVC86ALL
+call "%VS110COMNTOOLS%\VsDevCmd.bat"
+goto BuildNative
+
+:VS140ENVC86ALL
+if not exist %VS140COMNTOOLS%  goto VAILDVSNOTFOUD
+call "%VS140COMNTOOLS%\VsDevCmd.bat"
+goto BuildNative
+
+
+
+:BuildNative
+cd /d %~dp0Launcher
+nmake -f Makefile.mk
+
+
+goto :EOF
+:VAILDVSNOTFOUD
+echo Couldn't find valid VisualStudio
+


Fix this for good

Fix this for good

--- buildscript/modules/mesonsubprojects.cmd
+++ buildscript/modules/mesonsubprojects.cmd
@@ -12,11 +12,9 @@
 @copy /Y "%devroot%\%projectname%\buildscript\mesonsubprojects\DirectX-Headers.wrap" "%devroot%\mesa\subprojects\DirectX-Headers.wrap"
 @echo.
 )
-@for /d %%a in ("%devroot%\mesa\subprojects\DirectX-Header*") do @IF EXIST "%%~a" (
 @set /p refreshdxheaders=Update DirectX headers ^(y/n^)^:
 @echo.
-@IF /I "%refreshdxheaders%"=="y" RD /S /Q "%%~a"
-)
+@IF /I "%refreshdxheaders%"=="y" for /d %%a in ("%devroot%\mesa\subprojects\DirectX-Header*") do @IF EXIST "%%~a" RD /S /Q "%%~a"

 @rem Find LLVM dependency
 @set RTTI=false


Remove w9xopen.exe and add README.txt to Windows build

--- tools/release_win.bat
+++ tools/release_win.bat
@@ -3,6 +3,8 @@
 python setup.py py2exe
 cd dist
 7z d library.zip jinja2\* dns\* 'graphy\*
+del /s w9xpopen.exe
+copy ..\README.txt .
 7z a namebench_for_Windows.zip -r *
 namebench -x -O 8.8.8.8 -t5 -o test.html
 start test.html


Fix items 1 and 2 in #5.

Fix items 1 and 2 in #5.

--- getruby.cmd
+++ getruby.cmd
@@ -16,10 +16,10 @@
 REM 32bit
 REM curl -o rubyrails193.zip http://dl.bintray.com/oneclick/rubyinstaller/ruby-2.1.5-i386-mingw32.7z?direct
 REM 64bit
-curl -o ruby215.zip http://dl.bintray.com/oneclick/rubyinstaller/ruby-2.1.5-x64-mingw32.7z?direct
+curl -o ruby215.zip -L http://dl.bintray.com/oneclick/rubyinstaller/ruby-2.1.5-x64-mingw32.7z?direct
 REM Azure puts 7zip here!
 EcHO START Unzipping Ruby
-d:\7zip\7za x -xr!*.ri -y ruby215.zip > rubyout
+d:\7zip\7za x -y ruby215.zip > rubyout
 EcHO DONE Unzipping Ruby

 REM Get DevKit to build Ruby native gems


NThoeunthotnuhtaoensuoetuhtoehtunoae

NThoeunthotnuhtaoensuoetuhtoehtunoae

--- scripts/ci/appveyor/setup_cppdb.bat
+++ scripts/ci/appveyor/setup_cppdb.bat
@@ -7,11 +7,7 @@

 cd "%USERPROFILE%\cppdb\build"

-dir "C:\cpp_rest"
-
-dir "C:\cpp_rest\cppdb_windows_cmakelists"
-
-move /y "C:\cpp_rest\cppdb_windows_cmakelists\CMakeLists.txt" "%USERPROFILE\cppdb\CMakeLists.txt"
+move /y "C:\cpp_rest\cppdb_windows_cmakelists\CMakeLists.txt" "%USERPROFILE%\cppdb\CMakeLists.txt"

 cmake -DCMAKE_PREFIX_PATH="%USERPROFILE%\mysql-connector-c-6.1.11-winx64" -DDISABLE_SQLITE="ON" -DDISABLE_PQ="ON" -DDISABLE_ODBC="ON" -DDISABLE_MYSQL="OFF" -DMYSQL_BACKEND_INTERNAL="ON" -G "Visual Studio 14" ..
 cmake --build .


Resolve lib conflicts

Resolve lib conflicts

--- setup.bat
+++ setup.bat
@@ -54,6 +54,13 @@

 if not exist "msys" setuptools\unzip packages\MSYS-20111123.zip
 if not exist "mingw64" setuptools\7za x packages\x86_64-w64-mingw32-gcc-4.7.2-release-win64_rubenvb.7z
+
+IF EXIST "mingw64\bin\lib" (
+ECHO Not sure why these python libraries exist in bin. We will remove and reinstall later after we build Python. Otherwise, this will interfere with the msvc lib command.
+DEL /s /Q mingw64\bin\lib
+RMDIR /S /Q mingw64\bin\lib
+)
+

 ECHO "Creating shortcut..."
 ECHO.


Removed setup.bat from source

Removed setup.bat from source

--- setup.bat
+++ setup.bat
@@ -1,10 +0,0 @@
-@echo off
-
-pip install openpyxl
-pip install Pillow
-
-echo.
-echo Done, now launch run.bat
-
-pause
-exit


Added webpack

Added webpack

--- setup.cmd
+++ setup.cmd
@@ -4,6 +4,9 @@
 npm install -g npm
 REM grunt command in terminal mode
 npm install -g grunt-cli
+REM build with webpack
+npm install -g webpack
+npm install -g webpack-dev-server
 REM code coverage with istanbul
 npm install -g istanbul
 REM karma command in terminal mode


refactoring setup.bat

refactoring setup.bat

--- setup.bat
+++ setup.bat
@@ -1,11 +1,13 @@
-mklink %USERPROFILE%\.vimrc %USERPROFILE%\dotfiles\files\.vimrc
-mklink %USERPROFILE%\.gvimrc %USERPROFILE%\dotfiles\files\.gvimrc
-mklink /d %USERPROFILE%\vimfiles %USERPROFILE%\dotfiles\files\.vim
-mklink /d %USERPROFILE%\.vim %USERPROFILE%\dotfiles\files\.vim
-mklink /h %USERPROFILE%\.gitconfig %USERPROFILE%\dotfiles\files\.gitconfig_win
-mklink %USERPROFILE%\.gitignore %USERPROFILE%\dotfiles\files\.gitignore
-mklink %USERPROFILE%\.hgrc %USERPROFILE%\dotfiles\files\.hgrc_win
-mklink %USERPROFILE%\.hgignore %USERPROFILE%\dotfiles\files\.hgignore
-mklink %USERPROFILE%\.pythonstartup %USERPROFILE%\dotfiles\files\.pythonstartup
+@set DOTDIR=%USERPROFILE%\dotfiles\files

-pause
+mklink %USERPROFILE%\.vimrc %DOTDIR%\.vimrc
+mklink %USERPROFILE%\.gvimrc %DOTDIR%\.gvimrc
+mklink /d %USERPROFILE%\vimfiles %DOTDIR%\.vim
+mklink /d %USERPROFILE%\.vim %DOTDIR%\.vim
+mklink /h %USERPROFILE%\.gitconfig %DOTDIR%\.gitconfig_win
+mklink %USERPROFILE%\.gitignore %DOTDIR%\.gitignore
+mklink %USERPROFILE%\.hgrc %DOTDIR%\.hgrc_win
+mklink %USERPROFILE%\.hgignore %DOTDIR%\.hgignore
+mklink %USERPROFILE%\.pythonstartup %DOTDIR%\.pythonstartup
+
+@pause


- updated version numbers on entries and added entries for jci jars

git-svn-id: 4b3b87045ec33e1a2f7ddff44705baa56df11711@935 fee104cc-1dfa-8c0f-632d-d3b7e6b59fb0

--- shell.bat
+++ shell.bat
@@ -38,12 +38,12 @@
 set CP=%CP%;%shellPathLib%\js-1.6R1.jar

 REM Logging with log4j
-set CP=%CP%;%shellPathLib%\log4j-1.2.9.jar
-set CP=%CP%;%shellPathLib%\commons-logging-1.0.4.jar
+set CP=%CP%;%shellPathLib%\log4j-1.2.14.jar
+set CP=%CP%;%shellPathLib%\commons-logging-1.1.jar

 Rem digester to read xml files
-set CP=%CP%;%shellPathLib%\commons-digester-1.7.jar
-set CP=%CP%;%shellPathLib%\commons-beanutils-1.6.jar
+set CP=%CP%;%shellPathLib%\commons-digester-1.8.jar
+set CP=%CP%;%shellPathLib%\commons-beanutils-1.7.0.jar

 REM command line parser
 set CP=%CP%;%shellPathLib%\commons-cli-1.0.jar
@@ -52,7 +52,7 @@
 set CP=%CP%;%shellPathLib%\commons-jexl-1.1.jar

 REM used for toString methods
-set CP=%CP%;%shellPathLib%\commons-lang-2.1.jar
+set CP=%CP%;%shellPathLib%\commons-lang-2.3.jar

 REM HTTP Servlet Api
 set CP=%CP%;%shellPathLib%\servlet-api-2.4.jar
@@ -62,9 +62,14 @@
 set CP=%CP%;%shellPathLib%\slide-kernel-2.1.jar

 REM Connection Pooling
-set CP=%CP%;%shellPathLib%\commons-dbcp-1.2.1.jar
-set CP=%CP%;%shellPathLib%\commons-pool-1.2.jar
-set CP=%CP%;%shellPathLib%\commons-collections-2.1.jar
+set CP=%CP%;%shellPathLib%\commons-dbcp-1.2.2.jar
+set CP=%CP%;%shellPathLib%\commons-pool-1.3.jar
+set CP=%CP%;%shellPathLib%\commons-collections-3.1.jar
+
+REM jci
+set CP=%CP%;%shellPathLib%\commons-jci-core-1.0.jar
+set CP=%CP%;%shellPathLib%\commons-jci-fam-1.0.jar
+set CP=%CP%;%shellPathLib%\commons-jci-javac-1.0.jar

 REM Database Driver
 set CP=%CP%;%shellPathLib%\derbyclient-10.1.2.1.jar


improve mintty processing

improve mintty processing

--- shell.bat
+++ shell.bat
@@ -31,9 +31,8 @@
 )

 :: Check if mintty is available
-for %%s in ( "bin" "usr\bin" "usr\local\bin" ) do if exist "%~dp0vendors\%~1\%%~s\mintty.exe" (
-	start "%~1 starting" "%~dp0vendors\%~1\%%~s\mintty.exe" -c "%HOME%\.minttyrc" -i "%~dp0etc\images\%~1.ico" /%%~s/bash --login -i
-	goto :EOF
+for %%s in ( "bin" "usr\bin" "usr\local\bin" ) do (
+	call :mintty "%~1" "%%~s" && goto :EOF
 )

 :: Try naked bash, ksh or sh
@@ -48,6 +47,30 @@
 :shell.failed
 >&2 pause
 exit /b 1
+
+
+:mintty
+setlocal
+
+set "mintty_bin=%~dp0vendors\%~1\%~2\mintty.exe"
+
+if not exist "%mintty_bin%" (
+	endlocal
+	exit /b 1
+)
+
+if not exist "%HOME%\.minttyrc" if exist "%~dp0etc\mintty\default.settings" (
+	copy /b "%~dp0etc\mintty\default.settings" "%HOME%\.minttyrc"
+)
+
+set "mintty_args=-c "%HOME%\.minttyrc""
+
+if exist "%~dp0etc\images\%~1.ico" (
+	set "mintty_args=%mintty_args% -i "%~dp0etc\images\%~1.ico""
+)
+
+endlocal && start "%~1 starting" "%mintty_bin%" %mintty_args% /%~2/bash --login -i
+goto :EOF

 :conemu


Update TightVNC.bat

Update TightVNC.bat

--- repository/tightvnc/x64/TightVNC.bat
+++ repository/tightvnc/x64/TightVNC.bat
@@ -10,9 +10,9 @@
 @echo off
 set SCRIPT_VERSION=1.0.0
 set SCRIPT_UPDATED=2014-07-25
-:: Get the date into ISO 8601 standard date format (yyyy-mm-dd) so we can use it
-FOR /f %%a in ('WMIC OS GET LocalDateTime ^| find "."') DO set DTS=%%a
-set CUR_DATE=%DTS:~0,4%-%DTS:~4,2%-%DTS:~6,2%
+:: Get the date into ISO 8601 standard date format (yyyy-mm-dd) so we can use it
+FOR /f %%a in ('WMIC OS GET LocalDateTime ^| find "."') DO set DTS=%%a
+set CUR_DATE=%DTS:~0,4%-%DTS:~4,2%-%DTS:~6,2%

 :: This is useful if we start from a network share; converts CWD to a drive letter
 pushd "%~dp0"
@@ -28,7 +28,7 @@

 :: Package to install. Do not use trailing slashes (\)
 set LOCATION=
-set BINARY=TightVNC v2.7.10 x64.msi
+set BINARY=TightVNC v2.8.5 x64.msi
 set FLAGS=/quiet /norestart ADDLOCAL="Server,Viewer"

 :: Create the log directory if it doesn't exist
@@ -81,4 +81,4 @@
 popd

 :: Return exit code to SCCM/PDQ Deploy/etc
-exit /B %EXIT_CODE%+exit /B %EXIT_CODE%


Benchmark disks on Win using 32MB blocks, to avoid warning for wincall_file.

git-svn-id: 4e7379b20b57f8e3dde5a0b7363f233184647162@2494 4e380d45-d1fd-0310-85a7-d18ec86df0ad

--- misc/run-all-tests-windows.bat
+++ misc/run-all-tests-windows.bat
@@ -22,7 +22,7 @@
 utils\off_t_size
 utils\pq_param

-io\benchmark_disks 0 2 256 "%STXXL_TMPDIR%\testdiskx" "%STXXL_TMPDIR%\testdisky"
+io\benchmark_disks 0 2 32 "%STXXL_TMPDIR%\testdiskx" "%STXXL_TMPDIR%\testdisky"
 io\flushbuffers 2 "%STXXL_TMPDIR%\testdiskx" "%STXXL_TMPDIR%\testdisky"
 io\sd_test
 io\test_io "%STXXL_TMPDIR%"


NoRef start.bat typo+test

NoRef start.bat typo+test

git-svn-id: 6c0edb9fdd085beb7f3b78cf385b6ddede550bd9@16252 55bbc10b-e964-4c8f-a844-a62c6f7d3c80

--- start.bat
+++ start.bat
@@ -27,7 +27,7 @@
 rem ### Delete the last log
 rem del %OFBIZ_LOG%

-rem ###VM args block ####################################################
+rem ### VM args block ##################################################
 rem set MEMIF=-Xms128M -Xmx512M -XX:MaxPermSize=512m
 rem # RMI settings
 rem set DEBUG=-Dsun.rmi.server.exceptionTrace=true


Undo incremental build

Undo incremental build

--- start.bat
+++ start.bat
@@ -1,2 +1,2 @@
-jekyll serve -w --incremental
+jekyll serve -w
 pause


A Windows batch file,analogue start.sh, which starts the server.

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

--- start.bat
+++ start.bat
@@ -0,0 +1,88 @@
+@ECHO OFF
+
+REM Copyright 2012 K2Informatics GmbH, Root Längenbold, Switzerland
+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     http://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.
+
+SET ck=imem
+
+SET unamestr=%USERNAME%
+REM host=`hostname`
+SET host=127.0.0.1
+
+SET node=imem%1@%host%
+SET cms=
+REM FOR i IN "${@:2}" (
+REM     cms=imem$i@$host'"
+REM     if [ ! -z "$cms" ]; then
+REM         cms="$cms,'imem$i@$host'"
+REM     else
+REM         cms="'imem$i@$host'"
+REM     fi
+REM )
+ECHO Node %node% and CMs %cms%
+
+SET os_env=-env ERL_MAX_ETS_TABLES 50
+
+REM PATHS
+SET paths=-pa
+SET paths=%paths% %cd%\ebin
+SET paths=%paths% %cd%\deps\edown\ebin
+SET paths=%paths% %cd%\deps\erlscrypt\ebin
+SET paths=%paths% %cd%\deps\goldrush\ebin
+SET paths=%paths% %cd%\deps\jpparse\ebin
+SET paths=%paths% %cd%\deps\jsx\ebin
+SET paths=%paths% %cd%\deps\lager\ebin
+SET paths=%paths% %cd%\deps\ranch\ebin
+SET paths=%paths% %cd%\deps\sext\ebin
+SET paths=%paths% %cd%\deps\sqlparse\ebin
+
+REM Node name
+SET node_name=-name %node%
+
+REM Cookie
+SET cookie=-setcookie %ck%
+
+REM IMEM Opts
+SET imem_opts=-imem
+SET imem_opts=%imem_opts% mnesia_node_type ram
+SET imem_opts=%imem_opts% erl_cluster_mgrs [%cms%]
+SET imem_opts=%imem_opts% mnesia_schema_name imem
+SET imem_opts=%imem_opts% tcp_port 8125
+
+REM Proto dist module
+SET dist_opts=-proto_dist
+SET dist_opts=%dist_opts% imem_inet_tcp
+
+REM Kernel Opts
+SET kernel_opts=-kernel
+SET kernel_opts=%kernel_opts% inet_dist_listen_min 7000
+SET kernel_opts=%kernel_opts% inet_dist_listen_max 7020
+
+SET start_opts=%os_env% %node_name% %cookie% %paths% %dist_opts% %kernel_opts% %imem_opts%
+
+REM IMEM start options
+ECHO ------------------------------------------
+ECHO Starting IMEM (Opts)
+ECHO ------------------------------------------
+ECHO Node Name : %node_name%
+ECHO Cookie    : %cookie%
+ECHO EBIN Path : %paths%
+ECHO IMEM      : %imem_opts%
+ECHO Dist      : %dist_opts%
+ECHO Kernel    : %kernel_opts%
+ECHO OS Env    : %os_env%
+ECHO ------------------------------------------
+
+REM Starting imem
+START /MAX werl %start_opts% -s imem


Start.bat update to new name

Start.bat update to new name


starter command file for windows

starter command file for windows

--- start.bat
+++ start.bat
@@ -0,0 +1,8 @@
+@ECHO OFF
+
+start http://127.0.0.1:8124
+
+:Retry
+node server/src/server.js
+IF ERRORLEVEL <> 0 GOTO Retry
+


Fix windows build

Fix windows build

Avoid empty elements in x-pack bat script classpath to make JarHell happy

Original commit: elastic/x-pack-elasticsearch@06dd95b8ca020449d5fb9b552711e75b98b275d2

--- elasticsearch/x-pack/bin/xpack/.in.bat
+++ elasticsearch/x-pack/bin/xpack/.in.bat
@@ -76,7 +76,12 @@

 REM Disables explicit GC
 set JAVA_OPTS=%JAVA_OPTS% -XX:+DisableExplicitGC
-set ES_CLASSPATH=%ES_CLASSPATH%;%ES_HOME%/lib/*;%ES_HOME%/lib/sigar/*;%ES_HOME%/plugins/xpack/*
+REM Avoid empty elements in classpath to make JarHell happy
+if "%ES_CLASSPATH%" == "" (
+  set ES_CLASSPATH=%ES_HOME%/lib/*;%ES_HOME%/lib/sigar/*;%ES_HOME%/plugins/xpack/*
+) else (
+  set ES_CLASSPATH=%ES_CLASSPATH%;%ES_HOME%/lib/*;%ES_HOME%/lib/sigar/*;%ES_HOME%/plugins/xpack/*
+)
 set ES_PARAMS=-Des.path.home="%ES_HOME%"

 SET HOSTNAME=%COMPUTERNAME%


ask CMake to use x64 toolset

ask CMake to use x64 toolset

--- package/win32/make-package.bat
+++ package/win32/make-package.bat
@@ -40,6 +40,7 @@
 REM Configure and build the project. (Note that Windows / MSVC builds require
 REM that we specify the build type both at configure time and at build time)
 cmake -G"Visual Studio 15 2017 Win64" ^
+      -T host=x64 ^
       -DRSTUDIO_TARGET=Desktop ^
       -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
       -DRSTUDIO_PACKAGE_BUILD=1 ^


Update doctoolchain.bat: add quotes round -Pdocdir

After adding quotes around -Pdocdir the script doctoolchain works a little bit better if there is a blank in the docdir path.

--- bin/doctoolchain.bat
+++ bin/doctoolchain.bat
@@ -24,13 +24,13 @@

 IF "%PATHTODOCS:~0,1%"=="." goto :relativePath

-./gradlew --project-cache-dir %BASEDIR%/.gradle -PdocDir=%PATHTODOCS% %2 %3 %4 %5 %6
+./gradlew --project-cache-dir %BASEDIR%/.gradle "-PdocDir=%PATHTODOCS%" %2 %3 %4 %5 %6

 goto :end

 :relativePath

-./gradlew --project-cache-dir %BASEDIR%/.gradle -PdocDir=%WORKINGDIR%%PATHTODOCS% %2 %3 %4 %5 %6
+./gradlew --project-cache-dir %BASEDIR%/.gradle "-PdocDir=%WORKINGDIR%%PATHTODOCS%" %2 %3 %4 %5 %6

 goto :end


Changed to use COMMAND_TO_RUN variable.

Changed to use COMMAND_TO_RUN variable.

--- .ci/appveyor/run_with_env.cmd
+++ .ci/appveyor/run_with_env.cmd
@@ -6,9 +6,11 @@
 :: More details at:
 :: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
 ::
+SET COMMAND_TO_RUN=%*
+SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
+SET MAJOR_PYTHON_VERSION="%PYTHON_VERSION:~0,1%"
+
 IF "%DISTUTILS_USE_SDK%"=="1" (
-    SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
-    SET MAJOR_PYTHON_VERSION="%PYTHON_VERSION:~0,1%"
     IF %MAJOR_PYTHON_VERSION% == "2" (
         SET WINDOWS_SDK_VERSION="v7.0"
     ) ELSE IF %MAJOR_PYTHON_VERSION% == "3" (
@@ -23,12 +25,15 @@
         SET MSSdk=1
         "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
         "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
+        ECHO Executing: %COMMAND_TO_RUN%
+        call %COMMAND_TO_RUN% || EXIT 1
     ) ELSE (
         ECHO Using default MSVC build environment for 32 bit architecture
+        ECHO Executing: %COMMAND_TO_RUN%
+        call %COMMAND_TO_RUN% || EXIT 1
     )
 ) ELSE (
     ECHO Using default MSVC build environment
+    ECHO Executing: %COMMAND_TO_RUN%
+    call %COMMAND_TO_RUN% || EXIT 1
 )
-
-ECHO Executing: %*
-CALL %* || EXIT 1


moved systree on top of Lua installation

--- install.bat
+++ install.bat
@@ -630,17 +630,23 @@
     vars.UNAME_M = get_architecture()  -- can only do when installation was found
 end

+-- check location of system tree
+if not vars.TREE_ROOT then
+  -- no system tree location given, so we need to construct a default value
+  if vars.LUA_BINDIR:lower():match([[([\/]+bin[\/]*)$]]) then
+    -- lua binary is located in a 'bin' subdirectory, so assume
+    -- default Lua layout and match rocktree on top
+    vars.TREE_ROOT = vars.LUA_BINDIR:lower():gsub([[[\/]+bin[\/]*$]], [[\]])
+  else
+    -- no 'bin', so use a named tree next to the Lua executable
+    vars.TREE_ROOT = vars.LUA_BINDIR .. [[\systree]]
+  end
+end
+
 local datapath
-if vars.UNAME_M == "x86" then
-	datapath = os.getenv("PROGRAMFILES") .. [[\LuaRocks]]
-else
-	-- our target interpreter is 64bit, so the tree (with binaries) should go into 64bit program files
-	datapath = os.getenv("ProgramW6432") .. [[\LuaRocks]]
-end
 vars.SYSCONFDIR = vars.SYSCONFDIR or vars.PREFIX
 vars.SYSCONFFILENAME = S"config-$LUA_VERSION.lua"
 vars.CONFIG_FILE = vars.SYSCONFDIR.."\\"..vars.SYSCONFFILENAME
-vars.TREE_ROOT = vars.TREE_ROOT or datapath..[[\systree]]
 if SELFCONTAINED then
 	vars.SYSCONFDIR = vars.PREFIX
 	vars.TREE_ROOT = vars.PREFIX..[[\systree]]


BAP-1184: fix install

BAP-1184: fix install

--- install.bat
+++ install.bat
@@ -9,8 +9,8 @@
 php app/console-framework oro:navigation:init --env %ENV% || goto :error
 php app/console-framework oro:entity-config:update --env %ENV% || goto :error
 php app/console-framework oro:entity-extend:create --env %ENV% || goto :error
-php app/console-framework cache:clear --env $ENV || goto :error
-php app/console-framework doctrine:schema:update --env $ENV --force || goto :error
+php app/console-framework cache:clear --env %ENV% || goto :error
+php app/console-framework doctrine:schema:update --env %ENV% --force || goto :error
 php app/console-framework oro:search:create-index --env %ENV% || goto :error
 php app/console-framework assets:install web --env %ENV% || goto :error
 php app/console assetic:dump --env %ENV% || goto :error


updated default system tree location to 'program files', so it is protected with admin rights. Implemented a /SELFCONTAINED installation option that makes a single directory installation

--- install.bat
+++ install.bat
@@ -5,10 +5,10 @@
 local vars = {}

-vars.PREFIX = os.getenv("PROGRAMFILES")..[[\LuaRocks]]
+vars.PREFIX = nil
 vars.VERSION = "2.1"
-vars.SYSCONFDIR = (os.getenv("PROGRAMDATA") or (os.getenv("ALLUSERSPROFILE")..[[\Application Data]])) .. [[\LuaRocks]] -- ALLUSERS for WinXP compat
-vars.ROCKS_TREE = vars.SYSCONFDIR
+vars.SYSCONFDIR = nil
+vars.ROCKS_TREE = nil
 vars.SCRIPTS_DIR = nil
 vars.LUA_INTERPRETER = nil
 vars.LUA_PREFIX = nil
@@ -26,9 +26,10 @@
 local FORCE_CONFIG = false
 local INSTALL_LUA = false
 local USE_MINGW = false
-local REGISTRY = false
+local REGISTRY = true
 local NOADMIN = false
 local PROMPT = true
+local SELFCONTAINED = false

 ---
 -- Some helpers
@@ -120,10 +121,19 @@

 Configuring the destinations:
 /TREE [dir]    Root of the local tree of installed rocks.
-               Default is %PROGRAMDATA%\LuaRocks
+               Default is %PROGRAMFILES%\LuaRocks\systree
 /SCRIPTS [dir] Where to install commandline scripts installed by
                rocks. Default is {TREE}/bin.
-
+/CONFIG [dir]  Location where the config file should be installed.
+               Default is %PROGRAMFILES%\LuaRocks
+/SELFCONTAINED Creates a self contained installation in a single
+               directory given by /P.
+               Sets the /TREE and /CONFIG options to the same
+               location as /P. And does not load registry info
+               with option /NOREG. The only option NOT self
+               contained is the user rock tree, so don't use that
+               if you create a self contained installation.
+
 Configuring the Lua interpreter:
 /LV [version]  Lua version to use; either 5.1 or 5.2.
                Default is 5.1
@@ -149,14 +159,12 @@
 /MW            Use mingw as build system instead of MSVC

 Other options:
-/CONFIG [dir]  Location where the config file should be installed.
-               Default is %PROGRAMDATA%\LuaRocks
 /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'
+/NOREG         Do not load registry info to register '.rockspec'
                extension with LuaRocks commands (right-click).
 /NOADMIN       The installer requires admin priviledges. If not
                available it will elevate a new process. Use this
@@ -164,10 +172,6 @@
                destination paths are all accessible for the current
                user.
 /Q             Do not prompt for confirmation of settings
-
-Example:
-To create a self contained install use (assuming Lua is in your PATH):
-INSTALL /P c:\LuaRocks /TREE c:\LuaRocks /CONFIG c:\LuaRocks

 ]])
 end
@@ -207,8 +211,10 @@
 			FORCE_CONFIG = true
 		elseif name == "/F" then
 			FORCE = true
-		elseif name == "/R" then
-			REGISTRY = true
+		elseif name == "/SELFCONTAINED" then
+			SELFCONTAINED = true
+		elseif name == "/NOREG" then
+			REGISTRY = false
 		elseif name == "/NOADMIN" then
 			NOADMIN = true
 		elseif name == "/Q" then
@@ -221,6 +227,14 @@

 -- check for combination/required flags
 local function check_flags()
+	if SELFCONTAINED then
+		if not vars.PREFIX then
+			die("Option /P is required when using /SELFCONTAINED")
+		end
+		if vars.SYSCONFDIR or vars.ROCKS_TREE or vars.SCRIPTS_DIR then
+			die("Cannot combine /TREE, /SCRIPTS or /CONFIG with /SELFCONTAINED")
+		end
+	end
 	if INSTALL_LUA then
 		if vars.LUA_INCDIR or vars.LUA_BINDIR or vars.LUA_LIBDIR or vars.LUA_PREFIX then
 			die("Cannot combine option /L with any of /LUA /BIN /LIB /INC")
@@ -536,6 +550,7 @@
 	print("Admin priviledges available for installing")
 end

+vars.PREFIX = vars.PREFIX or os.getenv("PROGRAMFILES")..[[\LuaRocks]]
 vars.FULL_PREFIX = S"$PREFIX\\$VERSION"
 vars.BINDIR = vars.FULL_PREFIX
 vars.LIBDIR = vars.FULL_PREFIX
@@ -561,15 +576,34 @@
     vars.UNAME_M = get_architecture()  -- can only do when installation was found
 end

+local datapath
+if vars.UNAME_M == "x86" then
+	datapath = os.getenv("PROGRAMFILES") .. [[\LuaRocks]]
+else
+	-- our target interpreter is 64bit, so the tree (with binaries) should go into 64bit program files
+	datapath = os.getenv("ProgramW6432") .. [[\LuaRocks]]
+end
+vars.SYSCONFDIR = vars.SYSCONDFIR or datapath
+vars.ROCKS_TREE = vars.ROCKS_TREE or datapath..[[\systree]]
+if SELFCONTAINED then
+	vars.SYSCONFDIR = vars.PREFIX
+	vars.ROCKS_TREE = vars.PREFIX..[[\systree]]
+	REGISTRY = false
+end
+
 print(S[[

 Will configure LuaRocks with the following paths:
 LuaRocks       : $FULL_PREFIX
+Config file    : $SYSCONFDIR\config.lua
+Rocktree       : $ROCKS_TREE
+
 Lua interpreter: $LUA_BINDIR\$LUA_INTERPRETER
     binaries   : $LUA_BINDIR
     libraries  : $LUA_LIBDIR
     includes   : $LUA_INCDIR
-Binaries will be linked against: $LUA_LIBNAME with runtime $LUA_RUNTIME
+
+Binaries will be linked against: $LUA_LIBNAME with runtime $LUA_RUNTIME.dll
 System architecture detected as: $UNAME_M

 ]])


Updated submodules

Updated submodules

--- install.cmd
+++ install.cmd
@@ -1,10 +1,10 @@
 rem install global tools
-rem npm install gulp-cli -g
-rem npm install bower -g
-rem npm install mocha -g
-rem npm install typescript -g
-rem npm install tsd -d
-rem npm install typedoc -g
+rem npm3 install gulp-cli -g
+rem npm3 install bower -g
+rem npm3 install mocha -g
+rem npm3 install typescript -g
+rem npm3 install tsd -d
+rem npm3 install typedoc -g

 rem Get submodules
 git submodule init
@@ -39,7 +39,7 @@
 mklink /J pip-webui-all\node_modules node_modules

 rem Install 3rd party npm modules
-npm install
+npm3 install

 rem Install 3rd party bower modules
 cd pip-webui-lib


zlib missing dependency fixed

zlib missing dependency fixed


Update user_install.bat

Update user_install.bat

--- doc/user/user_install.bat
+++ doc/user/user_install.bat
@@ -41,7 +41,7 @@
 if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
 conda config --set changeps1 !CONDA_CHANGE_PS1!
 if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
-conda update -q conda
+conda update -q conda -y
 if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!

 echo OFF


Update, and made works, build_projects.bat

--- scripts/build_projects.bat
+++ scripts/build_projects.bat
@@ -1,13 +1,23 @@
 :: Batch file that sets up Visual Studio command line tools and builds appshell.sln
 :: This file should *not* be called directly. It is called by the build.sh script.
-ECHO OFF
+@ECHO OFF

+IF DEFINED VS140COMNTOOLS GOTO VS2015
+IF DEFINED VS120COMNTOOLS GOTO VS2013
 IF DEFINED VS110COMNTOOLS GOTO VS2012
 IF DEFINED VS100COMNTOOLS GOTO VS2010

 :VSNotInstalled
-ECHO Visual Studio 2010 or 2012 must be installed.
-GOTO Exit
+ECHO Visual Studio 2010, 2012, 2013 or 2015 must be installed.
+GOTO Error
+
+:VS2015
+call "%VS140COMNTOOLS%/vsvars32.bat"
+GOTO Build
+
+:VS2013
+call "%VS120COMNTOOLS%/vsvars32.bat"
+GOTO Build

 :VS2012
 call "%VS110COMNTOOLS%/vsvars32.bat"
@@ -18,8 +28,9 @@
 GOTO Build

 :Build
-msbuild.exe appshell.sln /t:Clean /p:Platform=Win32 /p:Configuration=Release
-msbuild.exe appshell.sln /t:Build /p:Platform=Win32 /p:Configuration=Release
+msbuild.exe appshell.sln /nr:false /t:Clean /p:Platform=Win32 /p:Configuration=Release
+msbuild.exe appshell.sln /nr:false /t:Build /p:Platform=Win32 /p:Configuration=Release
+exit /b %ERRORLEVEL%

-:Exit
-exit /b %ERRORLEVEL%
+:Error
+exit /b 1


Copy into cereal\ on Windows

Copy into cereal\ on Windows

--- recipes/cereal/bld.bat
+++ recipes/cereal/bld.bat
@@ -1 +1 @@
-xcopy /s /f include\cereal %LIBRARY_INC%
+xcopy /s /f include %LIBRARY_INC%


PDI-768 : Clicking the Graph button generates an error dialog on a trunk Spoon built from Ant on Windows

git-svn-id: 51b39fcfd0d3a6ea7caa15377cad4af13b9d2664@6644 5fb7f6ec-07c1-534a-b4ca-9155e429e800

--- bin/Spoon.bat
+++ bin/Spoon.bat
@@ -52,6 +52,7 @@
 FOR %%F IN (libext\web\*.jar) DO call :addcp %%F
 FOR %%F IN (libext\pentaho\*.jar) DO call :addcp %%F
 FOR %%F IN (libext\spring\*.jar) DO call :addcp %%F
+FOR %%F IN (libext\jfree\*.jar) DO call :addcp %%F

 goto extlibe


don't need npm in startup

don't need npm in startup

--- start.bat
+++ start.bat
@@ -1,4 +1,2 @@
 cd ../ampm
-call npm install
-TITLE ampm
 nodemon -q -e js,json server.js config.json


start.bat script added for windows

start.bat script added for windows

--- start.bat
+++ start.bat
@@ -0,0 +1,2 @@
+php -S localhost:80 -t public public/index.php
+


Delete start.bat

Delete start.bat

--- start.bat
+++ start.bat
@@ -1,35 +0,0 @@
-@echo off
-chcp 65001
-echo.
-pushd %~dp0
-
-::Attempts to start py launcher without relying on PATH
-%SYSTEMROOT%\py.exe --version > NUL 2>&1
-IF %ERRORLEVEL% NEQ 0 GOTO attempt
-%SYSTEMROOT%\py.exe -3.5 Bot.py
-PAUSE
-GOTO end
-
-::Attempts to start py launcher by relying on PATH
-:attempt
-py.exe --version > NUL 2>&1
-IF %ERRORLEVEL% NEQ 0 GOTO lastattempt
-py.exe -3.5 Bot.py
-PAUSE
-GOTO end
-
-::As a last resort, attempts to start whatever Python there is
-:lastattempt
-python.exe --version > NUL 2>&1
-IF %ERRORLEVEL% NEQ 0 GOTO message
-python.exe Bot.py
-PAUSE
-GOTO end
-
-:message
-echo Couldn't find a valid Python 3.5 installation. Python needs to be installed and available in the PATH environment
-echo variable.
-echo Restart script.
-PAUSE
-
-:end


update start bat index destination

update start bat index destination

--- start.bat
+++ start.bat
@@ -1,2 +1,2 @@
-node ./src/index.js
+node ./index.js
 pause


Edit batch file again (#241)

Edit batch file again (#241)

--- thirdparty/download_thirdparty.bat
+++ thirdparty/download_thirdparty.bat
@@ -1,18 +1,23 @@
 @SetLocal
+	@Echo Off
 	@PushD "%~dp0"
-		git                                                        submodule update --init
-		@If Not Exist "grpc\.git"   git                            clone "https://github.com/grpc/grpc"
-		@If Not Exist "arrow\.git"  git                            clone "https://github.com/pcmoritz/arrow.git" --branch windows_with_submodules --recursive
-		@If Not Exist "arrow\cpp\thirdparty\flatbuffers\.git"  git clone "https://github.com/google/flatbuffers.git" "arrow/cpp/thirdparty/flatbuffers"
-		@If Not Exist "numbuf\.git" git                            clone "https://github.com/amplab/numbuf.git" --branch win
-		@If Not Exist "python\.git" git                            clone "https://github.com/austinsc/python.git"
-		git -C "grpc"                                              submodule update --init "third_party/protobuf"
-		git -C "grpc"                                              submodule update --init "third_party/nanopb"
-		git -C "grpc"                                              submodule update --init "third_party/zlib"
-		git -C "grpc"                                              apply --index --3way "%~dp0patches/grpc-source.patch"
-		git -C "grpc"                                              apply --index --3way "%~dp0patches/windows/grpc-projects.patch"
-		git -C "grpc/third_party/protobuf"                         apply --index --3way "%~dp0patches/windows/protobuf-projects.patch"
-		git -C "arrow/cpp/thirdparty/flatbuffers"                  apply --index --3way "%~dp0patches/windows/flatbuffers-projects.patch"
-		git -C "python"                                            apply --index --3way "%~dp0patches/windows/python-pyconfig.patch"
+		If Not Exist "arrow\.git"  git clone  --recursive --branch windows_with_submodules "https://github.com/pcmoritz/arrow.git"
+		If Not Exist "python\.git" git clone                                               "https://github.com/austinsc/python.git"
+		git                                                     submodule update --init
+		git -C "arrow"                                          submodule update --init
+		git -C "grpc"                                           submodule update --init "third_party/protobuf"
+		git -C "grpc"                                           submodule update --init "third_party/nanopb"
+		git -C "grpc"                                           submodule update --init "third_party/zlib"
+		Call :GitApply "grpc"                                   "%CD%/patches/grpc-source.patch"
+		Call :GitApply "grpc"                                   "%CD%/patches/windows/grpc-projects.patch"
+		Call :GitApply "grpc/third_party/protobuf"              "%CD%/patches/windows/protobuf-projects.patch"
+		Call :GitApply "arrow/cpp/thirdparty/flatbuffers"       "%CD%/patches/windows/flatbuffers-projects.patch"
+		Call :GitApply "python"                                 "%CD%/patches/windows/python-pyconfig.patch"
 	@PopD
 @EndLocal
+@GoTo :EOF
+
+:GitApply <ChangeToFolder> <Patch>
+	@REM Check if patch already applied by attempting to apply it in reverse; if not, then force-reapply it
+	git -C "%~1" apply --3way "%~2" -R --check 2> NUL || git -C "%~1" reset --hard && git -C "%~1" apply --3way "%~2"
+@GoTo :EOF


- Fixed mso_maker cba patching

- Fixed mso_maker cba patching

--- mso_maker/make_mso.bat
+++ mso_maker/make_mso.bat
@@ -59,11 +59,11 @@
 echo Copying code base structure to %MISSION_FOLDER_NAME%
 xcopy ..\%BASE_DIR% %MISSION_FOLDER_NAME% /E /Y /Q

+echo Copying Mission customisations to %MISSION_FOLDER_NAME%
+xcopy ..\%M_DIR%\%MISSION_FOLDER_NAME% %MISSION_FOLDER_NAME% /S /Y /Q /EXCLUDE:..\mso_maker\exclude.txt
+
 echo Checking for A2Free version
 for /f "tokens=1,2 delims=_" %%U in ('echo %MISSION_FOLDER_NAME%') do (CALL :processA2Free %%V)
-
-echo Copying Mission customisations to %MISSION_FOLDER_NAME%
-xcopy ..\%M_DIR%\%MISSION_FOLDER_NAME% %MISSION_FOLDER_NAME% /S /Y /Q /EXCLUDE:..\mso_maker\exclude.txt

 cd %MISSION_FOLDER_NAME%
 call ..\..\mso_maker\clean_modules.bat ambience\modules


Removed start.bat

Removed start.bat

--- start.bat
+++ start.bat
@@ -1,2 +0,0 @@
-cd node
-..\bin\node Server.js


[nunit] Set nuget version to use as 2.6.4

--- bootstrap.cmd
+++ bootstrap.cmd
@@ -1,4 +1,4 @@
 @echo off
 NuGet.exe install MSBuildTasks -OutputDirectory .\Tools\ -ExcludeVersion -NonInteractive
-NuGet.exe install NUnit.Runners -OutputDirectory .\Tools\ -ExcludeVersion -NonInteractive
+NuGet.exe install NUnit.Runners -OutputDirectory .\Tools\ -ExcludeVersion -NonInteractive -Version 2.6.4
 NuGet.exe install Wix.Toolset -OutputDirectory .\Tools\ -ExcludeVersion -NonInteractive


Sample init_script for WinRM setup

Sample init_script for WinRM setup

error: pathspec 'bootstrap.cmd' did not match any file(s) known to git

--- bootstrap.cmd
+++ bootstrap.cmd
@@ -0,0 +1,16 @@
+Function SetupWinRM
+{
+  Param(
+    [String]$hostname,
+    [String]$thumbprint
+   )
+  netsh advfirewall firewall set rule group="remote administration" new enable=yes
+  netsh advfirewall firewall add rule name="WinRM HTTP" dir=in action=allow protocol=TCP localport=5985
+  netsh advfirewall firewall add rule name="WinRM HTTPS" dir=in action=allow protocol=TCP localport=5986
+  winrm create winrm/config/Listener?Address=*+Transport=HTTPS "@{Hostname=`"${hostname}`"; CertificateThumbprint=`"${thumbprint}`"}"
+}
+
+$hostname = $env:COMPUTERNAME
+$cert = New-SelfSignedCertificate -CertStoreLocation cert:\LocalMachine\My -DnsName $hostname
+$thumbprint = $cert.Thumbprint
+SetupWinRM -hostname $hostname -thumbprint $thumbprint


Исправление в комментариях

Исправление в комментариях

--- backup-to-cloud-dev.cmd
+++ backup-to-cloud-dev.cmd
@@ -46,11 +46,10 @@
 rem     WinRar
 ::
 if exist "%PROGRAMFILES%\WinRAR\rar.exe" (set archive="%PROGRAMFILES%\WinRAR\rar.exe") else (if exist "%PROGRAMFILES(x86)%\WinRAR\rar.exe" (set archive="%PROGRAMFILES(x86)%\WinRAR\rar.exe") else (goto NoArchive))
+rem      ()
+set CurrentDisk="%~dp0"
 rem   (   ).
-set CurrentDisk="%~dp0"
 set logfile=%CurrentDisk%\backup.log
-rem      ()
-

 rem
 rem %date%   ( )


add backup .vim files in xp-installer

add backup .vim files in xp-installer

I believe the original bootstrap.sh checks if the files to be backed up
exist and are not symbolic links. In case of XP I think that not backing
up if "..\.spf13-vim-3" exists would probably be sufficient to save
updating users the wait.
If they decided to use the distribution the .vimrc should not be edited
manually anyway.

--- spf13-vim-windows-xp-install.cmd
+++ spf13-vim-windows-xp-install.cmd
@@ -2,6 +2,16 @@
 @if not exist "%HOME%" @set HOME=%USERPROFILE%

 @set BASE_DIR=%HOME%\.spf13-vim-3
+
+@if not exist "%BASE_DIR%" (
+        echo backing up existing vim config
+        @set today=%DATE%
+        @if exist "%HOME%\.vim" call xcopy /s/e/h/y/r/q/i "%HOME%\.vim" "%HOME%\.vim.%today%"
+        @if exist "%HOME%\.vimrc" call copy "%HOME%\.vimrc" "%HOME%\.vimrc.%today%"
+        @if exist "%HOME%\_vimrc" call copy "%HOME%\_vimrc" "%HOME%\_vimrc.%today%"
+        @if exist "%HOME%\.gvimrc" call copy "%HOME%\.gvimrc" "%HOME%\.gvimrc.%today%"
+        )
+
 call git clone --recursive -b 3.0 git://github.com/spf13/spf13-vim.git "%BASE_DIR%"
 call mkdir "%BASE_DIR%\.vim\bundle"
 call copy "%BASE_DIR%\.vim" "%HOME%\.vim"


windows-build-deps.cmd: New variable BUILD_RELEASE. Default FALSE, change to TRUE if you are building deps for Tundra deployment. This build kNet, Ogre and SkyX in Release mode in addition to the RelWithDebInfo mode. This will shrink ogre dll size with about 6 megs, dunno about runtime speedups. Make info prints easier to read and provide more info about the user definable variables.

--- tools/windows-build-deps.cmd
+++ tools/windows-build-deps.cmd
@@ -3,6 +3,7 @@

 :: User defined variables
 set GENERATOR="Visual Studio 9 2008"
+SET BUILD_RELEASE=FALSE
 set BUILD_OPENSSL=TRUE
 set USE_JOM=TRUE

@@ -17,10 +18,20 @@
 cd %TOOLS%

 :: Print user defined variables
+cecho {F0}This script fetches and builds all Tundra dependencies{# #}{\n}
+echo.
 cecho {0A}Script configuration:{# #}{\n}
-echo CMake Generator   = %GENERATOR%
-echo Build OpenSSL     = %BUILD_OPENSSL%
-echo Build Qt with JOM = %USE_JOM%
+cecho {0D}  CMake Generator    = %GENERATOR%{# #}{\n}
+echo    - Passed to CMake -G option
+cecho {0D}  Build Release = %BUILD_RELEASE%{# #}{\n}
+echo    - Build Release mode in addition to RelWithDebInfo when possible.
+echo      Default is disabled, enable if you are planning to deploy
+echo      Tundra in Release mode.
+cecho {0D}  Build OpenSSL      = %BUILD_OPENSSL%{# #}{\n}
+echo    - Build OpenSSL, requires Active Perl.
+cecho {0D}  Build Qt with JOM  = %USE_JOM%{# #}{\n}
+echo    - Use jom.exe instead of nmake.exe to build qmake projects.
+echo      Default enabled as jom is significantly faster by usin all CPUs.
 echo.

 :: Validate user defined variables
@@ -38,32 +49,38 @@
    )
 )

+IF NOT %BUILD_RELEASE% == FALSE (
+   IF NOT %BUILD_RELEASE% == TRUE (
+      cecho {0E}BUILD_RELEASE needs to be either TRUE or FALSE{# #}{\n}
+      GOTO :ERROR
+   )
+)
+
 :: Print scripts usage information
-cecho {0A}This script fetches and builds all Tundra dependencies.{# #}{\n}
-echo Requirements:
-echo 1. Install SVN and make sure 'svn' is accessible from PATH.
-echo  - http://tortoisesvn.net/downloads.html, install with command line tools!
-echo 2. Install Hg and make sure 'hg' is accessible from PATH.
-echo  - http://tortoisehg.bitbucket.org/
-echo 3. Install git and make sure 'git' is accessible from PATH.
-echo  - http://code.google.com/p/tortoisegit/
-echo 4. Install DirectX SDK June 2010.
-echo  - http://www.microsoft.com/download/en/details.aspx?id=6812
-echo 5. Install cmake and make sure 'cmake' is accessible from PATH.
-echo  - http://www.cmake.org/
-echo 6. Install Visual Studio 2008 with SP1. (Express is ok)
-echo  - http://www.microsoft.com/download/en/details.aspx?id=14597
-echo 7. Install Windows SDK.
-echo  - http://www.microsoft.com/download/en/details.aspx?id=8279
+cecho {0A}Requirements for a successful execution:{# #}{\n}
+echo   1. Install SVN and make sure 'svn' is accessible from PATH.
+echo    - http://tortoisesvn.net/downloads.html, install with command line tools!
+echo   2. Install Hg and make sure 'hg' is accessible from PATH.
+echo    - http://tortoisehg.bitbucket.org/
+echo   3. Install git and make sure 'git' is accessible from PATH.
+echo    - http://code.google.com/p/tortoisegit/
+echo   4. Install DirectX SDK June 2010.
+echo    - http://www.microsoft.com/download/en/details.aspx?id=6812
+echo   5. Install cmake and make sure 'cmake' is accessible from PATH.
+echo    - http://www.cmake.org/
+echo   6. Install Visual Studio 2008 with SP1. (Express is ok)
+echo    - http://www.microsoft.com/download/en/details.aspx?id=14597
+echo   7. Install Windows SDK.
+echo    - http://www.microsoft.com/download/en/details.aspx?id=8279

 IF %BUILD_OPENSSL%==TRUE (
-   echo 8. To build OpenSSL install Active Perl and set perl.exe to PATH.
-   echo  - http://www.activestate.com/activeperl/downloads
-   cecho {0E}   NOTE: Perl needs to be before git in PATH, otherwise the git{# #}{\n}
-   cecho {0E}   provided perl.exe will be used and OpenSSL build will fail.{# #}{\n}
-   echo 9. Execute this file from Visual Studio 2008/2010 Command Prompt.
-) ELSE (
-   echo 8. Execute this file from Visual Studio 2008/2010 Command Prompt.
+   echo   8. To build OpenSSL install Active Perl and set perl.exe to PATH.
+   echo    - http://www.activestate.com/activeperl/downloads
+   cecho {0E}     NOTE: Perl needs to be before git in PATH, otherwise the git{# #}{\n}
+   cecho {0E}     provided perl.exe will be used and OpenSSL build will fail.{# #}{\n}
+   echo   9. Execute this file from Visual Studio 2008/2010 Command Prompt.
+) ELSE (
+   echo   8. Execute this file from Visual Studio 2008/2010 Command Prompt.
 )
 echo.

@@ -305,9 +322,8 @@
 )
 cecho {0D}Building kNet. Please be patient, this will take a while.{# #}{\n}
 msbuild kNet.sln /p:configuration=Debug /nologo
-::msbuild kNet.sln /p:configuration=MinSizeRel /nologo
-::msbuild kNet.sln /p:configuration=Release /nologo
 msbuild kNet.sln /p:configuration=RelWithDebInfo /nologo
+IF %BUILD_RELEASE%==TRUE msbuild kNet.sln /p:configuration=Release /nologo
 IF NOT %ERRORLEVEL%==0 GOTO :ERROR

 IF NOT EXIST "%DEPS%\qtscriptgenerator\.git". (
@@ -456,22 +472,19 @@

 cecho {0D}Building ogre-safe-nocrashes. Please be patient, this will take a while.{# #}{\n}
 msbuild OGRE.sln /p:configuration=Debug /clp:ErrorsOnly /nologo
-::msbuild OGRE.sln /p:configuration=MinSizeRel /clp:ErrorsOnly /nologo
-::msbuild OGRE.sln /p:configuration=Release /clp:ErrorsOnly /nologo
 msbuild OGRE.sln /p:configuration=RelWithDebInfo /clp:ErrorsOnly /nologo
+IF %BUILD_RELEASE%==TRUE msbuild OGRE.sln /p:configuration=Release /clp:ErrorsOnly /nologo
 IF NOT %ERRORLEVEL%==0 GOTO :ERROR

 cecho {0D}Deploying ogre-safe-nocrashes SDK directory.{# #}{\n}
 msbuild INSTALL.vcproj /p:configuration=Debug /clp:ErrorsOnly /nologo
-::msbuild INSTALL.vcproj /p:configuration=MinSizeRel /clp:ErrorsOnly /nologo
-::msbuild INSTALL.vcproj /p:configuration=Release /clp:ErrorsOnly /nologo
-msbuild INSTALL.vcproj /p:configuration=RelWithDebInfo /clp:ErrorsOnly /nologo
+IF %BUILD_RELEASE%==FALSE (msbuild INSTALL.vcproj /p:configuration=RelWithDebInfo /clp:ErrorsOnly /nologo) ELSE (msbuild INSTALL.vcproj /p:configuration=Release /clp:ErrorsOnly /nologo)
 IF NOT %ERRORLEVEL%==0 GOTO :ERROR

 cecho {0D}Deploying Ogre DLLs to Tundra bin\ directory.{# #}{\n}
 copy /Y "%DEPS%\ogre-safe-nocrashes\bin\debug\*.dll" "%TUNDRA_BIN%"
 IF NOT %ERRORLEVEL%==0 GOTO :ERROR
-copy /Y "%DEPS%\ogre-safe-nocrashes\bin\relwithdebinfo\*.dll" "%TUNDRA_BIN%"
+IF %BUILD_RELEASE%==FALSE (copy /Y "%DEPS%\ogre-safe-nocrashes\bin\relwithdebinfo\*.dll" "%TUNDRA_BIN%") ELSE (copy /Y "%DEPS%\ogre-safe-nocrashes\bin\release\*.dll" "%TUNDRA_BIN%")
 IF NOT %ERRORLEVEL%==0 GOTO :ERROR
 copy /Y "%DEPS%\ogre-safe-nocrashes\Dependencies\bin\Release\cg.dll" "%TUNDRA_BIN%"
 IF NOT %ERRORLEVEL%==0 GOTO :ERROR
@@ -500,15 +513,14 @@
 )
 cecho {0D}Building SkyX. Please be patient, this will take a while.{# #}{\n}
 msbuild SKYX.sln /p:configuration=Debug /clp:ErrorsOnly /nologo
-::msbuild SKYX.sln /p:configuration=MinSizeRel /clp:ErrorsOnly /nologo
-::msbuild SKYX.sln /p:configuration=Release /clp:ErrorsOnly /nologo
 msbuild SKYX.sln /p:configuration=RelWithDebInfo /clp:ErrorsOnly /nologo
+IF %BUILD_RELEASE%==TRUE msbuild SKYX.sln /p:configuration=Release /clp:ErrorsOnly /nologo
 IF NOT %ERRORLEVEL%==0 GOTO :ERROR

 cecho {0D}Deploying SkyX DLLs to Tundra bin\.{# #}{\n}
 copy /Y "%DEPS%\realxtend-tundra-deps\skyx\bin\debug\*.dll" "%TUNDRA_BIN%"
 IF NOT %ERRORLEVEL%==0 GOTO :ERROR
-copy /Y "%DEPS%\realxtend-tundra-deps\skyx\bin\relwithdebinfo\*.dll" "%TUNDRA_BIN%"
+IF %BUILD_RELEASE%==FALSE (copy /Y "%DEPS%\realxtend-tundra-deps\skyx\bin\relwithdebinfo\*.dll" "%TUNDRA_BIN%") ELSE (copy /Y "%DEPS%\realxtend-tundra-deps\skyx\bin\release\*.dll" "%TUNDRA_BIN%")
 IF NOT %ERRORLEVEL%==0 GOTO :ERROR

 cecho {0D}Building Hydrax. Please be patient, this will take a while.{# #}{\n}
@@ -546,7 +558,7 @@
    IF NOT %ERRORLEVEL%==0 GOTO :ERROR
    copy /Y "%DEPS%\qt-solutions\qtpropertybrowser\lib\*.dll" "%TUNDRA_BIN%"
 ) ELSE (
-   cecho {0D}qtpropertybrowser already built. Skipping.{# #}{\n}
+   cecho {0D}QtPropertyBrowser already built. Skipping.{# #}{\n}
 )

 IF NOT EXIST "%DEPS%\OpenAL\libs\Win32\OpenAL32.lib". (


fix timestamp

fix timestamp

--- src/main/webapp/make/buildExtJS.bat
+++ src/main/webapp/make/buildExtJS.bat
@@ -10,7 +10,7 @@

-set timestamp=%Date:~0,4%-%Date:~5,2%-%Date:~8,2%_%time:~-10,1%-%time:~-8,2%-%time:~-5,2%
+set timestamp=%Date:~0,4%-%Date:~5,2%-%Date:~8,2%_%time:~-11,2%h%time:~-8,2%m%time:~-5,2%s

 cd %ssrPath%


Add gg.bat as a shortcut for a colorful git log shortcut

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

--- gg.bat
+++ gg.bat
@@ -0,0 +1 @@
+git log --graph --full-history --all --color --pretty=format:"%x1b[31m%h%x09%x1b[32m%d%x1b[0m%x20%s %Cgreen(%cr) %C(bold blue)<%an>%Creset'"


change install dir %CD% to %~dp0

change install dir %CD% to %~dp0

--- nodejs-portable.bat
+++ nodejs-portable.bat
@@ -33,7 +33,7 @@
 SET nodejsVersion=0.10.21

 :: Batch vars (no edits necessary)
-SET nodejsPath=%CD%
+SET nodejsPath=%~dp0
 SET nodejsWork=%nodejsPath%\work
 SET npmPath=%nodejsPath%\node_modules\npm
 SET npmGlobalConfigFilePath=%npmPath%\npmrc


Revert jsPlumb back to 1.6.4

Revert jsPlumb back to 1.6.4

--- js.thirdparty.bat
+++ js.thirdparty.bat
@@ -12,7 +12,7 @@
 --js=jquery/jquery.hotkeys.js ^
 --js=jquery/jquery.simplePagination.js ^
 --js=jquery/jquery.idle.js ^
---js=vendor/jsPlumb-1.7.10.js ^
+--js=jquery/jquery.jsPlumb-1.6.4.js ^
 --js=vendor/handlebars-v4.0.5.js ^
 --js=vendor/handlebars.form-helpers.js ^
 --js=vendor/handlebars.helpers.js ^


Remove xcopy from Npcap install script

Remove xcopy from Npcap install script

--- ci/install_npcap.bat
+++ ci/install_npcap.bat
@@ -1,8 +1,6 @@
 set NPCAP_OEM_FILE=npcap-0.9988-oem.exe
 curl --digest --user %NPCAP_USERNAME%:%NPCAP_PASSWORD% https://nmap.org/npcap/oem/dist/%NPCAP_OEM_FILE% --output %NPCAP_OEM_FILE%
 %NPCAP_OEM_FILE% /S /winpcap_mode
-xcopy C:\Windows\System32\Npcap\*.dll C:\Windows\System32
-xcopy C:\Windows\SysWOW64\Npcap\*.dll C:\Windows\SysWOW64
 appveyor DownloadFile https://nmap.org/npcap/dist/npcap-sdk-1.04.zip
 mkdir C:\Npcap-sdk
 7z x .\npcap-sdk-1.04.zip -oC:\Npcap-sdk


create bat --->  gradle clean

create bat --->  gradle clean

Signed-off-by: mitkey <75bbfd713b92046b37d170d27ccf17fb1bfb59e5@foxmail.com>

error: pathspec 'cmd-clean.bat' did not match any file(s) known to git

--- cmd-clean.bat
+++ cmd-clean.bat
@@ -0,0 +1 @@
+gradlew clean --daemon & pause