Fix AgularClient folder name

Fix AgularClient folder name

--- deploy.cmd
+++ deploy.cmd
@@ -31,7 +31,7 @@
 )

 IF NOT DEFINED DEPLOYMENT_TARGET_ANGULAR (
-  SET DEPLOYMENT_TARGET_ANGULAR=%ARTIFACTS%\wwwroot\AzureFunctions.AngulaClient
+  SET DEPLOYMENT_TARGET_ANGULAR=%ARTIFACTS%\wwwroot\AzureFunctions.AngularClient
 )

 IF NOT DEFINED NEXT_MANIFEST_PATH (
@@ -110,7 +110,7 @@

 :: 4. KuduSync
 IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
-  call :ExecuteCmd ROBOCOPY "%DEPLOYMENT_SOURCE%\AzureFunctions.AngulaClient" "%DEPLOYMENT_TARGET_ANGULAR%" /E /IS
+  call :ExecuteCmd ROBOCOPY "%DEPLOYMENT_SOURCE%\AzureFunctions.AngularClient" "%DEPLOYMENT_TARGET_ANGULAR%" /E /IS
   :: http://ss64.com/nt/robocopy-exit.html
   IF %ERRORLEVEL% EQU 16 echo ***FATAL ERROR*** & goto error
   IF %ERRORLEVEL% EQU 15 echo OKCOPY + FAIL + MISMATCHES + XTRA & goto error


update to jdk10

update to jdk10

--- clj.bat
+++ clj.bat
@@ -1,6 +1,6 @@
 @echo off
 :: palisades.lakes (at) gmail (dot) com
-:: 2017-10-09
+:: 2018-06-26

 ::set GC=-XX:+AggressiveHeap -XX:+UseStringDeduplication
 set GC=
@@ -15,7 +15,7 @@
 ::set PROF=-Xrunhprof:cpu=samples,depth=128,thread=y,doe=y

 ::set THRUPUT=-d64 -server -XX:+AggressiveOpts
-set THRUPUT=-d64 -server
+set THRUPUT=-server
 ::set THRUPUT=

 ::set XMX=-Xms29g -Xmx29g -Xmn11g
@@ -24,7 +24,7 @@
 set OPENS=--add-opens java.base/java.lang=ALL-UNNAMED
 set CP=-cp ./src/scripts/clojure;./src/test/clojure;lib/*

-set JAVA_HOME=%JAVA9%
+set JAVA_HOME=%JAVA10%
 set JAVA="%JAVA_HOME%\bin\java"

 set CMD=%JAVA% %THRUPUT% -ea -dsa -Xbatch %GC% %PROF% %XMX% %COMPRESSED% %TRACE% %OPENS% %CP% clojure.main %*


build number for release artifact

build number for release artifact

--- push-release.bat
+++ push-release.bat
@@ -7,6 +7,7 @@
 echo APPVEYOR_BUILD_VERSION %APPVEYOR_BUILD_VERSION%
 echo APPVEYOR_REPO_COMMIT %APPVEYOR_REPO_COMMIT%
 echo APPVEYOR_REPO_COMMIT_MESSAGE  %APPVEYOR_REPO_COMMIT_MESSAGE%
+echo APPVEYOR_BUILD_NUMBER  %APPVEYOR_BUILD_NUMBER%

 7z a %HERE%%CONFIGURATION%.zip %HERE%\src\bin\%CONFIGURATION%\*

@@ -22,7 +23,7 @@
                      --user pchalamet ^
 					 --repo full-build ^
                      --tag %APPVEYOR_BUILD_VERSION% ^
-                     --name "%APPVEYOR_PROJECT_NAME%-net45-anycpu.zip" ^
+                     --name "%APPVEYOR_PROJECT_NAME%-net45-anycpu-%APPVEYOR_BUILD_NUMBER%.zip" ^
                      --file %HERE%%CONFIGURATION%.zip || goto :ko

 :ok


log for build

log for build

--- push-release.bat
+++ push-release.bat
@@ -2,20 +2,26 @@

 set HERE=%~dp0

-echo pushing %APPVEYOR_PROJECT_NAME% %CONFIGURATION% %PLATFORM% %APPVEYOR_BUILD_VERSION% from %HERE%
+echo HERE %HERE%
+echo APPVEYOR_PROJECT_NAME %APPVEYOR_PROJECT_NAME%
+echo CONFIGURATION %CONFIGURATION%
+echo PLATFORM %PLATFORM%
+echo APPVEYOR_BUILD_VERSION %APPVEYOR_BUILD_VERSION%
+echo APPVEYOR_REPO_BRANCH %APPVEYOR_REPO_BRANCH%
+echo APPVEYOR_REPO_COMMIT %APPVEYOR_REPO_COMMIT%

 echo %HERE%tools/github-release.exe release ^
                          --user pchalamet ^
                          --repo full-build ^
 						 --tag %APPVEYOR_BUILD_VERSION% ^
 						 --name "full-build %APPVEYOR_BUILD_VERSION%" ^
-                         --description "%APPVEYOR_PROJECT_NAME% %APPVEYOR_BUILD_VERSION% (%APPVEYOR_REPO_COMMIT%)- %PLATFORM% %CONFIGURATION%" ^
+                         --description "%APPVEYOR_PROJECT_NAME% %APPVEYOR_BUILD_VERSION% %PLATFORM% %CONFIGURATION% %APPVEYOR_REPO_COMMIT%" ^
                          --pre-release || goto :ko

 echo %HERE%tools/github-release.exe upload ^
                      --user pchalamet ^
 					 --repo full-build ^
-                     --tag %APPVEYOR_BUILD_VERSION% ^
+                     --tag %APPVEYOR_REPO_BRANCH% ^
                      --name "%APPVEYOR_PROJECT_NAME%-net45-%PLATFORM%" ^
                      --file %HERE%src/bin/%CONFIGURATION%.zip || goto :ko


GROOVY-2690: groovy.bat faile to start script that are in a folder with a dash follow with "s"

git-svn-id: aa43ce4553b005588bb3cc6c16966320b011facb@11083 a5544e8c-8a19-0410-ba12-f9af4593a198

--- src/bin/startGroovy.bat
+++ src/bin/startGroovy.bat
@@ -85,7 +85,7 @@

 rem horrible roll your own arg processing inspired by jruby equivalent

-rem escape quotes (-q), minus (-d), star (-s).
+rem escape minus (-d), quotes (-q), star (-s).
 set _ARGS=%*
 if not defined _ARGS goto execute
 set _ARGS=%_ARGS:-=-d%


Skip building of Boost if USE_BOOST is FALSE. Use sed for tweaking kNet's CMakeLists.txt so that USE_BOOST can be configured from the command-line. Pass USE_BOOST value also for SkyX's CMake invocation.

--- tools/windows-build-deps.cmd
+++ tools/windows-build-deps.cmd
@@ -317,6 +317,11 @@
 set BOOST_INCLUDEDIR=%DEPS%\boost
 set BOOST_LIBRARYDIR=%DEPS%\boost\stage\lib

+IF %USE_BOOST%==FALSE (
+   cecho {0D}USE_BOOST set to FALSE. Skipping Boost.{# #}{\n}
+   GOTO :SKIP_BOOST
+)
+
 IF NOT EXIST "%DEPS%\boost". (
    cecho {0D}Cloning Boost into "%DEPS%\boost".{# #}{\n}
    cd "%DEPS%"
@@ -344,6 +349,7 @@
    cecho {0D}Boost already built. Skipping.{# #}{\n}
 )

+:SKIP_BOOST
 IF NOT EXIST "%DEPS%\assimp\". (
    cecho {0D}Checking out OpenAssetImport library from https://assimp.svn.sourceforge.net/svnroot/assimp/trunk into "%DEPS%\assimp".{# #}{\n}
    cd "%DEPS%"
@@ -389,10 +395,16 @@
 )

 cd "%DEPS%\kNet"
+:: TODO/NOTE: USE_BOOST not possible to configure from command-line with kNet's
+:: default (stable) branch yet, so tweak the CMakeLists.txt manually for now.
+sed s/"set(USE_BOOST TRUE)"/"option(USE_BOOST \"Specifies whether Boost is used.\" TRUE)"/g <CMakeLists.txt >CMakeLists.txt.sed
+del CMakeLists.txt
+rename CMakeLists.txt.sed CMakeLists.txt
+
 IF NOT EXIST kNet.sln. (
    cecho {0D}Running cmake for kNet.{# #}{\n}
    del /Q CMakeCache.txt
-   cmake . -G %GENERATOR% -DBOOST_ROOT="%BOOST_ROOT%"
+   cmake . -G %GENERATOR% -DBOOST_ROOT=%BOOST_ROOT% -DUSE_BOOST:BOOL=%USE_BOOST%
    IF NOT %ERRORLEVEL%==0 GOTO :ERROR
 )
 cecho {0D}Building kNet. Please be patient, this will take a while.{# #}{\n}
@@ -614,7 +626,7 @@
 IF NOT EXIST SKYX.sln. (
    cecho {0D}Running cmake for SkyX.{# #}{\n}
    del /Q CMakeCache.txt
-   cmake . -G %GENERATOR%
+   cmake . -G %GENERATOR% -DUSE_BOOST:BOOL=%USE_BOOST%
    IF NOT %ERRORLEVEL%==0 GOTO :ERROR
 )


Create runme.bat

Create runme.bat

Batch file for windows to create exe file using py2exe.

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

--- runme.bat
+++ runme.bat
@@ -0,0 +1,2 @@
+python setup.py py2exe
+echo exe file created in folder dist folder


update header for new member

update header for new member

--- src/application.bat
+++ src/application.bat
@@ -1,4 +1,4 @@
-### application.bat - 2015 - Guillet ###
+### application.bat - 2015 - Thibault ROGER ###
  echo "Copyright Thomas Guillet - 2015"

 version = "2"


Fix win build script

Fix win build script

--- recipe/bld.bat
+++ recipe/bld.bat
@@ -5,7 +5,10 @@
 set ac_cv_have_decl__BitScanForward=yes

 FOR /F "delims=" %%i IN ('cygpath.exe -u "%PREFIX%"') DO set "PREFIX=%%i"
-bash -lc "./configure --with-int=imath CFLAGS='-O3 -Dstrdup=_strdup'"
-bash -lc "make"
-bash -lc "make check"
-bash -lc "make install-strip"
+bash -lc "cd $SRC_DIR &&  ./configure --with-int=imath CFLAGS='-O3 -Dstrdup=_strdup' --prefix=$PREFIX/Library"
+bash -lc "cd $SRC_DIR && make -j$CPU_COUNT"
+bash -lc "cd $SRC_DIR && make check"
+bash -lc "cd $SRC_DIR && make install-strip"
+
+rm "%LIBRARY_LIB%/libisl.la"
+mv "%LIBRARY_LIB%/libisl.a" "%LIBRARY_LIB%/isl.lib"


Fix SCHEDULING-163

Fix SCHEDULING-163

git-svn-id: 27916816d6cfa57849e9a885196bf7392b80e1ac@11217 28e8926c-6b08-0410-baaa-805c5e19b8d6

--- bin/windows/init.bat
+++ bin/windows/init.bat
@@ -37,7 +37,7 @@

 SET CLASSPATH=%CLASSPATH%;%JARS%

-set JAVA_CMD="%JAVA_HOME%\bin\java.exe" -Dproactive.home="%PA_SCHEDULER%" -Dproactive.configuration="%PA_SCHEDULER%\config\proactive\ProActiveConfiguration.xml" -Dpa.scheduler.home="%PA_SCHEDULER%" -Dpa.rm.home="%PA_SCHEDULER%" -Djava.security.manager -Djava.security.policy="%PA_SCHEDULER%\config\scheduler.java.policy" -Dlog4j.configuration="file:///%PA_SCHEDULER%/config/scheduler-log4j"
+set JAVA_CMD="%JAVA_HOME%\bin\java.exe" -Dproactive.home="%PA_SCHEDULER%" -Dproactive.configuration="%PA_SCHEDULER%\config\proactive\ProActiveConfiguration.xml" -Dpa.scheduler.home="%PA_SCHEDULER%" -Dpa.rm.home="%PA_SCHEDULER%" -Djava.security.manager -Djava.security.policy="%PA_SCHEDULER%\config\scheduler.java.policy" -Dlog4j.configuration="file:%PA_SCHEDULER%/config/scheduler-log4j"

 rem Adding java tools to the path
 SET OK=1


Added Windows batch file for building the jar file.

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

--- Application/buildjar.bat
+++ Application/buildjar.bat
@@ -0,0 +1,2 @@
+@eecho off
+mvn clean compile assembly:single


Bat scripts: copy music files to destination

--- bat/bat_copy.bat
+++ bat/bat_copy.bat
@@ -3,6 +3,9 @@

 REM Copy data files from original KaM TPR game
 xcopy %KaMDir%\data\defines\* ..\data\defines /y /r /s
+
+REM Copy music files from original KaM TPR game
+xcopy "%KaMDir%"\data\sfx\songs\*.sng "%kam_folder%"\Music\*.mp2 /y /r /s

 REM ============================================================


Upgrade Twitch Harmonbot to Python 3.6

Upgrade Twitch Harmonbot to Python 3.6

--- Twitch/Twitch_Harmonbot.bat
+++ Twitch/Twitch_Harmonbot.bat
@@ -1,4 +1,4 @@
 :loop
-py -3.5 Twitch_Harmonbot.py
+py -3.6 Twitch_Harmonbot.py
 goto loop
 PAUSE


Add a script to automate HPC checking

Add a script to automate HPC checking

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

--- hpc.bat
+++ hpc.bat
@@ -0,0 +1,10 @@
+mkdir .hpc
+ghc --make -isrc -i. src\Main.hs -w -fhpc -odir .hpc -hidir .hpc -threaded -o .hpc\hlint-test
+del hlint-test.tix
+.hpc\hlint-test --help
+.hpc\hlint-test --test
+.hpc\hlint-test src --report=.hpc\report.html +RTS -N2
+hpc.exe markup hlint-test.tix --destdir=.hpc
+hpc.exe report hlint-test.tix
+del hlint-test.tix
+start .hpc\hpc_index_fun.html


add cmake config

add cmake config

--- recipe/bld.bat
+++ recipe/bld.bat
@@ -1,5 +1,13 @@
 MKDIR build\windows
 CD build\windows
-cmake -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ..\..
+
+cmake ..\.. ^
+        -G %CMAKE_GENERATOR% ^
+        -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
+        -DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^
+        -DBUILD_STATIC_LIBS=1 ^
+        -DBUILD_SHARED_LIBS=1
+
 ECHO VS files have been generated in build\windows
-cmake --build .
+
+cmake --build . --config Release


build: update windows configuration to match new vm

--- .kokoro/test.bat
+++ .kokoro/test.bat
@@ -17,14 +17,12 @@
 cd /d %~dp0
 cd ..

-@rem The image we're currently running has a broken version of Node.js enabled
-@rem by nvm (v10.15.3), which has no npm bin. This hack uses the functional
-@rem Node v8.9.1 to install npm@latest, it then uses this version of npm to
-@rem install npm for v10.15.3.
-call nvm use v8.9.1 || goto :error
-call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm-bootstrap\bin\npm-cli.js i npm -g || goto :error
-call nvm use v10.15.3 || goto :error
-call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm\bin\npm-cli.js i npm -g || goto :error
+@rem npm path is not currently set in our image, we should fix this next time
+@rem we upgrade Node.js in the image:
+SET PATH=%PATH%;/cygdrive/c/Program Files/nodejs/npm
+
+call nvm use v12.14.1
+call which node

 call npm install || goto :error
 call npm run test || goto :error


chore: use latest npm on Windows (#41)

chore: use latest npm on Windows (#41)

--- .kokoro/test.bat
+++ .kokoro/test.bat
@@ -1,4 +1,4 @@
-@rem Copyright 2018 gRPC authors.
+@rem Copyright 2018 Google LLC. All rights reserved.
 @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.
@@ -17,8 +17,7 @@
 cd /d %~dp0
 cd ..

-call npm install -g npm@5 || goto :error
-
+call npm install -g npm@latest || goto :error
 call npm install || goto :error
 call npm run test || goto :error


build: patch Windows container, fixing Node 10 (#219)

--- .kokoro/test.bat
+++ .kokoro/test.bat
@@ -17,7 +17,15 @@
 cd /d %~dp0
 cd ..

-call npm install -g npm@latest || goto :error
+@rem The image we're currently running has a broken version of Node.js enabled
+@rem by nvm (v10.15.3), which has no npm bin. This hack uses the functional
+@rem Node v8.9.1 to install npm@latest, it then uses this version of npm to
+@rem install npm for v10.15.3.
+call nvm use v8.9.1 || goto :error
+call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm-bootstrap\bin\npm-cli.js i npm -g || goto :error
+call nvm use v10.15.3 || goto :error
+call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm\bin\npm-cli.js i npm -g || goto :error
+
 call npm install || goto :error
 call npm run test || goto :error


Downloads into root

Downloads into root

Changed commands so now downloads into modzillainstallation

--- runme.bat
+++ runme.bat
@@ -34,9 +34,9 @@
 :Option-2
 ::mkdir modzillainstallation
 cd modzillainstallation
-git fetch https://github.com/dudeisbrendan03/modzilla.git
+git fetch https://github.com/dudeisbrendan03/modzilla.git modzillainstallation/
 git reset
-git pull --allow-unrelated-histories https://github.com/dudeisbrendan03/modzilla.git
+git pull --allow-unrelated-histories https://github.com/dudeisbrendan03/modzilla.git modzillainstallation/
 cd modzillainstallation
 python modzillainst.py
 :End


commit on 06/06/2018 at 12:16:08

commit on 06/06/2018 at 12:16:08

--- ansys-APDL/transverseCrack.cmd
+++ ansys-APDL/transverseCrack.cmd
@@ -246,6 +246,7 @@
 NSLL,S,1                                  !Select nodes associated to this line
 *GET,NNodes,NODE,0,COUNT                  !Get the number of nodes in the selected set
 *DIM, CrackDisps, ARRAY, NNodes, 12
+*VGET, CrackDisps(1,1), NODE, 0, NUM
 *VGET, CrackDisps(1,2), NODE, 1, LOC, X
 *VGET, CrackDisps(1,3), NODE, 1, LOC, Y
 *VGET, CrackDisps(1,4), NODE, 1, LOC, Z
@@ -257,7 +258,7 @@
 *VGET, CrackDisps(1,10), NODE, 1, EPEL, X
 *VGET, CrackDisps(1,11), NODE, 1, EPEL, Y
 *VGET, CrackDisps(1,12), NODE, 1, EPEL, XY
-*VGET, CrackDisps(1,1), NODE, 1, NODE(CrackDisps(1,2),CrackDisps(1,3),CrackDisps(1,4))
+!*VGET, CrackDisps(1,1), NODE, 1, NODE(CrackDisps(1,2),CrackDisps(1,3),CrackDisps(1,4))

 *CFOPEN, CFFileCoordDisp, csv
 *VWRITE, 'NODE LABEL, X [mm], Z [mm], UX [mm], UZ [mm]'


Translated setup.sh to setup.bat for windows

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

--- setup.bat
+++ setup.bat
@@ -0,0 +1,12 @@
+@ECHO OFF
+IF NOT EXIST virtualenv GOTO DIRNOTEXISTS
+:DIREXISTS
+virtualenv\scripts\activate
+pip install --use-mirrors argparse coverage doxypy lockfile pyserial unittest-xml-reporting
+GOTO DONE
+
+:DIRNOTEXISTS
+python virtualenv.py virtualenv
+GOTO DIREXISTS
+
+:DONE


Delete start.bat

Delete start.bat

--- start.bat
+++ start.bat
@@ -1 +0,0 @@
-python start.py


Add very simple vagrant plugin install for the autonetwork

--- start.bat
+++ start.bat
@@ -1,3 +1,5 @@
+@ECHO ON
+vagrant plugin install vagrant-auto_network
 @ECHO OFF
 ECHO -----------------------------------------
 ECHO Welcome to the microbit-vagrants control.


start.bat w/ path for sandbox

start.bat w/ path for sandbox

--- start.bat
+++ start.bat
@@ -1,4 +1,4 @@
 @ECHO OFF
 setlocal
-set PYTHONPATH=superdesk/plugins/livedesk;plugins/gui-core;plugins/test-dev
+set PYTHONPATH=superdesk/plugins/livedesk;plugins/gui-core;plugins/sandbox
 C:\Python32\python.exe superdesk/distribution/application.py


Finish win shell script

Finish win shell script

--- start.cmd
+++ start.cmd
@@ -113,11 +113,11 @@
 echo Copyright ©Nikitakun (github.com/nibogd)
 echo.
 echo Usage:
-echo   ingress-ice.cmd [-r] [-h | /?]
+echo   ingress-ice.cmd [-r] [-h]
 echo.
 echo Options:
 echo   -r      Overwrite the configuration file with a new one.
-echo   -h /?   Print this help
+echo   -h      Print this help
 echo.
 echo Please visit http://ingress.divshot.io/ or http://github.com/nibgd/ingress-ice for additional help
 :eof


Add the ability to use the cassandra projections with easy to use settings API

--- release-local.cmd
+++ release-local.cmd
@@ -1,3 +0,0 @@
-@echo off
-
-build.cmd ReleaseLocal


Add many additional entries

Add many additional entries

Source: https://www.reddit.com/r/TronScript/comments/3iw0qx/guid_dump/cuksslt

--- resources/stage_2_de-bloat/programs_to_target_by_GUID.bat
+++ resources/stage_2_de-bloat/programs_to_target_by_GUID.bat
@@ -5,22 +5,9 @@
 @echo off

-::::::::::::::::::::::::::
-:: Interactive Removals ::
-::::::::::::::::::::::::::
-:: If you uncomment these, they will STOP Tron while waiting for user input! Only left here for reference.
-
-:: Dell Backup and Restore
-::"%ProgramFiles(x86)%\InstallShield Installation Information\{0ED7EE95-6A97-47AA-AD73-152C08A15B04}\setup.exe" -runfromtemp -l0x0409  -removeonly
-
-:: McAfee Security Scan
-::"%ProgramFiles%\McAfee Security Scan\uninstall.exe" /S
-::"%ProgramFiles(x86)%\McAfee Security Scan\uninstall.exe" /S
-
-
-:::::::::::::::::::::
-:: Silent Removals ::
-:::::::::::::::::::::
+:::::::::::::::
+:: GUID LIST ::
+:::::::::::::::

 :: Ask Toolbar
 start /wait msiexec /x {4F524A2D-5637-006A-76A7-A758B70C0300} /qn /norestart
@@ -37,6 +24,21 @@

 :: Bing Desktop
 start /wait msiexec /x {7D095455-D971-4D4C-9EFD-9AF6A6584F3A} /qn /norestart
+
+:: CyberLink Power2Go 8
+start /wait msiexec /x {2A87D48D-3FDF-41fd-97CD-A1E370EFFFE2} /qn /norestart
+
+:: CyberLink PhotoDirector 5
+start /wait msiexec /x {5A454EC5-217A-42a5-8CE1-2DDEC4E70E01} /qn /norestart
+
+:: CyberLink PowerDVD 12
+start /wait msiexec /x {B46BEA36-0B71-4A4E-AE41-87241643FA0A} /qn /norestart
+
+:: CyberLink PowerDirector 12
+start /wait msiexec /x {E1646825-D391-42A0-93AA-27FA810DA093} /qn /norestart
+
+:: CyberLink LabelPrint
+start /wait msiexec /x {C59C179C-668D-49A9-B6EA-0121CCFC1243} /qn /norestart

 :: Dell Access
 start /wait msiexec /x {F839C6BD-E92E-48FA-9CE6-7BFAF94F7096} /qn /norestart
@@ -88,6 +90,12 @@
 :: Dell Support Center
 start /wait msiexec /x {0090A87C-3E0E-43D4-AA71-A71B06563A4A} /qn /norestart

+:: DisableMSDefender
+start /wait msiexec /x {74FE39A0-FB76-47CD-84BA-91E2BBB17EF2} /qn /norestart
+
+:: DTS Sound
+start /wait msiexec /x {793B70D2-41E9-46AB-9DDC-B34C99D07DB5} /qn /norestart
+
 :: Embassy Suite
 start /wait msiexec /x {20A4AA32-B3FF-4A0B-853C-ACDDCD6CB344} /qn /norestart

@@ -97,18 +105,30 @@
 :: ESC Home Page Plugin
 start /wait msiexec /x {E738A392-F690-4A9D-808E-7BAF80E0B398} /qn /norestart

+:: Get Dropbox
+start /wait msiexec /x {597A58EC-42D6-4940-8739-FB94491B013C} /qn /norestart
+
+:: Hewlett-Packard ACLM.NET v1.2.2.3
+start /wait msiexec /x {6F340107-F9AA-47C6-B54C-C3A19F11553F} /qn /norestart
+
 :: HP Customer Experience Enhancements
 start /wait msiexec /x {07FA4960-B038-49EB-891B-9F95930AA544} /qn /norestart

 :: HP Connected Music
 start /wait msiexec /x {8126E380-F9C6-4317-9CEE-9BBDDAB676E5} /qn /norestart

+:: HP Documentation
+start /wait msiexec /x {C8D60CF4-BE7A-487E-BD36-535111BDB0FE} /qn /norestart
+
 :: HP PostScript Converter
 start /wait msiexec /x {6E14E6D6-3175-4E1A-B934-CAB5A86367CD} /qn /norestart

 :: HP Registration Service
 start /wait msiexec /x {D1E8F2D7-7794-4245-B286-87ED86C1893C} /qn /norestart

+:: HP Setup
+start /wait msiexec /x {438363A8-F486-4C37-834C-4955773CB3D3} /qn /norestart
+
 :: HP SimplePass
 start /wait msiexec /x {314FAD12-F785-4471-BCE8-AB506642B9A1} /qn /norestart

@@ -117,6 +137,7 @@

 :: HP Support Assistant
 start /wait msiexec /x {8C696B4B-6AB1-44BC-9416-96EAC474CABE} /qn /norestart
+start /wait msiexec /x {904822F1-6C7D-4B91-B936-6A1C0810544C} /qn /norestart

 :: HP Update
 start /wait msiexec /x {912D30CF-F39E-4B31-AD9A-123C6B794EE2} /qn /norestart
@@ -127,15 +148,30 @@
 :: Intel Trusted Connect Client
 start /wait msiexec /x {44B72151-611E-429D-9765-9BA093D7E48A} /qn /norestart

+:: Intel (R) Trusted Connect Service Client
+start /wait msiexec /x {1B444AF9-1DBE-4884-8F35-969BEFCF69A8} /qn /norestart
+start /wait msiexec /x {7D84E343-A23D-451C-B123-0195B2D903A6} /qn /norestart
+
+:: Intel(R) ME UninstallLegacy
+start /wait msiexec /x {FD37351B-3074-4652-8188-1B3FB784EC4E} /qn /norestart
+start /wait msiexec /x {C9A90201-B2DE-44D0-A618-EF8C9060D318} /qn /norestart
+
 :: Intel Update
 start /wait msiexec /x {78091D68-706D-4893-B287-9F1DFB24F7AF} /qn /norestart

 :: Intel Update Manager
 start /wait msiexec /x {608E1B9B-A2E8-4A1F-8BAB-874EB0DD25E3} /qn /norestart
+
+:: Intel(R) Rapid Storage Technology
+start /wait msiexec /x {205AE40D-8AD7-4F29-A430-DD2168DA562D} /qn /norestart
+start /wait msiexec /x {409CB30E-E457-4008-9B1A-ED1B9EA21140} /qn /norestart

 :: Java Auto Updater
 start /wait msiexec /x {4A03706F-666A-4037-7777-5F2748764D10} /qn /norestart
 start /wait msiexec /x {CCB6114E-9DB9-BD54-5AA0-BC5123329C9D} /qn /norestart
+
+:: Kaspersky Internet Security
+start /wait msiexec /x {793B70D2-41E9-46AB-9DDC-B34C99D07DB5} /qn /norestart

 :: Lenovo Message Center Plus
 start /wait msiexec /x {3849486C-FF09-4F5D-B491-3E179D58EE15} /qn /norestart
@@ -178,19 +214,61 @@
 :: Microsoft Search Enhancement Pack
 start /wait msiexec /x {4CBA3D4C-8F51-4D60-B27E-F6B641C571E7} /qn /norestart

+:: Microsoft DVD App Installation for Microsoft.WindowsDVDPlayer_2019.6.11761.0_neutral_~_8wekyb3d8bbwe (x64)
+start /wait msiexec /x {986E003C-E56D-5A47-110E-D3C81F0E8535} /qn /norestart
+
 :: Office 2013 C2R Suite
 start /wait msiexec /x {90150000-0138-0409-0000-0000000FF1CE} /qn /norestart
 start /wait msiexec /x "C:\ProgramData\Microsoft\OEMOffice15\OOBE\x86\oemoobe.msi" /qn /norestart

+:: opensource
+start /wait msiexec /x {3677D4D8-E5E0-49FC-B86E-06541CF00BBE} /qn /norestart
+
+:: Recovery Manager
+start /wait msiexec /x {44B2A0AB-412E-4F8C-B058-D1E8AECCDFF5} /qn /norestart
+
+:: PlayReady PC Runtime amd64
+start /wait msiexec /x {BCA9334F-B6C9-4F65-9A73-AC5A329A4D04} /qn /norestart
+
 :: Roxio File Backup
 start /wait msiexec /x {60B2315F-680F-4EB3-B8DD-CCDC86A7CCAB} /qn /norestart

 :: Roxio BackOnTrack
 start /wait msiexec /x {5A06423A-210C-49FB-950E-CB0EB8C5CEC7} /qn /norestart

+:: Samsung SW Update (disables Windows Update; very bad)
+start /wait msiexec /x {AAFEFB05-CF98-48FC-985E-F04CD8AD620D} /qn /norestart
+
 :: Skype Click 2 Call
 start /wait msiexec /x {6D1221A9-17BF-4EC0-81F2-27D30EC30701} /qn /norestart

+:: Toshiba Display Utility
+start /wait msiexec /x {0B39C39A-3ECE-4582-9C91-842D22819A24} /qn /norestart
+
+:: Toshiba Service Station
+start /wait msiexec /x {0DFA8761-7735-4DE8-A0EB-2286578DCFC6} /qn /norestart
+
+:: Toshiba Audio Enhancement
+start /wait msiexec /x {1515F5E3-29EA-4CD1-A981-032D88880F09} /qn /norestart
+
+:: Toshiba System Driver
+start /wait msiexec /x {1E6A96A1-2BAB-43EF-8087-30437593C66C} /qn /norestart
+
+:: Toshiba Application Installer
+start /wait msiexec /x {21A63CA3-75C0-4E56-B602-B7CD2EF6B621} /qn /norestart
+
+:: Toshiba Password Utility
+start /wait msiexec /x {26BB68BB-CF93-4A12-BC6D-A3B6F53AC8D9} /qn /norestart
+
+:: Toshiba User's Guide
+start /wait msiexec /x {3384E1D9-3F18-4A98-8655-180FEF0DFC02} /qn /norestart
+
+:: TOSHIBARegistration
+start /wait msiexec /x {5AF550B4-BB67-4E7E-82F1-2C4300279050} /qn /norestart
+
+:: TOSHIBA Eco Utility
+start /wait msiexec /x {72EFCFA8-3923-451D-AF52-7CE9D87BC2A1} /qn /norestart
+
 :: Toshiba ReelTime
 start /wait msiexec /x {24811C12-F4A9-4D0F-8494-A7B8FE46123C} /qn /norestart

@@ -199,6 +277,9 @@

 :: Toshiba Value Added Package
 start /wait msiexec /x {066CFFF8-12BF-4390-A673-75F95EFF188E} /qn /norestart
+
+:: Toshiba System Settings
+start /wait msiexec /x {B040D5C9-C9AA-430A-A44E-696656012E61} /qn /norestart

 :: Toshiba Wireless LAN Indicator
 start /wait msiexec /x {CDADE9BC-612C-42B8-B929-5C6A823E7FF9} /qn /norestart
@@ -233,3 +314,6 @@

 :: Windows Live Toolbar
 start /wait msiexec /x {995F1E2E-F542-4310-8E1D-9926F5A279B3} /qn /norestart
+
+:: WinZip
+start /wait msiexec /x {CD95F661-A5C4-44F5-A6AA-ECDD91C240ED} /qn /norestart


Delete debug_sha1_key.bat

Delete debug_sha1_key.bat

--- debug_sha1_key.bat
+++ debug_sha1_key.bat
@@ -1,3 +0,0 @@
-@echo off
-keytool -exportcert -alias androiddebugkey -keystore %USERPROFILE%\.android\debug.keystore -list -v
-pause


better perl download link

better perl download link

--- setup.bat
+++ setup.bat
@@ -12,7 +12,7 @@
 SET WEBMIN_download=https://sourceforge.net/projects/webadmin/
 SET WRT_download=https://www.microsoft.com/download/details.aspx?id=17657
 SET PROCESS_download=https://web.archive.org/web/20180105215524/http://retired.beyondlogic.org/solutions/processutil/processutil.htm
-SET PERL_download=https://www.activestate.com/activeperl/
+SET PERL_download=https://platform.activestate.com/ActiveState/ActivePerl-5.26
 SET perl_path32=C:\Perl
 SET perl_path64=C:\Perl64
 SET inst_dir=C:\webmin


Update Main.bat

Update Main.bat

--- Windows/Main.bat
+++ Windows/Main.bat
@@ -1,4 +1,5 @@
 REM Add other things if could be automated, RUN THIS AS ADMIN
+REM Everything is added, including PowerShell command execution and "wget" lol
 @echo off
 echo Check for Admn
 net sessions


update

update

--- tomcat2/bin/catalina.bat
+++ tomcat2/bin/catalina.bat
@@ -178,6 +178,8 @@
 :noJuliConfig
 set JAVA_OPTS=%JAVA_OPTS% %LOGGING_CONFIG%

+set JAVA_OPTS=%JAVA_OPTS% -Xmx512m -XX:PermSize=128m -XX:MaxPermSize=256m
+
 if not "%LOGGING_MANAGER%" == "" goto noJuliManager
 set LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
 :noJuliManager


Fix error in Sundials bat script

Fix error in Sundials bat script

--- dependencies/setupSundials.bat
+++ dependencies/setupSundials.bat
@@ -15,22 +15,25 @@
 call setHopsanBuildPaths.bat
 set PATH=%PATH_WITH_MSYS%

-REM Build
+REM build
+if exist %builddir% (
+  echo Removing existing build directory %builddir%
+  rmdir /S /Q %builddir%
+)
 mkdir %builddir%
 cd %builddir%

-sundials_cmake_args="-Wno-dev -DBUILD_STATIC_LIBS=OFF -DBUILD_ARKODE=OFF -DBUILD_IDAS=OFF -DBUILD_IDA=OFF -DBUILD_CVODE=OFF -DBUILD_CVODES=OFF -DBUILD_KINSOL=ON -DBUILD_EXAMPLES_C=OFF -DEXAMPLES_INSTALL=OFF -DCMAKE_INSTALL_LIBDIR=lib"
+set sundials_cmake_args="-Wno-dev -DBUILD_STATIC_LIBS=OFF -DBUILD_ARKODE=OFF -DBUILD_IDAS=OFF -DBUILD_IDA=OFF -DBUILD_CVODE=OFF -DBUILD_CVODES=OFF -DBUILD_KINSOL=ON -DBUILD_EXAMPLES_C=OFF -DEXAMPLES_INSTALL=OFF -DCMAKE_INSTALL_LIBDIR=lib"

 REM Configure
-cmake ${sundials_cmake_args} -DCMAKE_INSTALL_PREFIX=${installdir} ${codedir}
-
-REM Build and install
-mingw32-make -j8
-mingw32-make install
+cmake ${sundials_cmake_args} -DCMAKE_INSTALL_PREFIX=%installdir% %codedir%
+cmake --build . --parallel 8
+cmake --build . --target install

 REM Return to basedir
-cd %basedir%echo.
+cd %basedir%
+echo.
 echo setSundials.bat Done
 if "%HOPSAN_BUILD_SCRIPT_NOPAUSE%" == "" (
   pause


Fixed headers export

Fixed headers export

--- build/export.bat
+++ build/export.bat
@@ -24,6 +24,7 @@
 xcopy /Y "%SRC_DIR%\end.h" %INCLUDE_DIR%
 xcopy /Y "%SRC_DIR%\content.h" %INCLUDE_DIR%
 xcopy /Y "%SRC_DIR%\cdata.h" %INCLUDE_DIR%
+xcopy /Y "%SRC_DIR%\instruction.h" %INCLUDE_DIR%
 xcopy /Y "%SRC_DIR%\attribute.h" %INCLUDE_DIR%
 xcopy /Y "%SRC_DIR%\filter.h" %INCLUDE_DIR%
 xcopy /Y "%SRC_DIR%\adapter.h" %INCLUDE_DIR%


Make run.bat properly copy things into Debug

--- scripts/run.bat
+++ scripts/run.bat
@@ -1,9 +1,27 @@
 @echo off
+
+set SFML_ROOT="C:\Users\jsvana\Documents\SFML-2.4.1"

 pushd build

-cmake -G"Visual Studio 14" -DSFML_ROOT="C:\Users\jsvana\Documents\SFML-2.4.1" ..
+cmake -G"Visual Studio 14" -DSFML_ROOT=%SFML_ROOT% ..

 popd

-msbuild ./build/portland.vcxproj+msbuild .\build\portland.vcxproj
+
+if not exist .\build\Debug\assets (
+	xcopy /s /i  .\assets .\build\Debug\assets > NUL
+)
+
+call :CopyDll "sfml-graphics-d-2.dll"
+call :CopyDll "sfml-system-d-2.dll"
+call :CopyDll "sfml-window-d-2.dll"
+
+:CopyDll
+set dll_path="%SFML_ROOT%\bin\%~1"
+set out_path=".\build\Debug"
+if not exist "%out_path%\%~1" (
+	xcopy /i "%SFML_ROOT%\bin\%~1" "%out_path%" > NUL
+)
+EXIT /B 0


also test and cover second test project.

--- .scripts/TestCoverage.bat
+++ .scripts/TestCoverage.bat
@@ -3,6 +3,7 @@
 IF DEFINED APPVEYOR (
     REM dotnet test src\Playground.Calculator.Test\Playground.Calculator.Test.csproj -c Debug --no-build --logger \"trx;LogFileName=%APPVEYOR_BUILD_FOLDER%\TestResults.trx\"
     C:\ProgramData\chocolatey\lib\opencover.portable\tools\OpenCover.Console.exe -register:user -target:"c:\Program Files\dotnet\dotnet.exe" -targetargs:"test src\Playground.Calculator.Test\Playground.Calculator.Test.csproj -c Debug --no-build --logger \"trx;LogFileName=%APPVEYOR_BUILD_FOLDER%\TestResults.trx\" " -threshold:1 -oldStyle -returntargetcode -filter:"+[Playground*]* -[Playground*.Test]*" -excludebyattribute:*.ExcludeFromCodeCoverage* -excludebyfile:*\*Designer.cs -hideskipped:All -mergebyhash -mergeoutput -output:.\coverage-dotnet.xml
+    C:\ProgramData\chocolatey\lib\opencover.portable\tools\OpenCover.Console.exe -register:user -target:"c:\Program Files\dotnet\dotnet.exe" -targetargs:"test src\Playground.Web.Test\Playground.Web.Test.csproj -c Debug --no-build --logger \"trx;LogFileName=%APPVEYOR_BUILD_FOLDER%\TestResults.trx\" " -threshold:1 -oldStyle -returntargetcode -filter:"+[Playground*]* -[Playground*.Test]*" -excludebyattribute:*.ExcludeFromCodeCoverage* -excludebyfile:*\*Designer.cs -hideskipped:All -mergebyhash -mergeoutput -output:.\coverage-dotnet.xml
     REM C:\ProgramData\chocolatey\lib\opencover.portable\tools\OpenCover.Console.exe -register:user -target:"%xunit20%\xunit.console.x86.exe" -targetargs:"src\Playground.Calculator.Test\bin\Debug\netcoreapp2.0\Playground.Calculator.Test.dll -noshadow -appveyor -xml .\xunit-results.xml" -threshold:1 -oldStyle -returntargetcode -filter:"+[Playground*]* -[Playground*.Test]*" -excludebyattribute:*.ExcludeFromCodeCoverage* -excludebyfile:*\*Designer.cs -hideskipped:All -mergebyhash -mergeoutput -output:.\coverage-dotnet.xml
 ) ELSE (
 	echo No coverage without appveyor.


Don't use the latest cython from anaconda, it's broken

--- buildscripts/jenkins-build.bat
+++ buildscripts/jenkins-build.bat
@@ -42,7 +42,9 @@
 REM python version and containing the dependencies.
 SET PYENV_PREFIX=%WORKSPACE%\build\pyenv
 rd /s /q %PYENV_PREFIX%
-call C:\Anaconda\Scripts\conda create --yes -p %PYENV_PREFIX% python=%PYTHON_VERSION% cython scipy nose
+REM NOTE: cython is forced to 0.20.2 temporarily because of a bug in anaconda
+REM       https://github.com/ContinuumIO/anaconda-issues/issues/178
+call C:\Anaconda\Scripts\conda create --yes -p %PYENV_PREFIX% python=%PYTHON_VERSION% cython=0.20.2 scipy nose
 IF %ERRORLEVEL% NEQ 0 exit /b 1
 echo on
 set PYTHON_EXECUTABLE=%PYENV_PREFIX%\Python.exe


Debug build added for exp-env

Debug build added for exp-env

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

--- rebuildExperimentEnvDebugMode.bat
+++ rebuildExperimentEnvDebugMode.bat
@@ -0,0 +1,15 @@
+rem Define VISUAL_STUDIO_PATH_DEVENV env. variable in your system, example:
+rem SET VISUAL_STUDIO_PATH_DEVENV=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\devenv.exe
+
+"%VISUAL_STUDIO_PATH_DEVENV%" HeuristicSearchMax.sln /rebuild Debug
+rmdir /S /Q ExperimentEnv
+mkdir ExperimentEnv
+copy Grid\bin\Debug\*.exe ExperimentEnv
+copy Grid\bin\Debug\*.config ExperimentEnv
+copy Grid\bin\Debug\*.dll ExperimentEnv
+copy ExperimentRunner\bin\Debug\*.exe ExperimentEnv
+copy ExperimentRunner\bin\Debug\*.config ExperimentEnv
+copy ExperimentRunner\profile.txt ExperimentEnv
+copy LogUtils\ExperimentSummarizer\bin\Debug\*.exe ExperimentEnv
+copy LogUtils\DrawSolution\bin\Debug\*.exe ExperimentEnv
+copy FoldersExp.bat ExperimentEnv


Added C: to path

Added C: to path

--- core/win32/build.bat
+++ core/win32/build.bat
@@ -1,5 +1,5 @@
 setlocal
-set CWPATH=\Program Files\Metrowerks\CodeWarrior
+set CWPATH=C:\Program Files\Metrowerks\CodeWarrior
 set TCLTKPATH=%CWPATH%\ALS Build Support\Tcl-Tk Support
 copy setcwd.bat temp.bat
 cd >> temp.bat
@@ -24,4 +24,4 @@
 alspro_b -b -g "(consult('..\\als_dev\\alsdev\\ldr_dvsh'),consult('..\\tcltk_interface\\common\\tcltk_util'), attach_image('ALS Prolog.exe'))"
 alspro_b -b -g "(consult('..\\als_dev\\alsdev\\ldr_dvsh'),consult('..\\tcltk_interface\\common\\tcltk_util'),builtins:abolish(save_image,1),builtins:abolish(save_image,2),sio:abolish(open_socket_stream,4),attach_image('ALS Student Prolog.exe'))"
 alspro_b -b -g "save_image(alspro)"
-endlocal+endlocal


added line for _psmove.py in releases folder

--- setup_windows.bat
+++ setup_windows.bat
@@ -14,4 +14,5 @@
 choco install cmake -y
 ::set PATH=%PATH%;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin
 ::set PATH="C:\Program Files\CMake\bin\";%PATH%
+set PYTHONPATH="C:\Users\Aaron\Documents\GitHub\JoustMania\psmoveapi\build\Release";%PYTHONPATH%
 psmoveapi/scripts/visualc/build_msvc.bat 2017


cleaned up windows cmd output a bit

cleaned up windows cmd output a bit

--- src/main/batch/builder.bat
+++ src/main/batch/builder.bat
@@ -1 +1,2 @@
-java -jar C:\hybris\BuilderSDK\builder-cli-shade.jar %1 %2 %3 %4 %5 %6 %7 %8 %9+@echo off
+java -jar C:\hybris\BuilderSDK\builder-cli-shade.jar %1 %2 %3 %4 %5 %6 %7 %8 %9


Updated .bat file

Updated .bat file

--- run.bat
+++ run.bat
@@ -20,7 +20,7 @@
 # Generate content
 mvn clean compile dependency:copy-dependencies && ^
 rm -rf src/main/content && ^
-java -cp "target/classes:target/dependency/*" com.github.onsdigital.generator.ContentGenerator
+java -cp "target/classes;target/dependency/*" com.github.onsdigital.generator.ContentGenerator

 rem # Build and run:
 mvn -Dmaven.test.skip=true clean compile dependency:copy-dependencies && ^


Update stage_4_repair.bat

Update stage_4_repair.bat

--- resources/stage_4_repair/stage_4_repair.bat
+++ resources/stage_4_repair/stage_4_repair.bat
@@ -33,11 +33,11 @@
 :: PREP AND CHECKS ::
 :::::::::::::::::::::
 set STAGE_4_SCRIPT_VERSION=1.2.5
-set STAGE_4_SCRIPT_DATE=2018-01-25
+set STAGE_4_SCRIPT_DATE=2018-01-29

 :: Check for standalone vs. Tron execution and build the environment if running in standalone mode
 if /i "%LOGFILE%"=="" (
-	pushd %~dp0
+	pushd "%~dp0"
 	pushd ..

 	:: Load the settings file


update to the war generator

update to the war generator

--- war.bat
+++ war.bat
@@ -1 +1 @@
-grails war target/ehr.war+grails war target/ROOT.war


Set svn:eol-style for new unix and windows shell scripts

git-svn-id: 5ccfe34f605a6c2f9041ff2965ab60012c62539a@1822060 13f79535-47bb-0310-9956-ffa450edef68

--- bin/create-rmi-keystore.bat
+++ bin/create-rmi-keystore.bat
@@ -1,20 +1,20 @@
-@echo off
-
-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.
-rem   The ASF licenses this file to You under the Apache License, Version 2.0
-rem   (the "License"); you may not use this file except in compliance with
-rem   the License.  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.
-rem
-keytool -genkey -keyalg RSA -alias rmi -keystore rmi_keystore.jks -storepass changeit -validity 7 -keysize 2048
-
-echo "Copy the generated rmi_keystore.jks to jmeter/bin folder or reference it in property 'server.rmi.ssl.keystore.file'"
+@echo off
+
+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.
+rem   The ASF licenses this file to You under the Apache License, Version 2.0
+rem   (the "License"); you may not use this file except in compliance with
+rem   the License.  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.
+rem
+keytool -genkey -keyalg RSA -alias rmi -keystore rmi_keystore.jks -storepass changeit -validity 7 -keysize 2048
+
+echo "Copy the generated rmi_keystore.jks to jmeter/bin folder or reference it in property 'server.rmi.ssl.keystore.file'"


tweak to build file

tweak to build file

--- winbuild_mingw_inplace.bat
+++ winbuild_mingw_inplace.bat
@@ -1,6 +1,6 @@
 ::python setup.py build bdist_wheel sdist

-conda activate pscdev
+::conda activate pscdev
 set path=%path%;c:\tools\mingw64\bin

 python setup.py develop


Redisable MSVC testing with new version of compiler

--- tests/Make-check-cl.bat
+++ tests/Make-check-cl.bat
@@ -16,6 +16,10 @@

 echo "Compiler full version:"
 cl /Bv
+
+echo " "
+echo "Disabled tests passed due to wrong errors C4002 C4003 preventing build"
+exit /B 0

 REM Perform for each test
 for %%f in (test-*.c) do (


Improve sbt script on Windows

Improve sbt script on Windows

--- yeoman-generator-skinny/app/templates/sbt.bat
+++ yeoman-generator-skinny/app/templates/sbt.bat
@@ -1,3 +1,3 @@
 set SCRIPT_DIR=%~dp0
-java -Xmx1024M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256M -jar "%SCRIPT_DIR%bin\sbt-launch.jar" %*
+java -Xmx1024M -Xss1M -Dinput.encoding=Cp1252 -Dfile.encoding=SJIS -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256M -jar "%SCRIPT_DIR%bin\sbt-launch.jar" %*


Update file structure

Update file structure

--- src/makeRelease.bat
+++ src/makeRelease.bat
@@ -1,4 +1,9 @@
 set MAKING_PYPARSING_RELEASE=1
+
+copy ../sourceforge/svn/trunk/src/CHANGES .
+copy ../sourceforge/svn/trunk/src/setup.py .
+copy ../sourceforge/svn/trunk/src/pyparsing_py2.py .
+copy ../sourceforge/svn/trunk/src/pyparsing_py3.py .

 if exist pyparsing.py del pyparsing.py
 rmdir build
@@ -12,14 +17,14 @@
 if exist MANIFEST del MANIFEST

 copy/y pyparsing_py2.py pyparsing.py
-python setup.py bdist_wininst --target-version=2.4
-python setup.py bdist_wininst --target-version=2.5
-python setup.py bdist_wininst --target-version=2.6
-python setup.py bdist_wininst --target-version=2.7
+python setup.py bdist_wininst --target-version=2.4 --plat-name=win32
+python setup.py bdist_wininst --target-version=2.5 --plat-name=win32
+python setup.py bdist_wininst --target-version=2.6 --plat-name=win32
+python setup.py bdist_wininst --target-version=2.7 --plat-name=win32

 copy/y pyparsing_py3.py pyparsing.py
-python setup.py bdist_wininst --target-version=3.0
-python setup.py bdist_wininst --target-version=3.1
-python setup.py bdist_wininst --target-version=3.2
+python setup.py bdist_wininst --target-version=3.0 --plat-name=win32
+python setup.py bdist_wininst --target-version=3.1 --plat-name=win32
+python setup.py bdist_wininst --target-version=3.2 --plat-name=win32

-set MAKING_PYPARSING_RELEASE=+set MAKING_PYPARSING_RELEASE=


Fix pickles nunit2 format

Fix pickles nunit2 format

--- src/producedocs.bat
+++ src/producedocs.bat
@@ -5,4 +5,4 @@

 rmdir ..\docs /Q /S
 mkdir ..\docs
-packages\Pickles.CommandLine.2.8.2\tools\pickles.exe --feature-directory ..\features --link-results-file SFA.DAS.Payments.AcceptanceTests\bin\%cfg%\TestResult.xml --test-results-format nunit2 --output-directory ..\docs+packages\Pickles.CommandLine.2.8.2\tools\pickles.exe --feature-directory ..\features --link-results-file SFA.DAS.Payments.AcceptanceTests\bin\%cfg%\TestResult.xml --test-results-format nunit --output-directory ..\docs


Update publishdocs.bat

Update publishdocs.bat

--- src/publishdocs.bat
+++ src/publishdocs.bat
@@ -5,10 +5,10 @@

 xcopy ..\das-payments-AcceptanceTests\AcceptanceTests\docs das-paymentsacceptancetesting /E /R /Y

-git config  user.email "kalim.akbar@fasst.org.uk"
-git config  user.name "das build agent"

 cd das-paymentsacceptancetesting
 git add --all
 git commit -m "Update docs for release %RELEASE_RELEASENAME%"
+git config  user.email "kalim.akbar@fasst.org.uk"
+git config  user.name "das build agent"
 git push origin gh-pages


Fix copy/paste error.

Fix copy/paste error.

--- floppy/disablewinupdate.bat
+++ floppy/disablewinupdate.bat
@@ -10,7 +10,7 @@
 SC config wuauserv start= disabled

 :: Notify before download
-reg add reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v AUOptions /t REG_DWORD /d 2 /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v AUOptions /t REG_DWORD /d 2 /f

 :: turn the whole thing off
 reg add "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate" /v DisableWindowsUpdateAccess /t REG_DWORD /d 1 /f


Delete bpxml.bat

Delete bpxml.bat

--- BuildBot/build_task/bpxml.bat
+++ BuildBot/build_task/bpxml.bat
@@ -1,6 +0,0 @@
-SET _SLN_FILE=%_BUILDBOT_SOLUTION%
-SET _SPD_FILE=%_BUILDBOT_SVN_PATH%\_BinR\KCBPSPD_wlfs.xml
-
-echo %_SLN_FILE%
-echo %_SPD_FILE%
-python %~dp0gen_spd.py "%_SLN_FILE%" "%_SPD_FILE%"


Added usage for deployments to DEV from local desk top.

SVN-Revision: 316

--- software/build/build.cmd
+++ software/build/build.cmd
@@ -12,7 +12,8 @@
     echo   all          -- Normal build of application
     echo   install      -- Build and deploy application
     echo   upgrade      -- Build and upgrade application
-    echo   upgradewdb   -- Builds and upgrades JBoss and Database
+    echo   upgradewdb   -- Builds, upgrades JBoss and Database locally
+    echo   dev          -- Builds, upgrades JBoss and Database on DEV
     echo   deploy       -- Redeploy application
     goto DONE
 )
@@ -48,7 +49,7 @@
     goto DONE
 )
 if "%1" == "dev" (
-    ant -Dproperties.file=C:\SVN-Projects\ncireportwriter-properties\properties\dev-upgrade.properties deploy:remote:upgrade
+    ant -Dproperties.file=C:\SVN-Projects\ncireportwriter-properties\properties\dev-upgrade.properties -Dupgrade.target=upgrade-ncm:with-dbinstall deploy:remote:upgrade
     goto DONE
 )


Hide !errorlevel!

Hide !errorlevel!

--- conda/upload.bat
+++ conda/upload.bat
@@ -42,33 +42,33 @@
 echo ON

 conda install -n root anaconda-client
-:: if !errorlevel! neq 0 (
-::    exit /b !errorlevel!
-:: )
+rem if !errorlevel! neq 0 (
+rem    exit /b !errorlevel!
+rem )

 echo OFF

 echo y|anaconda login --username %ANACONDA_USERNAME% --password %ANACONDA_PASSWORD%
-:: if !errorlevel! neq 0 (
-::     exit /b !errorlevel!
-:: )
+rem if !errorlevel! neq 0 (
+rem     exit /b !errorlevel!
+rem )

 echo ON

 if "%TOOLCHAIN%" == "" (
     git clone https://gist.github.com/c491cb08d570beeba2c417826a50a9c3.git toolchain
-    if !errorlevel! neq 0 (
-        anaconda logout
-        exit /b !errorlevel!
-    )
+    rem if !errorlevel! neq 0 (
+    rem     anaconda logout
+    rem     exit /b !errorlevel!
+    rem )
     cd toolchain
     call config.bat
-    if !errorlevel! neq 0 (
-        cd ..
-        anaconda logout
-        rmdir toolchain /s /q
-        exit /b !errorlevel!
-    )
+    rem if !errorlevel! neq 0 (
+    rem     cd ..
+    rem     anaconda logout
+    rem     rmdir toolchain /s /q
+    rem     exit /b !errorlevel!
+    rem )
     cd ..
     rmdir toolchain /s /q
 )


Add nodebug option to build-nupkg.cmd

Add nodebug option to build-nupkg.cmd

--- build/nuget/build-nupkg.cmd
+++ build/nuget/build-nupkg.cmd
@@ -3,12 +3,15 @@
 REM
 REM Version is read from the VERSION file.
 REM
-REM Command-line parameter specifies either "signed" or a prerelease string to append to the version
+REM Command-line parameter specifies optionally "signed" or "nodebug",
+REM followed by an optional prerelease string to append to the version.
 REM
 REM Say VERSION contains "0.0.3" then:
 REM
 REM build-nupkg                     <-- generates package with version 0.0.3
 REM build-nupkg build-140912-1100   <-- generates package with version 0.0.3-build-140912-1100
+REM
+REM The "nodebug" flag builds only release flavor package, skipping the debug variant.
 REM
 REM The "signed" flag is intended for internal Microsoft use. This generates a
 REM package without a prerelease version number, using a license agreement
@@ -17,6 +20,8 @@
 REM perform signing: the expectation is that previous tooling has already
 REM signed the files and copied them to the right place for it to pick up.
 REM
+
+SETLOCAL

 PUSHD "%~dp0"

@@ -31,21 +36,29 @@
 SET /p VERSION=<VERSION

 IF "%1" == "signed" (
+    SHIFT
+    SET NODEBUG=true
     SET BIN=bin\signed
     SET OUTDIR=..\..\bin\signed
     SET LICENSE_URL=http://www.microsoft.com/web/webpi/eula/eula_win2d_10012014.htm
     SET REQUIRE_LICENSE_ACCEPTANCE=true
 ) else (
-    IF NOT "%1" == "" (
-        SET VERSION=%VERSION%-%1
-    )
     SET BIN=bin
     SET OUTDIR=..\..\bin
     SET LICENSE_URL=http://github.com/Microsoft/Win2D/blob/master/LICENSE.txt
     SET REQUIRE_LICENSE_ACCEPTANCE=false
 )

-if "%OVERRIDE_NUGET_PACKAGE%"  == "" (
+IF "%1" == "nodebug" (
+    SHIFT
+    SET NODEBUG=true
+)
+
+IF NOT "%1" == "" (
+    SET VERSION=%VERSION%-%1
+)
+
+if "%OVERRIDE_NUGET_PACKAGE%" == "" (
     SET NUGET_PACKAGE=Win2D
 ) else (
     ECHO Using OVERRIDE_NUGET_PACKAGE: %OVERRIDE_NUGET_PACKAGE%
@@ -62,7 +75,7 @@
 nuget pack %NUGET_PACKAGE%.nuspec %NUGET_ARGS%
 IF %ERRORLEVEL% NEQ 0 GOTO END

-IF NOT "%1" == "signed" (
+IF NOT "%NODEBUG%" == "true" (
     nuget pack %NUGET_PACKAGE%-debug.nuspec %NUGET_ARGS%
     IF %ERRORLEVEL% NEQ 0 GOTO END
 )


Rollback automático de instalação parcial


[build] changes in windows build script

[build] changes in windows build script

Signed-off-by: R4SAS <dd66bbc3274fed9d783cb8070fec0c287158a4b8@i2pmail.org>

--- build/build_mingw.cmd
+++ build/build_mingw.cmd
@@ -34,12 +34,18 @@

 echo Receiving latest commit and cleaning up...
 %xSH% "git checkout contrib/* && git pull && make clean" > build\build.log 2>&1
-echo.

 REM set to variable current commit hash
-FOR /F "usebackq" %%a IN (`%xSH% 'git describe --tags'`) DO (
+FOR /F "usebackq" %%a IN (`%xSH% "git describe --tags"`) DO (
  set tag=%%a
 )
+
+REM set to variable latest released tag
+FOR /F "usebackq" %%b IN (`%xSH% "git describe --abbrev=0"`) DO (
+ set reltag=%%b
+)
+
+echo Preparing configuration files and README for packaging...

 %xSH% "echo To use configs and certificates, move all files and certificates folder from contrib directory here. > README.txt" >> nul

@@ -64,8 +70,9 @@
 echo.

 REM compile installer
-C:\PROGRA~2\INNOSE~1\ISCC.exe /dI2Pd_TextVer="%tag%" /dI2Pd_Ver="%tag%.0" build\win_installer.iss >> build\build.log 2>&1
+C:\PROGRA~2\INNOSE~1\ISCC.exe /dI2Pd_TextVer="%tag%" /dI2Pd_Ver="%reltag%.0" build\win_installer.iss >> build\build.log 2>&1

+%xSH% "git checkout contrib/*" >> build\build.log 2>&1
 del README.txt i2pd_x32.exe i2pd_x64.exe i2pd_xp.exe >> nul

 echo Build complete...
@@ -74,13 +81,13 @@

 :BUILDING
 %xSH% "make clean" >> nul
-echo Building i2pd %tag% for win%bitness%
+echo Building i2pd %tag% for win%bitness%...
 %xSH% "make DEBUG=no USE_UPNP=yes -j%threads% && cp i2pd.exe i2pd_x%bitness%.exe && zip -r9 build/i2pd_%tag%_win%bitness%_mingw.zip %FILELIST% && make clean" > build\build_win%bitness%_%tag%.log 2>&1
 goto EOF

 :BUILDING_XP
 %xSH% "make clean" >> nul
-echo Building i2pd %tag% for winxp
+echo Building i2pd %tag% for winxp...
 %xSH% "make DEBUG=no USE_UPNP=yes USE_WINXP_FLAGS=yes -j%threads% && cp i2pd.exe i2pd_xp.exe && zip -r9 build/i2pd_%tag%_winxp_mingw.zip %FILELIST% && make clean" > build\build_winxp_%tag%.log 2>&1

 :EOF


project: Update get_dependencies script to uses latest available TLS.

--- SMP/project_get_dependencies.bat
+++ SMP/project_get_dependencies.bat
@@ -102,9 +102,9 @@
 SET UPSTREAMAPIURL=%UPSTREAMURL:github.com=api.github.com/repos%
 REM Check if secure OAuth is available
 IF "%GITHUBTOKEN%" == "" (
-    powershell -nologo -noprofile -command "try { Invoke-RestMethod -Uri %UPSTREAMAPIURL%/%REPONAME%/releases/latest > latest.json } catch {exit 1}"
+    powershell -nologo -noprofile -command "$currentMaxTls = [Math]::Max([Net.ServicePointManager]::SecurityProtocol.value__,[Net.SecurityProtocolType]::Tls.value__);$newTlsTypes = [enum]::GetValues('Net.SecurityProtocolType') | ?{ $_ -gt $currentMaxTls };ForEach ($newTls in $newTlsTypes) { [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor $newTls };try { Invoke-RestMethod -Uri %UPSTREAMAPIURL%/%REPONAME%/releases/latest > latest.json } catch {exit 1}"
 ) ELSE (
-    powershell -nologo -noprofile -command "try { Invoke-RestMethod -Uri %UPSTREAMAPIURL%/%REPONAME%/releases/latest -Headers @{'Authorization' = 'token %GITHUBTOKEN%'} > latest.json } catch {exit 1}"
+    powershell -nologo -noprofile -command "$currentMaxTls = [Math]::Max([Net.ServicePointManager]::SecurityProtocol.value__,[Net.SecurityProtocolType]::Tls.value__);$newTlsTypes = [enum]::GetValues('Net.SecurityProtocolType') | ?{ $_ -gt $currentMaxTls };ForEach ($newTls in $newTlsTypes) { [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor $newTls };try { Invoke-RestMethod -Uri %UPSTREAMAPIURL%/%REPONAME%/releases/latest -Headers @{'Authorization' = 'token %GITHUBTOKEN%'} > latest.json } catch {exit 1}"
 )
 IF ERRORLEVEL 1 ( ECHO Failed getting latest %REPONAME% release & EXIT /B 1 )
 REM Get tag for latest release
@@ -127,7 +127,7 @@
 ECHO %REPONAME%: Downloading %LIBNAME%_%TAG%_msvc%MSVC_VER%.zip...
 SET PREBUILTDIR=prebuilt
 MKDIR %PREBUILTDIR% >NUL 2>&1
-powershell -nologo -noprofile -command "try { (New-Object Net.WebClient).DownloadFile('%DLURL%', '%PREBUILTDIR%\temp.zip') } catch {exit 1}"
+powershell -nologo -noprofile -command "$currentMaxTls = [Math]::Max([Net.ServicePointManager]::SecurityProtocol.value__,[Net.SecurityProtocolType]::Tls.value__);$newTlsTypes = [enum]::GetValues('Net.SecurityProtocolType') | ?{ $_ -gt $currentMaxTls };ForEach ($newTls in $newTlsTypes) { [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor $newTls };try { (New-Object Net.WebClient).DownloadFile('%DLURL%', '%PREBUILTDIR%\temp.zip') } catch {exit 1}"
 IF ERRORLEVEL 1 ( ECHO Failed downloading %DLURL% & EXIT /B 1 )
 powershell -nologo -noprofile -command "Add-Type -AssemblyName System.IO.Compression.FileSystem; $zip=[System.IO.Compression.ZipFile]::OpenRead('%PREBUILTDIR%\temp.zip'); foreach ($item in $zip.Entries) { try {$file=(Join-Path -Path .\%PREBUILTDIR% -ChildPath $item.FullName); $null=[System.IO.Directory]::CreateDirectory((Split-Path -Path $file)); [System.IO.Compression.ZipFileExtensions]::ExtractToFile($item,$file,$true)} catch {exit 1} }"
 IF ERRORLEVEL 1 ( ECHO Failed extracting downloaded archive & EXIT /B 1 )


Update visualsrc/rpwibuild.bat

Update visualsrc/rpwibuild.bat


move to 1423 beta 2.

move to 1423 beta 2.

--- setup_vs_project_variables.bat
+++ setup_vs_project_variables.bat
@@ -5,6 +5,6 @@
 set BOOST_DIR=c:\libraries\boost\boost_1_52_0
 set FREEIMAGELIB_DIR=c:\libraries\FreeImage\%FreeImage_VERSION%
 ::set AIMP_PLUGINS_DIR=%ProgramFiles%\AIMP3\Plugins
-set AIMP_PLUGINS_DIR=c:\AIMP\AIMP3.60.1422_beta2\Plugins
+set AIMP_PLUGINS_DIR=c:\AIMP\AIMP3.60.1423_beta2\Plugins
 set AIMP_CONTROL_SUBPATH=\aimp_control
 ::for API 3.55- it should be set AIMP_CONTROL_SUBPATH=\


Update RingLibUI - Add a batch file to generate the C source code : extensions/ringlibui/gencode.bat

error: pathspec 'extensions/ringlibui/gencode.bat' did not match any file(s) known to git

--- extensions/ringlibui/gencode.bat
+++ extensions/ringlibui/gencode.bat
@@ -0,0 +1 @@
+ring ..\codegen\parsec.ring libui.cf ring_libui.c


changed batch file comment as :: style

changed batch file comment as :: style

changed batch file comment as :: style

--- SQL-Script-2.0.0/install-with-sample.bat
+++ SQL-Script-2.0.0/install-with-sample.bat
@@ -31,7 +31,7 @@
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/uspInsRegMember.sql
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/uspSelAdminLogin.sql
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/uspSelAdminLogout.sql
-REM SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/uspSelCoupons.sql		:: uspSelCoupons is deplicated as business logic in CloudBread 2.0.1 release https://github.com/CloudBreadProject/CloudBread/issues/26
+:: SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/uspSelCoupons.sql		:: uspSelCoupons is deplicated as business logic in CloudBread 2.0.1 release https://github.com/CloudBreadProject/CloudBread/issues/26
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/uspSelGameEvents.sql
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/uspSelGiftItemToMe.sql
 SQLCMD -S %1 -U %2 -P %3 -d %4 -i ./script/uspSelItem1.sql


make directory changes stand out

make directory changes stand out

--- cmd/windows_fmt_pt_test.cmd
+++ cmd/windows_fmt_pt_test.cmd
@@ -3,18 +3,18 @@
 pushd "%~dp0"

 cd "..\src\network"
-echo network
+echo ### network ###
 go fmt
 protoc --go_out=. *.proto
 call :go_test

 cd "..\hashtree"
-echo hashtree
+echo ### hashtree ###
 go fmt
 call :go_test

 cd "..\server"
-echo server
+echo ### server ###
 go fmt
 call :go_test


build: update windows configuration to match new vm

--- .kokoro/test.bat
+++ .kokoro/test.bat
@@ -17,14 +17,12 @@
 cd /d %~dp0
 cd ..

-@rem The image we're currently running has a broken version of Node.js enabled
-@rem by nvm (v10.15.3), which has no npm bin. This hack uses the functional
-@rem Node v8.9.1 to install npm@latest, it then uses this version of npm to
-@rem install npm for v10.15.3.
-call nvm use v8.9.1 || goto :error
-call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm-bootstrap\bin\npm-cli.js i npm -g || goto :error
-call nvm use v10.15.3 || goto :error
-call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm\bin\npm-cli.js i npm -g || goto :error
+@rem npm path is not currently set in our image, we should fix this next time
+@rem we upgrade Node.js in the image:
+SET PATH=%PATH%;/cygdrive/c/Program Files/nodejs/npm
+
+call nvm use v12.14.1
+call which node

 call npm install || goto :error
 call npm run test || goto :error


chore: use latest npm on Windows (#154)

chore: use latest npm on Windows (#154)

--- .kokoro/test.bat
+++ .kokoro/test.bat
@@ -1,4 +1,4 @@
-@rem Copyright 2018 gRPC authors.
+@rem Copyright 2018 Google LLC. All rights reserved.
 @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.
@@ -17,8 +17,7 @@
 cd /d %~dp0
 cd ..

-call npm install -g npm@5 || goto :error
-
+call npm install -g npm@latest || goto :error
 call npm install || goto :error
 call npm run test || goto :error


Fix configure flag

Fix configure flag

--- .appveyor/build_task.cmd
+++ .appveyor/build_task.cmd
@@ -31,7 +31,7 @@

 	if %errorlevel% neq 0 exit /b 3

-	cmd /c configure.bat --disable-all --with-mp=auto --enable-cli --%ZTS_STATE%-zts --with-tideways-xhprof=shared --enable-object-out-dir=%PHP_BUILD_OBJ_DIR% --with-config-file-scan-dir=%APPVEYOR_BUILD_FOLDER%\build\modules.d --with-prefix=%APPVEYOR_BUILD_FOLDER%\build --with-php-build=%DEPS_DIR%
+	cmd /c configure.bat --disable-all --with-mp=auto --enable-cli --%ZTS_STATE%-zts --with-tideways_xhprof=shared --enable-object-out-dir=%PHP_BUILD_OBJ_DIR% --with-config-file-scan-dir=%APPVEYOR_BUILD_FOLDER%\build\modules.d --with-prefix=%APPVEYOR_BUILD_FOLDER%\build --with-php-build=%DEPS_DIR%

 	if %errorlevel% neq 0 exit /b 3


Win: use ps3.8

Win: use ps3.8

--- conda/win/create_bundle.bat
+++ conda/win/create_bundle.bat
@@ -5,7 +5,7 @@

 call conda create ^
  -p %conda_env% ^
- freecad occt=7.5 vtk=9 libredwg calculix gitpython gmsh ^
+ freecad python=3.8 occt=7.5 vtk=9 libredwg calculix gitpython gmsh ^
  numpy matplotlib-base scipy sympy pandas six ^
  pyyaml opencamlib ifcopenshell openglider ^
  freecad.asm3 libredwg pycollada  pythonocc-core ^


Added support for Visual Studio 2019.

Added support for Visual Studio 2019.

--- Batch/vcvars.bat
+++ Batch/vcvars.bat
@@ -14,6 +14,7 @@
 :#   2017-11-24 JFL Added paths for Visual Studio up to 2017.		      *
 :#                  Fixed the display of variables set by the script.         *
 :#   2018-01-10 JFL Added option -X.                           		      *
+:#   2019-05-09 JFL Added support for Visual Studio 2019.		      *
 :#                                                                            *
 :#         Copyright 2018 Hewlett Packard Enterprise Development LP          *
 :# Licensed under the Apache 2.0 license: www.apache.org/licenses/LICENSE-2.0 *
@@ -21,7 +22,7 @@

 setlocal EnableExtensions EnableDelayedExpansion

-set "VERSION=2018-01-10"
+set "VERSION=2019-05-09"
 set "SCRIPT=%~nx0"
 set "ARG0=%~f0"
 set "RETURN=goto :eof"
@@ -33,12 +34,15 @@

 :findvs
 set "PGM32=%ProgramFiles(x86)%"
-if "%PGM32%"=="" set "PGM32=%ProgramFiles%"
-if "%PGM32%"=="" echo>&2 Error: Can't find 32-bits Program Files directory & exit /b 1
+if not defined PGM32 set "PGM32=%ProgramFiles%"
+if not defined PGM32 echo>&2 Error: Can't find 32-bits Program Files directory & exit /b 1
 set "VSTUDIOS="
-for %%s in ("\2017" " 14.0" " 12.0" " 11.0" " 10.0" " 9.0" " 8" " .NET 2003" " .NET" "") do @(
+for %%s in ("\2019" "\2017" " 14.0" " 12.0" " 11.0" " 10.0" " 9.0" " 8" " .NET 2003" " .NET" "") do @(
   set "VSTUDIO=%PGM32%\Microsoft Visual Studio%%~s"
-  if exist "!VSTUDIO!" set VSTUDIOS=!VSTUDIOS! "!VSTUDIO!"
+  if exist "!VSTUDIO!" (
+    %ECHO.V% :# VSTUDIO dir "!VSTUDIO!"
+    set VSTUDIOS=!VSTUDIOS! "!VSTUDIO!"
+  )
 )
 %RETURN%

@@ -48,15 +52,21 @@
 :findvc32
 call :findvs
 for %%s in (%VSTUDIOS%) do @(
-  for %%c in ("VC" "VC7" "VC98") do @(
-    if exist "%%~s\%%~c\bin" (
-      set "VSTUDIO=%%~s"
-      set "MSVC32=%%~s\%%~c"
-      goto foundvc32
+  for %%c in ("Enterprise\VC" "Professional\VC" "Community\VC" "Preview\VC" "VC" "VC7" "VC98") do @(
+    for %%p in ("\Auxiliary\Build" "") do (
+      %ECHO.V% :# Searching vcvarsall.bat in "%%~s\%%~c%%~p"
+      if exist "%%~s\%%~c%%~p\vcvarsall.bat" (
+        set "VSTUDIO=%%~s"
+        set "VC=%%~s\%%~c"
+        set "VCVARSDIR=%%~s\%%~c%%~p"
+        goto foundvc32
+      )
     )
   )
 )
 :foundvc32
+%ECHO.V% :# Found "%VCVARSDIR%\vcvarsall.bat"
+%ECHOVARS.V% VSTUDIO VC
 %RETURN%

 :#-----------------------------------------------------------------------------
@@ -82,7 +92,7 @@

 :echo.msvcvars
 echo :# Environment variables used or set by Visual C++' script
-call :echo.vars DevEnvDir FrameworkDir FrameworkVersion INCLUDE LIB LIBPATH PATH VCINSTALLDIR VSINSTALLDIR WindowsSdkDir
+call :echovars.v DevEnvDir FrameworkDir FrameworkVersion INCLUDE LIB LIBPATH PATH VCINSTALLDIR VSINSTALLDIR WindowsSdkDir
 goto :eof

 :#-----------------------------------------------------------------------------
@@ -125,14 +135,14 @@
 :exec_cmd
 set "VCINSTALLDIR="
 call :findvc32
-if exist "%MSVC32%\vcvarsall.bat" call "%MSVC32%\vcvarsall.bat" %ARCHI%
+if exist "%VCVARSDIR%\vcvarsall.bat" call "%VCVARSDIR%\vcvarsall.bat" %ARCHI%
 if "%VCINSTALLDIR%"=="" (
   >&2 echo Error: Cannot find Visual C++
   endlocal
   exit /b 1
 )
-%ECHO.VARS%
-%1 %2 %3 %4 %5 %6 %7 %8 %9
+%ECHOVARS.V% %*
+%*
 %RETURN%

 :#-----------------------------------------------------------------------------
@@ -140,8 +150,9 @@
 :# %* = Command line arguments

 :main
+set "ECHOVARS=call :echo.vars"
 set "ECHO.V=rem"
-set "ECHO.VARS=rem"
+set "ECHOVARS.V=rem"
 set "ECHO.MSVCVARS=rem"
 set "ARCHI="
 set "NOEXEC=0"
@@ -154,7 +165,7 @@
 if .%1.==.-?. goto help
 if .%1.==./?. goto help
 if .%1.==.-h. goto help
-if .%1.==.-v. set "ECHO.V=call :echo" & set "ECHO.VARS=call :echo.vars" & set "ECHO.MSVCVARS=call :echo.msvcvars" & goto next_arg
+if .%1.==.-v. set "ECHO.V=call :echo" & set "ECHOVARS.V=call :echo.vars" & set "ECHO.MSVCVARS=call :echo.msvcvars" & goto next_arg
 if .%1.==.-V. echo %VERSION% & exit /b 0
 if .%1.==.-x. shift & goto exec_cmd
 if .%1.==.-X. set "NOEXEC=1" & goto next_arg
@@ -168,21 +179,29 @@
 call :findvc32

 %ECHO.V% :# Predefined context variables
-%ECHO.VARS% PROCESSOR_ARCHITECTURE
+%ECHOVARS.V% PROCESSOR_ARCHITECTURE
 %ECHO.V%

 %ECHO.V% :# Environment variables used or set by this script
-%ECHO.VARS% VSTUDIOS VSTUDIO MSVC32
+%ECHOVARS.V% VSTUDIOS VSTUDIO VC VCVARSDIR
 %ECHO.V%

 :# Find and execute the corresponding vcvars.bat script
 :# vcvarsall.bat $1=%PROCESSOR_ARCHITECTURE%, optional, default=x86
-if not exist "%MSVC32%\vcvarsall.bat" (
+if not exist "%VCVARSDIR%\vcvarsall.bat" (
   >&2 echo Error: Could not find a vcvarsall.bat script
   exit /b 1
 )
+
+:# Visual Studio 2017 and later require the ARCHI parameter
+if not "%VCVARSDIR%"=="%VC%" if "%ARCHI%"=="" set "ARCHI=x86"
+
+:# Generate the final command
+set CMD=call "%VCVARSDIR%\vcvarsall.bat" %ARCHI%
 if "%NOEXEC%"=="1" (
-  echo call "%MSVC32%\vcvarsall.bat" %ARCHI%
+  echo %CMD%
   exit /b 0
-)
-endlocal & call "%MSVC32%\vcvarsall.bat" %ARCHI% & %ECHO.MSVCVARS%
+) else (
+  %ECHO.V% %CMD%
+)
+endlocal & %CMD% & %ECHO.MSVCVARS%


Improved build script

Improved build script

--- src/NSwag.AspNetCore/build.bat
+++ src/NSwag.AspNetCore/build.bat
@@ -1 +1,2 @@
+dotnet restore
 dotnet pack --output Output --configuration Release


added reset file for online shopping

added reset file for online shopping

error: pathspec 'files/for_test/SUTs_configuration/onlineshopping_reset.bat' did not match any file(s) known to git

--- files/for_test/SUTs_configuration/onlineshopping_reset.bat
+++ files/for_test/SUTs_configuration/onlineshopping_reset.bat
@@ -0,0 +1 @@
+java -cp ..\onlineshoppingsut\bin;..\onlineshoppingsut\bin\* ResetDB


Used newer MSBuild

Used newer MSBuild

--- NuPack.bat
+++ NuPack.bat
@@ -5,7 +5,7 @@
 set TARGET_DIR=%~dp0
 set TARGET_VERSION=5.1.1

-set MSBUILD=%SystemRoot%\Microsoft.NET\Framework64\v4.0.30319\MSBuild.exe
+set MSBUILD=%ProgramFiles(x86)%\MSBuild\14.0\Bin\MsBuild.exe
 set NUGET=%TARGET_DIR%.nuget\NuGet.exe

 %ECHO% "%MSBUILD%" "%TARGET_DIR%%TARGET%.sln" /t:Rebuild /p:Configuration=Release


Neo4jImport.bat gathers jars from correct paths

to fit all packaging alternatives. Previously this scripts couldn't be run
with any success in the neo4j desktop packaging and the other packaging
alternatives complained about one missing path.

--- packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4jImport.bat
+++ packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4jImport.bat
@@ -70,10 +70,20 @@

 rem Setup the classpath
 set LIBPATH=""
+:GATHER_LIBPATH_1
+IF NOT EXIST %REPO% GOTO GATHER_LIBPATH_2
 pushd "%REPO%"
 for %%G in (*.jar) do call:APPEND_TO_LIBPATH %%G
 popd
-set REPO=%BASEDIR%\system\coordinator\lib
+:GATHER_LIBPATH_2
+set REPO=%BASEDIR%\system\lib
+IF NOT EXIST %REPO% GOTO GATHER_LIBPATH_3
+pushd "%REPO%"
+for %%G in (*.jar) do call:APPEND_TO_LIBPATH %%G
+popd
+:GATHER_LIBPATH_3
+set REPO=%BASEDIR%\bin
+IF NOT EXIST %REPO% GOTO LIBPATH_END
 pushd "%REPO%"
 for %%G in (*.jar) do call:APPEND_TO_LIBPATH %%G
 popd
@@ -121,4 +131,4 @@
   if %ERROR_CODE% NEQ 0 exit %ERROR_CODE%
 )

-exit /B %ERROR_CODE%
+exit /B %ERROR_CODE%


fix verification entry

fix verification entry

--- src/update.cmd
+++ src/update.cmd
@@ -56,8 +56,8 @@
 %SN32% -Vr FSharp.ProjectSystem.FSharp,b03f5f7f11d50a3a
 %SN32% -Vr FSharp.ProjectSystem.PropertyPages,b03f5f7f11d50a3a
 %SN32% -Vr FSharp.VS.FSI,b03f5f7f11d50a3a
-%SN32% -Vr Unittests,b03f5f7f11d50a3a
-%SN32% -Vr Salsa,b03f5f7f11d50a3a
+%SN32% -Vr VisualFSharp.Unittests,b03f5f7f11d50a3a
+%SN32% -Vr VisualFSharp.Salsa,b03f5f7f11d50a3a

 if /i "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
     %SN64% -Vr FSharp.Core,b03f5f7f11d50a3a


Remove nuget script again

Remove nuget script again

--- EEPhysics/nuget_pack.bat
+++ EEPhysics/nuget_pack.bat
@@ -1 +0,0 @@
-nuget pack -sym EEPhysics.csproj -Prop Configuration=Release


Added parameter validation

Added parameter validation

--- Log/A_RunETL.bat
+++ Log/A_RunETL.bat
@@ -1,6 +1,14 @@
 @echo off
 IF [%1] == [] GOTO USAGE
-schtasks /Query /FO list /V FOR /F "tokens=2 DELIMS=:" %%f in ('findstr /RC:"^Task To Run"') do @FOR /F "tokens=* delims= " %%a in ('@echo %%f') do @echo %%a | FOR /F "tokens=*" %%b in ('find "%1"') do @call %%b
+
+REM Sanity check
+echo %1 | findstr /r "\<[a-Z0123456789][a-Z0123456789][a-Z0123456789][a-Z0123456789]-[a-Z0123456789][a-Z0123456789][a-Z0123456789][a-Z0123456789]\>"
+IF %ERRORLEVEL% NEQ 0 (
+  echo Invalid Dataset4x4
+  exit /B 1
+)
+
+schtasks /Query /FO list /V | FOR /F "tokens=2 DELIMS=:" %%f in ('findstr /RC:"^Task To Run"') do @FOR /F "tokens=* delims= " %%a in ('@echo %%f') do @echo %%a | FOR /F "tokens=*" %%b in ('find "%1"') do @call %%b
 exit /B

 :USAGE


fixed building script issue

fixed building script issue

git-svn-id: 264d93eb9283b6a3bfed80dd266caeb8f93e7ca3@72018 81fbe566-5dc4-48c1-bdea-7421811ca204

--- mainline/Build.bat
+++ mainline/Build.bat
@@ -10,6 +10,10 @@

 %msbuild% SuperWebSocket\SuperWebSocket.csproj /p:Configuration=Release /t:Rebuild /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=..\superwebsocket.snk /p:OutputPath=..\bin\Net40

+FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
+
 %msbuild% SuperWebSocket\SuperWebSocket.NET35.csproj  /p:Configuration=Release /t:Rebuild /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=..\superwebsocket.snk /p:OutputPath=..\bin\Net35

+FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
+
 pause


0.9.0

--- Scripts/buildpackpush.bat
+++ Scripts/buildpackpush.bat
@@ -4,9 +4,14 @@
 SET NUGET=.\..\tools\nuget\nuget.exe

 CALL buildpack %VERSION%
+ECHO buildpack done
 %NUGET% push .\..\Release\Mapsui.%VERSION%.nupkg
+ECHO nuget push done
 git commit -m %VERSION% -a
+ECHO git commit done
 git tag %VERSION%
+ECHO git tag done
 git push
+ECHO git push done


0.10.3

--- Scripts/buildpackpush.bat
+++ Scripts/buildpackpush.bat
@@ -1,11 +1,11 @@
 @ECHO OFF
 SETLOCAL
 SET VERSION=%1
-SET NUGET=.\..\tools\nuget\nuget.exe
+SET NUGET=.\tools\nuget\nuget.exe

-CALL buildpack %VERSION%
+CALL Scripts\buildpack %VERSION%
 ECHO buildpack done
-%NUGET% push .\..\Release\Mapsui.%VERSION%.nupkg -source nuget.org
+%NUGET% push .\Release\Mapsui.%VERSION%.nupkg -source nuget.org
 ECHO nuget push done
 git commit -m %VERSION% -a
 ECHO git commit done


rework the buildtree script

rework the buildtree script

--- bin/phpsdk_buildtree.bat
+++ bin/phpsdk_buildtree.bat
@@ -4,14 +4,27 @@
 IF "%2" NEQ ""   SET _=%2\%1
 IF "%2" EQU ""   SET _=%CD%\%1

-rem TODO rewrite this script to handle more intelligently, creating dirs for only the branch matching current env
+rem if we're in the starter script shell, create the only struct that corresponds to the current env
+rem otherwise - retain the old behavior, create structs for all the known build combinations and don't cd

-MD %_%\vc14\x86\deps\bin
-MD %_%\vc14\x86\deps\lib
-MD %_%\vc14\x86\deps\include
-MD %_%\vc14\x64\deps\bin
-MD %_%\vc14\x64\deps\lib
-MD %_%\vc14\x64\deps\include
+if "%PHP_SDK_ARCH%" NEQ "" (
+	if "%PHP_SDK_VC%" NEQ "" (
+		MD %_%\%PHP_SDK_VC%\%PHP_SDK_ARCH%\deps\bin
+		MD %_%\%PHP_SDK_VC%\%PHP_SDK_ARCH%\deps\lib
+		MD %_%\%PHP_SDK_VC%\%PHP_SDK_ARCH%\deps\include
+		cd %_%\%PHP_SDK_VC%\%PHP_SDK_ARCH%
+		goto exit
+	)
+	goto create_all
+) else (
+:create_all
+	MD %_%\vc14\x86\deps\bin
+	MD %_%\vc14\x86\deps\lib
+	MD %_%\vc14\x86\deps\include
+	MD %_%\vc14\x64\deps\bin
+	MD %_%\vc14\x64\deps\lib
+	MD %_%\vc14\x64\deps\include
+)

 GOTO EXIT


Make it possible to run the 'benchmark suite1' on Windows, by translating
the bash script 'run' to a Windows batch script, 'run.bat'.

The Windows variant differs from the bash script on a couple of points:

- It doesn't 'tee' the output to a results.txt file, because I've found
  no portable way to do this on Windows.  Of course, the output of running
  'run.bat' can always be redirected to a file.

- The test 100x1 has been reduced to 25x1, to avoid running into the
  maximum path length limitation on Windows (max. 256 characters).  Maybe
  someone else can find a way to make this work (needs support in
  benchmark.py).

* tools/dev/benchmarks/suite1/run.bat: New file, translation of 'run' into
   a Windows batch script.

error: pathspec 'tools/dev/benchmarks/suite1/run.bat' did not match any file(s) known to git

--- tools/dev/benchmarks/suite1/run.bat
+++ tools/dev/benchmarks/suite1/run.bat
@@ -0,0 +1,101 @@
+:: Licensed to the Apache Software Foundation (ASF) under one
+:: or more contributor license agreements.  See the NOTICE file
+:: distributed with this work for additional information
+:: regarding copyright ownership.  The ASF licenses this file
+:: to you under the Apache License, Version 2.0 (the
+:: "License"); you may not use this file except in compliance
+:: with the License.  You may obtain a copy of the License at
+::
+::   http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing,
+:: software distributed under the License is distributed on an
+:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+:: KIND, either express or implied.  See the License for the
+:: specific language governing permissions and limitations
+:: under the License.
+
+@ECHO OFF
+SETLOCAL EnableDelayedExpansion
+
+:: Where are the svn binaries you want to benchmark?
+SET SVN_1_6=C:\path\to\1.6-svn\bin\svn
+SET SVN_trunk=C:\path\to\trunk-svn\bin\svn
+
+SET benchmark=%CD%\benchmark.py
+
+SET my_datetime=%date%-%time%
+SET my_datetime=%my_datetime: =_%
+SET my_datetime=%my_datetime:/=_%
+SET my_datetime=%my_datetime::=%
+SET my_datetime=%my_datetime:.=%
+SET my_datetime=%my_datetime:,=%
+SET parent=%my_datetime%
+SET inital_workdir=%CD%
+mkdir "%parent%"
+cd "%parent%"
+ECHO %CD%
+
+GOTO main
+
+:batch
+  SET levels=%1
+  SET spread=%2
+  SET N=%3
+  SET pre=%levels%x%spread%_
+  ECHO.
+  ECHO.---------------------------------------------------------------------
+  ECHO.
+  ECHO.Results for dir levels: %levels%  spread: %spread%
+  CALL "%benchmark%" --svn="%SVN_1_6%" run %pre%1.6 %levels% %spread% %N% > NUL
+  CALL "%benchmark%" --svn="%SVN_trunk%" run %pre%trunk %levels% %spread% %N% > NUL
+  CALL "%benchmark%" compare %pre%1.6 %pre%trunk
+  GOTO :EOF
+
+:main
+SET N=6
+SET al=5
+SET as=5
+SET bl=25
+SET bs=1
+SET cl=1
+SET cs=100
+
+::::DEBUG
+::SET N=1
+::SET al=1
+::SET as=1
+::SET bl=2
+::SET bs=1
+::SET cl=1
+::SET cs=2
+::::DEBUG
+
+SET started=%date%-%time%
+ECHO.Started at %started%
+ECHO.
+
+CALL :batch %al% %as% %N%
+CALL :batch %bl% %bs% %N%
+CALL :batch %cl% %cs% %N%
+
+ECHO.
+ECHO.=========================================================================
+ECHO.
+FOR %%F IN (*x*_1.6) DO SET all_1.6=!all_1.6! %%F
+CALL "%benchmark%" combine total_1.6 %all_1.6% > NUL
+FOR %%F IN (*x*_trunk) DO SET all_trunk=!all_trunk! %%F
+CALL "%benchmark%" combine total_trunk %all_trunk% > NUL
+
+ECHO.comparing averaged totals..."
+CALL "%benchmark%" compare total_1.6 total_trunk
+
+ECHO.
+ECHO.Had started at %started%,
+ECHO.       done at %date%-%time%
+ECHO %CD%
+
+cd "%inital_workdir%"
+IF EXIST %parent%\total_trunk rmdir /S /Q "%parent%"
+
+ENDLOCAL


Typo. Fixes 3230bae7

Typo. Fixes 3230bae7

--- buildscript/modules/dist.cmd
+++ buildscript/modules/dist.cmd
@@ -48,7 +48,7 @@
 @MD %abi%

 :mesondist
-@IF EXIST %devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\MesaOpenCL-1.dll REN %%devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\MesaOpenCL-1.dll MesaOpenCL.dll
+@IF EXIST %devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\MesaOpenCL-1.dll REN %devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\MesaOpenCL-1.dll MesaOpenCL.dll
 @IF EXIST %devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\OpenCL-1.dll REN %devroot%\mesa\build\%toolchain%-%abi%\src\gallium\targets\opencl\OpenCL-1.dll OpenCL.dll

 @IF %dualosmesa% EQU 1 forfiles /p %devroot%\mesa\build\%toolchain%-%abi%\src /s /m *.dll /c "cmd /c IF NOT @file==0x22osmesa.dll0x22 copy @path %devroot%\%projectname%\bin\%abi%"


fix azure deploy

fix azure deploy

--- deploy-azure.cmd
+++ deploy-azure.cmd
@@ -1,3 +1,4 @@
+call ng build -prod --sourcemaps false --delete-output-path true
 robocopy dist ../gb-grocery-iis /MIR /XD .git
 ping 127.0.0.1 -n 6 > nul
 pushd ..\gb-grocery-iis


Switched to use 64-bit version of MsBuild

--- WebsitePanel/deploy-debug.bat
+++ WebsitePanel/deploy-debug.bat
@@ -1 +1 @@
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.xml /target:Deploy /property:BuildConfiguration=Debug /v:n /fileLogger
+%windir%\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe build.xml /target:Deploy /property:BuildConfiguration=Debug /v:n /fileLogger


Delete vagrant-ssh

Delete vagrant-ssh

--- vagrant-ssh.bat
+++ vagrant-ssh.bat
@@ -1 +0,0 @@
-ssh -t serverpilot@192.168.56.101 "cd /srv/users/serverpilot/apps/0website ; bash"


commit on 11/06/2018 at 15:46:52

commit on 11/06/2018 at 15:46:52


git-svn-id: svn://scm.gforge.inria.fr/svn/openvibe@108 c330d7e9-fc0c-0410-a5b3-fd85c6f5aa8f

--- scripts/win32-test.cmd
+++ scripts/win32-test.cmd
@@ -5,4 +5,4 @@

 cd ..\dist\bin
 set PATH=..\lib;%PATH%
-OpenViBE-authoring-tool-dynamic.exe
+OpenViBE-designer-dynamic.exe


Refactored build script

Refactored build script

--- Build/Build.cmd
+++ Build/Build.cmd
@@ -1,33 +1,28 @@
 @echo on
 call "%VS110COMNTOOLS%vsvars32.bat"

+REM Portable project
 msbuild.exe /ToolsVersion:4.0 "..\Espera\Espera.sln" /p:configuration=Release

-set ReleaseDirPortable=..\Release\Portable
+set ReleaseDir=..\Release\
+
+REM Cleanup before we create and copy everything
+rmdir %ReleaseDir% /s /q
+
+set ReleaseDirPortable=%ReleaseDir%Portable\
 mkdir %ReleaseDirPortable%

-set bin=..\Espera\Espera.View\bin\Release
+set bin=..\Espera\Espera.View\bin\Release\

-copy %bin%\Caliburn.Micro.dll %ReleaseDirPortable%\Caliburn.Micro.dll
-copy %bin%\Espera.Core.dll %ReleaseDirPortable%\Espera.Core.dll
-copy %bin%\Espera.exe %ReleaseDirPortable%\Espera.exe
-copy %bin%\Espera.exe.config .%ReleaseDirPortable%\Espera.exe.config
-copy %bin%\Google.GData.Client.dll %ReleaseDirPortable%\Google.GData.Client.dll
-copy %bin%\Google.GData.Extensions.dll %ReleaseDirPortable%\Google.GData.Extensions.dll
-copy %bin%\Google.GData.YouTube.dll %ReleaseDirPortable%\Google.GData.YouTube.dll
-copy %bin%\MahApps.Metro.dll %ReleaseDirPortable%\MahApps.Metro.dll
-copy %bin%\MoreLinq.dll %ReleaseDirPortable%\MoreLinq.dll
-copy %bin%\NAudio.dll %ReleaseDirPortable%\NAudio.dll
-copy %bin%\Rareform.dll %ReleaseDirPortable%\Rareform.dll
-copy %bin%\System.Windows.Interactivity.dll %ReleaseDirPortable%\System.Windows.Interactivity.dll
-copy %bin%\taglib-sharp.dll %ReleaseDirPortable%\taglib-sharp.dll
-copy %bin%\YoutubeExtractor.dll %ReleaseDirPortable%\YoutubeExtractor.dll
+copy %bin%*.dll %ReleaseDirPortable%
+copy %bin%Espera.exe %ReleaseDirPortable%
+copy %bin%Espera.exe.config %ReleaseDirPortable%
+copy ..\Changelog.txt %ReleaseDirPortable%

-copy ..\Changelog.txt %ReleaseDirPortable%\Changelog.txt
-
+REM ClickOnce project
 msbuild.exe /target:publish /p:configuration=Release ..\Espera\Espera.sln"

-set ReleaseDirSetup=..\Release\Setup
+set ReleaseDirSetup=%ReleaseDir%Setup\
 mkdir %ReleaseDirSetup%

 xcopy /S /Y %bin%\app.publish %ReleaseDirSetup%


Update video_to_gif.bat

Update video_to_gif.bat

now it checks to make sure nothing is wrong with the values

--- video_to_gif.bat
+++ video_to_gif.bat
@@ -34,13 +34,19 @@
   if [%2]==[] (
     set start_time=%start_second%
   ) else (
-    set start_time=%2
+    set start_time=[%2]
   )

   if [%3]==[] (
     set /a duration=%start_time% + %end_gif%
   ) else (
     set /a duration=%3 - %start_time%
+	if [%2] GEQ [%3] (
+	  echo.
+	  echo Error: Something has gone wrong with the numbers that were entered.
+	  echo Please make sure that the first one is smaller than the second one.
+	  goto:eof
+	)
   )

   echo Creating GIF, please wait.


'#' is not a valid comment in windows batch files

--- templates/windows-2008R2-serverstandard-amd64-winrm/install-vbox.bat
+++ templates/windows-2008R2-serverstandard-amd64-winrm/install-vbox.bat
@@ -1,4 +1,2 @@
-# with this, we can open the iso, and extract the VBoxWindowsAdditions.exe!
-# http://downloads.sourceforge.net/sevenzip/7z920.exe
 cmd /c certutil -addstore -f "TrustedPublisher" a:oracle-cert.cer
 cmd /c e:\VBoxWindowsAdditions-amd64.exe /S


Include RdlEngineConfig.Linux in the x86 release build.

--- Release-Builds/build-fyi-release-dot-net-4.bat
+++ Release-Builds/build-fyi-release-dot-net-4.bat
@@ -83,6 +83,7 @@
 copy "..\References\dot net 4\32bit\System.Data.SQLite.dll" .\my-fyi-build-dot-net-4-x86\System.Data.SQLite.dll /Y
 copy "..\References\dot net 4\itextsharp.dll" .\my-fyi-build-dot-net-4-x86\itextsharp.dll /Y
 copy ..\RdlEngine\bin\x86\Release\RdlEngineConfig.xml .\my-fyi-build-dot-net-4-x86\RdlEngineConfig.xml /Y
+copy ..\RdlEngine\bin\x86\Release\RdlEngineConfig.Linux.xml .\my-fyi-build-dot-net-4-x86\RdlEngineConfig.Linux.xml /Y
 copy ..\RdlMapFile\bin\x86\Release\RdlMapFile.exe .\my-fyi-build-dot-net-4-x86\RdlMapFile.exe /Y
 copy ..\RdlViewer\bin\x86\Release\RdlViewer.dll .\my-fyi-build-dot-net-4-x86\RdlViewer.dll /Y
 copy ..\RdlViewer\RdlReader\bin\x86\Release\RdlReader.exe .\my-fyi-build-dot-net-4-x86\RdlReader.exe /Y


start.bat

start.bat

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

--- projects/start.bat
+++ projects/start.bat
@@ -0,0 +1,7 @@
+genie.exe --static-plugins vs2019
+
+set devenv_cmd=devenv.exe
+where /q devenv.exe
+if not %errorlevel%==0 set devenv_cmd="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv.exe"
+
+start "" %devenv_cmd% "tmp/vs2019/LumixEngine.sln"


Allowed the top-level script to compile and build the packages.

--- Build.Packages.bat
+++ Build.Packages.bat
@@ -1,2 +1,2 @@
 @echo off
-powershell -NoProfile -ExecutionPolicy unrestricted -Command ".\Build\psake.ps1 .\Build\default.ps1 +powershell -NoProfile -ExecutionPolicy unrestricted -Command ".\build.ps1"


#32 : For InstallerProjects.vsix

#32 : For InstallerProjects.vsix

--- build/build_win32_svr.bat
+++ build/build_win32_svr.bat
@@ -45,7 +45,13 @@
 echo Initializing...
 if exist server rmdir /S /Q server
 if exist deployment\YaizuSample.msi del deployment\YaizuSample.msi
-
+if defined GITHUBACTIONS (
+  echo $vsixPath = ".\InstallerProjects.vsix">InstallerProjects.ps1
+  echo ^(new-object net.webclient^).DownloadFile^('https://visualstudioproductteam.gallerycdn.vsassets.io/extensions/visualstudioproductteam/microsoftvisualstudio2017installerprojects/0.8.5/1517363289019/InstallerProjects.vsix', $vsixPath^)>>InstallerProjects.ps1
+  echo "`"C:\Program Files ^(x86^)\Microsoft Visual Studio\2017\Community\Common7\IDE\VSIXInstaller.exe`" /q /a $vsixPath" ^| out-file ".\install-vsix.cmd" -Encoding ASCII>>InstallerProjects.ps1
+  echo ^& .\install-vsix.cmd>>InstallerProjects.ps1
+  powershell -ExecutionPolicy RemoteSigned -File InstallerProjects.ps1
+)

 rem ########## Building ##########
 echo;


[DR-1302] Add a simple script to update and build WebApp

This script will be used in Andres' environment to automatize package generation for Production environment.

Example: `build-webapp PROD`

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

--- build-webapp.cmd
+++ build-webapp.cmd
@@ -0,0 +1,10 @@
+@echo off
+SET originalDir=%cd%
+SET baseDir=%~dp0
+CD %baseDir%
+CD src
+RD build /S /Q
+call yarn
+SET NODE_ENV=%1
+call gulp build
+CD %originalDir%


build: update windows configuration to match new vm

--- .kokoro/test.bat
+++ .kokoro/test.bat
@@ -17,14 +17,12 @@
 cd /d %~dp0
 cd ..

-@rem The image we're currently running has a broken version of Node.js enabled
-@rem by nvm (v10.15.3), which has no npm bin. This hack uses the functional
-@rem Node v8.9.1 to install npm@latest, it then uses this version of npm to
-@rem install npm for v10.15.3.
-call nvm use v8.9.1 || goto :error
-call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm-bootstrap\bin\npm-cli.js i npm -g || goto :error
-call nvm use v10.15.3 || goto :error
-call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm\bin\npm-cli.js i npm -g || goto :error
+@rem npm path is not currently set in our image, we should fix this next time
+@rem we upgrade Node.js in the image:
+SET PATH=%PATH%;/cygdrive/c/Program Files/nodejs/npm
+
+call nvm use v12.14.1
+call which node

 call npm install || goto :error
 call npm run test || goto :error


chore(build): use the latest npm on windows for tests (#304)

--- .kokoro/test.bat
+++ .kokoro/test.bat
@@ -17,8 +17,7 @@
 cd /d %~dp0
 cd ..

-call npm install -g npm@5 || goto :error
-
+call npm install -g npm@latest || goto :error
 call npm install || goto :error
 call npm run test || goto :error


build: patch Windows container, fixing Node 10 (#97)

--- .kokoro/test.bat
+++ .kokoro/test.bat
@@ -17,7 +17,15 @@
 cd /d %~dp0
 cd ..

-call npm install -g npm@latest || goto :error
+@rem The image we're currently running has a broken version of Node.js enabled
+@rem by nvm (v10.15.3), which has no npm bin. This hack uses the functional
+@rem Node v8.9.1 to install npm@latest, it then uses this version of npm to
+@rem install npm for v10.15.3.
+call nvm use v8.9.1 || goto :error
+call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm-bootstrap\bin\npm-cli.js i npm -g || goto :error
+call nvm use v10.15.3 || goto :error
+call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm\bin\npm-cli.js i npm -g || goto :error
+
 call npm install || goto :error
 call npm run test || goto :error


Create ci.cmd

Create ci.cmd

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

--- ci.cmd
+++ ci.cmd
@@ -0,0 +1,9 @@
+@echo off
+if exist node_modules (rmdir /s /q node_modules)
+if %errorlevel% neq 0 exit /b %errorlevel%
+powershell -c "$source = 'https://raw.githubusercontent.com/makiolo/cmaki/master/bootstrap.cmd'; $dest = $env:TEMP + '\bootstrap.cmd'; $WebClient = New-Object System.Net.WebClient; $WebClient.DownloadFile($source,$dest); Invoke-Expression $dest"
+if %errorlevel% neq 0 exit /b %errorlevel%
+call node_modules\cmaki\install.cmd
+if %errorlevel% neq 0 exit /b %errorlevel%
+call node_modules\cmaki\tests.cmd
+if %errorlevel% neq 0 exit /b %errorlevel%


AppVeyor: attempt at fixing npm upgrade

AppVeyor: attempt at fixing npm upgrade

--- scripts/build-appveyor.bat
+++ scripts/build-appveyor.bat
@@ -100,10 +100,9 @@
 ECHO elevating powershell script execution
 powershell Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-ECHO installing npm-windows-upgrade... && CALL npm install -g npm-windows-upgrade
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
-ECHO upgrading npm... && CALL npm-windows-upgrade --version:latest --no-dns-check --no-prompt
+ECHO installing npm-windows-upgrade... && CALL npm install -g npm-windows-upgrade@0.5.3
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+ECHO upgrading npm... && CALL npm-windows-upgrade --version:3.3.2 --no-dns-check --no-prompt
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR


added build script for .NET 45

added build script for .NET 45

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

--- Build.Net45.bat
+++ Build.Net45.bat
@@ -0,0 +1,19 @@
+@echo off
+
+set fdir=%WINDIR%\Microsoft.NET\Framework64
+
+if not exist %fdir% (
+	set fdir=%WINDIR%\Microsoft.NET\Framework
+)
+
+set msbuild=%fdir%\v4.0.30319\msbuild.exe
+
+%msbuild% SuperWebSocket\SuperWebSocket.NET45.csproj /p:Configuration=Release /t:Rebuild /p:OutputPath=..\bin\Net45\Release
+
+FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
+
+%msbuild% SuperWebSocket\SuperWebSocket.NET45.csproj /p:Configuration=Debug /t:Rebuild /p:OutputPath=..\bin\Net45\Debug
+
+FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
+
+pause


Do not pause in build script

Do not pause in build script

Appveyor does not support this

--- Build/build.bat
+++ Build/build.bat
@@ -7,6 +7,4 @@
 call %ROOT%\Build\build-tests.bat
 call %ROOT%\Build\run-tests.bat
 call %ROOT%\Build\pack-nuget.bat
-call %ROOT%\Build\zip-artifacts.bat
-
-pause+call %ROOT%\Build\zip-artifacts.bat


Escape dir separators in mingw/msys profile script so shell is happy again.

git-svn-id: 38cedb3a26441909d4c4a02637a61d2c70533dbc@16952 55e972cd-5a19-0410-ae62-a4d7a52db4cd


Fix post-install write of Conda channels

--- .miniconda-recipe/post-install.bat
+++ .miniconda-recipe/post-install.bat
@@ -1,4 +1,4 @@
-call Scripts\activate.bat & python -c "import yaml; with open('.condarc', 'w') as output; output.write(yaml.dump({'channels': ['sci-bots', 'microdrop-plugins', 'wheeler-microfluidics', 'conda-forge', 'defaults']})"
+call Scripts\activate.bat & python -c "import logging; logging.basicConfig(level=logging.DEBUG); import mpm.api; mpm.api.enable_plugin('droplet_planning_plugin'); mpm.api.enable_plugin('dmf_device_ui_plugin'); mpm.api.enable_plugin('dropbot_plugin'); mpm.api.enable_plugin('user_prompt_plugin'); mpm.api.enable_plugin('step_label_plugin')"
 if errorlevel 1 exit 1
-call Scripts\activate.bat & python -c "import logging; logging.basicConfig(level=logging.DEBUG); import mpm.api; mpm.api.enable_plugin('droplet_planning_plugin'); mpm.api.enable_plugin('dmf_device_ui_plugin'); mpm.api.enable_plugin('dropbot_plugin');mpm.api.enable_plugin('user_prompt_plugin'); mpm.api.enable_plugin('step_label_plugin')"
+call Scripts\activate.bat & python -c "import yaml; output = open('.condarc', 'w'); output.write(yaml.dump({'channels': ['sci-bots', 'microdrop-plugins', 'wheeler-microfluidics', 'conda-forge', 'defaults']}))"
 if errorlevel 1 exit 1


glance index doesn't work with juno

glance index doesn't work with juno

--- test/ostack_commands.bat
+++ test/ostack_commands.bat
@@ -5,7 +5,7 @@
 }

 @test "glance command works" {
-  lstack glance index
+  lstack glance image-list || lstack glance index
 }

 @test "keystone command works" {


Synchrophasor-VS2012: Changed variable name in UpdateDependencies.bat.

git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/openpdc/Synchrophasor/Current Version-VS2012;C87245

--- Build/Scripts/UpdateDependencies.bat
+++ Build/Scripts/UpdateDependencies.bat
@@ -81,10 +81,10 @@
 %replace% /r /v "%targetschema%\*SampleDataSet.sql" "Test Device" Shelby
 %replace% /r /v "%targetschema%\*SampleDataSet.sql" "'TEST'" "'SHEL'"
 %replace% /r /v "%targetschema%\*db-update.bat" GSFSchema openPDC
-SET pwd=%CD%
+SET cwd=%CD%
 CD %targetschema%\SQLite
 ECHO "N" | db-update.bat
-CD "%pwd%"
+CD "%cwd%"

 :: ECHO.
 :: ECHO Building solution...


use absolute path to cscript under Windows to circumvent path problems

--- connector-win-ppt2010.bat
+++ connector-win-ppt2010.bat
@@ -12,5 +12,5 @@
 rem ##  Language: COMMAND.COM
 rem ##

-cscript /E:JScript /NoLogo "%~dp0\connector-win-ppt2010.js" %*
+%systemroot%\system32\cscript.exe /E:JScript /NoLogo "%~dp0\connector-win-ppt2010.js" %*


Add tonemap build command.

Add tonemap build command.

--- Dev/Cpp/Viewer/Graphics/Platform/DX11/compile_effect.bat
+++ Dev/Cpp/Viewer/Graphics/Platform/DX11/compile_effect.bat
@@ -4,5 +4,6 @@
 "%DXSDK_DIR%Utilities\\bin\x86\fxc" /Zpc /Tps_4_1 /EPS /Fh Shader/efk.GraphicsDX11.PostFX_Blend_PS.h Shader/postfx_blend_PS.fx
 "%DXSDK_DIR%Utilities\\bin\x86\fxc" /Zpc /Tps_4_1 /EPS /Fh Shader/efk.GraphicsDX11.PostFX_BlurH_PS.h Shader/postfx_blur_h_PS.fx
 "%DXSDK_DIR%Utilities\\bin\x86\fxc" /Zpc /Tps_4_1 /EPS /Fh Shader/efk.GraphicsDX11.PostFX_BlurV_PS.h Shader/postfx_blur_v_PS.fx
+"%DXSDK_DIR%Utilities\\bin\x86\fxc" /Zpc /Tps_4_1 /EPS /Fh Shader/efk.GraphicsDX11.PostFX_Tonemap_PS.h Shader/postfx_tonemap_PS.fx

 pause


run this test on windows again!

run this test on windows again!

[Finishes #133138041]

--- ci/cli/tasks/cats-windows.bat
+++ ci/cli/tasks/cats-windows.bat
@@ -24,4 +24,4 @@
 go get -v -u github.com/FiloSottile/gvt
 gvt update github.com/onsi/ginkgo

-ginkgo.exe -flakeAttempts=2 -slowSpecThreshold=120 -skip="NO_DEA_SUPPORT|go makes the app reachable via its bound route|SSO|takes effect after a restart, not requiring a push|doesn't die when printing 32MB|exercises basic loggregator|firehose data|Users can manage droplet bits for an app|dotnet-core|transparently proxies both reserved" -nodes=%NODES%
+ginkgo.exe -flakeAttempts=2 -slowSpecThreshold=120 -skip="NO_DEA_SUPPORT|go makes the app reachable via its bound route|SSO|takes effect after a restart, not requiring a push|doesn't die when printing 32MB|exercises basic loggregator|firehose data|dotnet-core|transparently proxies both reserved" -nodes=%NODES%


install Google V8

install Google V8

--- tool/install/install_v8.bat
+++ tool/install/install_v8.bat
@@ -2,12 +2,15 @@
 @echo // brief:
 @echo //   build and install v8
 @echo // usage:
-@echo //   install_v8.bat
+@echo //   install_v8.bat [command]
 @echo // version:
 @echo //   $Id: install_v8.bat 352 2014-06-08 08:48:59Z hryky.private@gmail.com $
 @echo //----------------------------------------------------------------

 @setlocal ENABLEDELAYEDEXPANSION ENABLEEXTENSIONS
+
+@set COMMAND=%1
+shift

 @set TOOLROOT=%DEVROOT%/hryky-codebase/tool

@@ -20,47 +23,76 @@
 )

 @set MODULE=v8
-@set MODULE_ROOT=%DEVROOT%\%MODULE%
+@set MODULE_ROOT=%DEVROOT%\google\%MODULE%
 @set MODULE_PROJDIR=%MODULE_ROOT%\build
 @set INSTALL_ROOT=%DEVROOT%\hryky-codebase\external\v8
 @set INSTALL_LIBDIR=%INSTALL_ROOT%\lib\win\%TARGET_ARCHITECTURE%\
 @set INSTALL_INCDIR=%INSTALL_ROOT%\include\v8\
 @set XCOPY=xcopy /F /Y
-@set PYTHON=%MODULE_ROOT%\third_party\python_26

-@set DEVENVSLN=%MODULE_PROJDIR%\All.sln
-@set DEVENVTARGET=
-@set DEVENVCONFIG=Debug
-@set DEVENVPLATFORM=%TARGET_ARCHITECTURE%
+@set DEPOT_TOOLS_WIN_TOOLCHAIN=0
+@set GYP_MSVS_VERSION=2015

-@set GYP_MSVS_VERSION=2013e
+@set PATH=%DEVROOT%\depot_tools;%PATH%

-@cd %MODULE_ROOT%
+@if not exist "%MODULE_ROOT%" @(
+	@echo "%MODULE_ROOT%" is not found.
+	@goto :error
+)
+@pushd "%MODULE_ROOT%"

+@chcp 437
+
+@if "build" == "%COMMAND%" @(
+	@goto :build
+)
+@if "install" == "%COMMAND%" @(
+	@goto :install
+)
+
+:configure
 @echo //--------------------------------
 @echo // configure V8 : %TARGET_ARCHITECTURE%
 @echo //--------------------------------

-call third_party\python_26\python.exe build/gyp_v8 -Dtarget_arch=%V8_ARCHITECTURE%
+@call "tools\dev\v8gen.py" x64.debug ^
+	-- is_component_build=true
+@if errorlevel 1 @goto :error
+@call "tools\dev\v8gen.py" x64.optdebug ^
+	-- is_component_build=true
+@if errorlevel 1 @goto :error
+@call "tools\dev\v8gen.py" x64.release ^
+	-- is_component_build=true
 @if errorlevel 1 @goto :error

+:build
 @echo //--------------------------------
 @echo // build V8
-@echo // MSVC2012 can't build the project generated by GYP.
 @echo //--------------------------------

-call "%TOOLROOT%/build/open_solution.bat" %DEVENVSLN%
+@call ninja -v -C out.gn/x64.debug v8
+@if errorlevel 1 @goto :error
+@call ninja -v -C out.gn/x64.optdebug v8
+@if errorlevel 1 @goto :error
+@call ninja -v -C out.gn/x64.release v8
 @if errorlevel 1 @goto :error

+:install
 @echo //--------------------------------
 @echo // install V8 : %TARGET_ARCHITECTURE%
 @echo //--------------------------------

 @if not exist "%INSTALL_LIBDIR%\Debug" @mkdir "%INSTALL_LIBDIR%\Debug"
-%XCOPY% "%MODULE_ROOT%"\build\Debug\lib\*.lib "%INSTALL_LIBDIR%\Debug"
+%XCOPY% "%MODULE_ROOT%"\out.gn\x64.debug\v8.dll "%INSTALL_LIBDIR%\Debug"
+%XCOPY% "%MODULE_ROOT%"\out.gn\x64.debug\v8.dll.lib "%INSTALL_LIBDIR%\Debug"
+%XCOPY% "%MODULE_ROOT%"\out.gn\x64.debug\v8.dll.exp "%INSTALL_LIBDIR%\Debug"
+%XCOPY% "%MODULE_ROOT%"\out.gn\x64.debug\v8.dll.pdb "%INSTALL_LIBDIR%\Debug"

 @if not exist "%INSTALL_LIBDIR%\Release" @mkdir "%INSTALL_LIBDIR%\Release"
-%XCOPY% "%MODULE_ROOT%"\build\Release\lib\*.lib "%INSTALL_LIBDIR%\Release"
+%XCOPY% "%MODULE_ROOT%"\out.gn\x64.release\v8.dll "%INSTALL_LIBDIR%\Release"
+%XCOPY% "%MODULE_ROOT%"\out.gn\x64.release\v8.dll.lib "%INSTALL_LIBDIR%\Release"
+%XCOPY% "%MODULE_ROOT%"\out.gn\x64.release\v8.dll.exp "%INSTALL_LIBDIR%\Release"
+%XCOPY% "%MODULE_ROOT%"\out.gn\x64.release\v8.dll.pdb "%INSTALL_LIBDIR%\Release"

 @if not exist "%INSTALL_INCDIR%" @mkdir "%INSTALL_INCDIR%"
 %XCOPY% "%MODULE_ROOT%"\include "%INSTALL_INCDIR%\"


Check VS version instead of CMake generator to see whether should add the NET3.5 path to path.

--- tools/Windows/BuildDeps.cmd
+++ tools/Windows/BuildDeps.cmd
@@ -62,7 +62,7 @@
 )

 :: If we use VS2008, framework path (for msbuild) may not be correctly set. Manually attempt to add in that case
-IF %GENERATOR%==%GENERATOR_VS2008% set PATH=C:\Windows\Microsoft.NET\Framework\v3.5;%PATH%
+IF %VS_VER%==vs2008 set PATH=C:\Windows\Microsoft.NET\Framework\v3.5;%PATH%

 :: Print user-defined variables
 cecho {F0}This script fetches and builds all Tundra dependencies{# #}{\n}


Windows deps: Remove building Qt two times. This was added during 4.7.x usage as the first make always failed on VC2008 (at least). Now we are using qt 4.8.4 and this is no longer needed, also it added 5-10 mins of unneccesary building, see https://bugreports.qt-project.org/browse/QTBUG-6470 for the original bug

--- tools/Windows/BuildDeps.cmd
+++ tools/Windows/BuildDeps.cmd
@@ -269,16 +269,8 @@
    IF %USE_JOM%==TRUE (
       cecho {0D}- Building Qt with jom{# #}{\n}
       "%DEPS%\qt\jom\jom.exe"
-      :: Qt build system is slightly broken: see https://bugreports.qt-project.org/browse/QTBUG-6470. Work around the issue.
-      set ERRORLEVEL=0
-      del /s /q mocinclude.tmp
-      "%DEPS%\qt\jom\jom.exe"
    ) ELSE (
       cecho {0D}- Building Qt with nmake{# #}{\n}
-      nmake /nologo
-      :: Qt build system is slightly broken: see https://bugreports.qt-project.org/browse/QTBUG-6470. Work around the issue.
-      set ERRORLEVEL=0
-      del /s /q mocinclude.tmp
       nmake /nologo
    )


Update copy to repo script

Update copy to repo script

--- SimulationTools/GitHub_update/copy_to_team_repo_v1_5.bat
+++ SimulationTools/GitHub_update/copy_to_team_repo_v1_5.bat
@@ -4,7 +4,7 @@
 SET DISTR=..\..\DistributionSystems\SimulinkOpal\Banshee\
 SET COMP=..\..\Components\SimulinkOpal\
 SET DOCS=..\..\..\MGC_Challange_Docs\
-SET DEST=..\..\..\MGCP2017_Team5\
+SET DEST=..\..\..\MGCP2017_Team4\

 ECHO ABCD %dest%

@@ -14,16 +14,15 @@
 copy "%DOCS%2017 MGCP Information Packet v1_3.pdf" "%DEST%0_Instruction\2017 MGCP Information Packet v1_3.pdf"
 copy "%DOCS%2017 MGCP Information Packet v1_4.pdf" "%DEST%0_Instruction\2017 MGCP Information Packet v1_4.pdf"
 copy "%DOCS%2017 MGCP Information Packet v1_5.pdf" "%DEST%0_Instruction\2017 MGCP Information Packet v1_5.pdf"
+copy "%DOCS%2017 MGCP Information Packet v1_6.pdf" "%DEST%0_Instruction\2017 MGCP Information Packet v1_6.pdf"

 xcopy "%DOCS%HardwareSpecs\*.*" "%DEST%1_References\*.*" /S

 xcopy %EPHCC%DistributionSystems\SimulinkOpal\Banshee\*.* %DEST%\5_Source\DistributionSystems\SimulinkOpal\Banshee\*.* /S
 xcopy %EPHCC%Components\SimulinkOpal\*.* %DEST%5_Source\Components\SimulinkOpal\*.* /S

-xcopy %EPHCC%SimulationTools\UDP_Tools\*.m %DEST%6_TestSequence\UDP_Tools\*.m /S
-xcopy %EPHCC%SimulationTools\UDP_Tools\*.mexw32 %DEST%6_TestSequence\UDP_Tools\*.mexw32 /S
-xcopy %EPHCC%SimulationTools\UDP_Tools\*.m %DEST%6_TestSequence\UDP_Tools\*.m /S
 xcopy %EPHCC%SimulationTools\TestSequence\*.m %DEST%6_TestSequence\TestSequence\*.m /S
+xcopy %EPHCC%SimulationTools\TestSequence\*.mexw32 %DEST%6_TestSequence\TestSequence\*.mexw32 /S
 xcopy %EPHCC%SimulationTools\TestSequence\*.png %DEST%6_TestSequence\TestSequence\*.png /S
 xcopy %EPHCC%SimulationTools\TestSequence\*.txt %DEST%6_TestSequence\TestSequence\*.txt /S
 xcopy %EPHCC%SimulationTools\TestSequence\*.docx %DEST%6_TestSequence\TestSequence\*.docx /S


Restoring build log level

Restoring build log level

--- ClickToBuild.cmd
+++ ClickToBuild.cmd
@@ -23,7 +23,7 @@
 IF "%target%" == "" SET target=Build
 IF "%project%" =="" SET project=Orchard.proj

-msbuild /t:%target% %project% /v:m
+msbuild /t:%target% %project%

 pause