Added new vm setup batch file

Added new vm setup batch file

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

--- client_files/vmsetupwin.bat
+++ client_files/vmsetupwin.bat
@@ -0,0 +1,421 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+::This file accepts 2 parameters: .iso file path and vm name
+::Example: vmsetupwin.bat c:\users\bob\downloads CentOS1
+
+
+::===Notes===
+::This file assumes default virtualbox setup (directory locations)
+::ie. c:\users\username\.VirtualBox and c:\users\username\VirtualBox VMs
+::Prompts desired?
+::Long list of OS's necessary?
+::Shared Folder is host's desktop. Is this desired?
+
+
+::Test to see if parameter 1 is set.
+if [%1] NEQ [] (
+	goto:stage1
+) else (
+	echo iso file path in parameter 1 is missing. (ie. c:\users\bob\downloads)
+	goto:eof
+)
+
+::Test to see if parameter 2 is set.
+:stage1
+if [%2] NEQ [] (
+	goto:stage1.1
+) else (
+	echo.
+	echo Virtual Machine name in parameter 2 is missing
+	goto:eof
+)
+
+::Check if there are virtual machines have the same name.
+:stage1.1
+for /d %%q in ("c:\users\%username%\VirtualBox VMs\*") do (
+	if %2==%%~nq (
+		echo.
+		echo There is already a virtual machine with the name %2. Please use a different name.
+		goto:eof
+		)
+	)
+
+::Generate list of iso files
+:stage2
+echo.
+set num=0
+for /r %1 %%g in (*.iso) do (
+	set /a num+=1
+	echo !num! %%~ng
+	set iso!num!=%%g
+	)
+echo.
+
+
+::if no iso files found
+if %num%==0 (echo No iso file found in %1. Is the iso file path correct?
+goto:eof)
+
+::Choose iso file
+set /p mychoice=Choose an .iso file (enter number):
+for /l %%i in (1,1,%num%) do (
+	if %%i==%mychoice% (
+	set isofilepath=!iso%%i!
+	)
+)
+::Setting vm name
+if [%2] NEQ [] (
+	set vm=%2
+) else (
+	echo.
+	echo Virtual Machine name not found for parameter 2
+	goto:eof
+)
+echo.
+echo =List of Operating Systems=
+echo.
+echo 1 Other/Unknown
+echo 2 Windows 3.1
+echo 3 Windows 95
+echo 4 Windows 98
+echo 5 Windows Me
+echo 6 Windows NT 4
+echo 7 Windows 2000
+echo 8 Windows XP
+echo 9 Windows XP (64 bit)
+echo 10 Windows 2003
+echo 11 Windows 2003 (64 bit)
+echo 12 Windows Vista
+echo 13 Windows Vista (64 bit)
+echo 14 Windows 2008
+echo 15 Windows 2008 (64 bit)
+echo 16 Windows 7
+echo 17 Windows 7 (64 bit)
+echo 18 Other Windows
+echo 19 Linux 2.2
+echo 20 Linux 2.4
+echo 21 Linux 2.4 (64 bit)
+echo 22 Linux 2.6
+echo 23 Linux 2.6 (64 bit)
+echo 24 Arch Linux
+echo 25 Arch Linux (64 bit)
+echo 26 Debian
+echo 27 Debian (64 bit)
+echo 28 openSUSE
+echo 29 openSUSE (64 bit)
+echo 30 Fedora
+echo 31 Fedora (64 bit)
+echo 32 Gentoo
+echo 33 Gentoo (64 bit)
+echo 34 Mandriva
+echo 35 Mandriva (64 bit)
+echo 36 Red Hat
+echo 37 Red Hat (64 bit)
+echo 38 Turbolinux
+echo 39 Turbolinux (64 bit)
+echo 40 Ubuntu
+echo 41 Ubuntu (64 bit)
+echo 42 Xandros
+echo 43 Xandros (64 bit)
+echo 44 Oracle
+echo 45 Oracle (64 bit)
+echo 46 Other Linux
+echo 47 Solaris legacy
+echo 48 Solaris legacy (64 bit)
+echo 49 Solaris modern (S10U8+)
+echo 50 Solaris modern (S10U8+) (64 bit)
+echo 51 FreeBSD
+echo 52 FreeBSD (64 bit)
+echo 53 OpenBSD
+echo 54 OpenBSD (64 bit)
+echo 55 NetBSD
+echo 56 NetBSD (64 bit)
+echo 57 OS/2 Warp 3
+echo 58 OS/2 Warp 4
+echo 59 OS/2 Warp 4.5
+echo 60 eComStation
+echo 61 Other OS/2
+echo 62 Mac OS X Server
+echo 63 Mac OS X Server (64 bit)
+echo 64 DOS
+echo 65 Netware
+echo 66 L4
+echo 67 QNX
+echo 68 JRockitVE
+echo.
+
+::Choose OS name
+set /p osnumber=Choose an Operating System (enter number 1-68):
+
+::Check to see if user enters a number 1-68.
+if %osnumber% GEQ 1 (
+	goto:check1
+	) else (
+		echo.
+		echo Invalid choice
+		goto:eof
+		)
+
+:check1
+if %osnumber% LEQ 68 (
+	goto:check2
+	) else (
+		echo.
+		echo Invalid choice
+		goto:eof
+		)
+
+::Connect number with OS choice.
+:check2
+goto:case%osnumber%
+::following was done on excel using &CHAR(10)& for carriage returns...sweet
+:case1
+set whichos=Other
+goto:stage3
+:case2
+set whichos=Windows31
+goto:stage3
+:case3
+set whichos=Windows95
+goto:stage3
+:case4
+set whichos=Windows98
+goto:stage3
+:case5
+set whichos=WindowsMe
+goto:stage3
+:case6
+set whichos=WindowsNT4
+goto:stage3
+:case7
+set whichos=Windows2000
+goto:stage3
+:case8
+set whichos=WindowsXP
+goto:stage3
+:case9
+set whichos=WindowsXP_64
+goto:stage3
+:case10
+set whichos=Windows2003
+goto:stage3
+:case11
+set whichos=Windows2003_64
+goto:stage3
+:case12
+set whichos=WindowsVista
+goto:stage3
+:case13
+set whichos=WindowsVista_64
+goto:stage3
+:case14
+set whichos=Windows2008
+goto:stage3
+:case15
+set whichos=Windows2008_64
+goto:stage3
+:case16
+set whichos=Windows7
+goto:stage3
+:case17
+set whichos=Windows7_64
+goto:stage3
+:case18
+set whichos=WindowsNT
+goto:stage3
+:case19
+set whichos=Linux22
+goto:stage3
+:case20
+set whichos=Linux24
+goto:stage3
+:case21
+set whichos=Linux24_64
+goto:stage3
+:case22
+set whichos=Linux26
+goto:stage3
+:case23
+set whichos=Linux26_64
+goto:stage3
+:case24
+set whichos=ArchLinux
+goto:stage3
+:case25
+set whichos=ArchLinux_64
+goto:stage3
+:case26
+set whichos=Debian
+goto:stage3
+:case27
+set whichos=Debian_64
+goto:stage3
+:case28
+set whichos=OpenSUSE
+goto:stage3
+:case29
+set whichos=OpenSUSE_64
+goto:stage3
+:case30
+set whichos=Fedora
+goto:stage3
+:case31
+set whichos=Fedora_64
+goto:stage3
+:case32
+set whichos=Gentoo
+goto:stage3
+:case33
+set whichos=Gentoo_64
+goto:stage3
+:case34
+set whichos=Mandriva
+goto:stage3
+:case35
+set whichos=Mandriva_64
+goto:stage3
+:case36
+set whichos=RedHat
+goto:stage3
+:case37
+set whichos=RedHat_64
+goto:stage3
+:case38
+set whichos=Turbolinux
+goto:stage3
+:case39
+set whichos=Turbolinux
+goto:stage3
+:case40
+set whichos=Ubuntu
+goto:stage3
+:case41
+set whichos=Ubuntu_64
+goto:stage3
+:case42
+set whichos=Xandros
+goto:stage3
+:case43
+set whichos=Xandros_64
+goto:stage3
+:case44
+set whichos=Oracle
+goto:stage3
+:case45
+set whichos=Oracle_64
+goto:stage3
+:case46
+set whichos=Linux
+goto:stage3
+:case47
+set whichos=Solaris
+goto:stage3
+:case48
+set whichos=Solaris_64
+goto:stage3
+:case49
+set whichos=OpenSolaris
+goto:stage3
+:case50
+set whichos=OpenSolaris_64
+goto:stage3
+:case51
+set whichos=FreeBSD
+goto:stage3
+:case52
+set whichos=FreeBSD_64
+goto:stage3
+:case53
+set whichos=OpenBSD
+goto:stage3
+:case54
+set whichos=OpenBSD_64
+goto:stage3
+:case55
+set whichos=NetBSD
+goto:stage3
+:case56
+set whichos=NetBSD_64
+goto:stage3
+:case57
+set whichos=OS2Warp3
+goto:stage3
+:case58
+set whichos=OS2Warp4
+goto:stage3
+:case59
+set whichos=OS2Warp45
+goto:stage3
+:case60
+set whichos=OS2eCS
+goto:stage3
+:case61
+set whichos=OS2
+goto:stage3
+:case62
+set whichos=MacOS
+goto:stage3
+:case63
+set whichos=MacOS_64
+goto:stage3
+:case64
+set whichos=DOS
+goto:stage3
+:case65
+set whichos=Netware
+goto:stage3
+:case66
+set whichos=L4
+goto:stage3
+:case67
+set whichos=QNX
+goto:stage3
+:case68
+set whichos=JRockitVE
+goto:stage3
+
+
+:stage3
+::change the following variables to suit your needs
+SET hostonlyname="VirtualBox Host-Only Ethernet Adapter"
+SET storage=10240
+SET memory=1024
+SET vram=128
+
+
+::This allows you to use vboxmanage without typing out path.
+PATH=%PATH%;C:\Program Files\Oracle\VirtualBox
+
+::createhd creates a new virtual hard disk image
+::dynamic disk is 10GB
+vboxmanage createhd --filename "c:\users\%USERNAME%\VirtualBox VMs\%vm%\%vm%.vdi" --size %storage%
+
+::createvm creates a new XML virtual machine definition file
+vboxmanage createvm --name %vm% --ostype %whichos% --register
+
+::storagectl attaches/modifies/removes a storage controller
+vboxmanage storagectl %vm% --name "SATA Controller" --add sata --controller IntelAHCI
+
+::storageattach attaches/modifies/removes a storage medium connected
+::to a storage controller that was previously added with the storagectl command
+vboxmanage storageattach %vm% --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium "c:\users\%USERNAME%\VirtualBox VMs\%vm%\%vm%.vdi"
+
+vboxmanage storagectl %VM% --name "IDE Controller" --add ide
+vboxmanage storageattach %VM% --storagectl "IDE Controller" --port 0 --device 0 --type dvddrive --medium %isofilepath%
+vboxmanage storageattach %VM% --storagectl "IDE Controller" --port 1 --device 0 --type dvddrive --medium "c:\Program Files\Oracle\VirtualBox\VBoxGuestAdditions.iso"
+::modifyvm changes the properties of a registered virtual machine which is not running
+::audio needs to be fixed
+vboxmanage modifyvm %vm% --ioapic on
+vboxmanage modifyvm %vm% --boot1 dvd --boot2 disk --boot3 none --boot4 none
+vboxmanage modifyvm %vm% --memory %memory% --vram %vram%
+vboxmanage modifyvm %vm% --nic1 nat
+vboxmanage modifyvm %vm% --nic2 hostonly --hostonlyadapter2 %hostonlyname%
+vboxmanage modifyvm %vm% --natpf1 [ssh],tcp,,3022,,22
+vboxmanage modifyvm %vm% --audio null
+vboxmanage sharedfolder add "%vm%" --name "your_shared_folder" --hostpath "c:\users\%username%\desktop"
+
+
+
+
+


fix paths

fix paths

git-svn-id: 2c527eb49caa05e19d6b2be874bf74fa9d7ea670@345018 13f79535-47bb-0310-9956-ffa450edef68

--- bootstrap.bat
+++ bootstrap.bat
@@ -107,12 +107,9 @@

 call .\build

-@REM Build Maven2
-cd ..
-
 %MAVEN_JAVA_EXE% %MAVEN_OPTS% -jar target\bootstrap-mini.jar install %MAVEN_CMD_LINE_ARGS%

-cd bootstrap\bootstrap-installer
+cd ..\bootstrap-installer
 %MAVEN_JAVA_EXE% %MAVEN_OPTS% -jar ..\bootstrap-installer.jar package %MAVEN_CMD_LINE_ARGS%
 cd ..\..


Deubugging call command.

Deubugging call command.

--- dev/appveyor-bootstrap.bat
+++ dev/appveyor-bootstrap.bat
@@ -8,7 +8,7 @@
  pyqt5=5.5.1 python=3.5.1 lxml=3.5.0
 call activate fomod-validator
 echo "Done activating."
-pip install pip -U
+call pip install pip -U
 echo "Upgraded pip."
 pip install setuptools -U --ignore-installed
 echo "Upgraded setuptools."


tbb 2017-u5

tbb 2017-u5

--- build_tbb.bat
+++ build_tbb.bat
@@ -1,19 +1,20 @@
 call settings.bat

-call fetch.bat https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20150728oss_src.tgz tbb44_20150728oss
+call fetch.bat https://github.com/01org/tbb/archive/2017_U5.zip tbb-2017_U5
+rem https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20150728oss_src.tgz tbb44_20150728oss

 if "%COMPILER%" == "MINGW" (
-cd tbb43_20140724oss
+cd tbb-2017_U5
   SET "PATH=%MSYSDIR%;%PATH%"
   bash -c "make mingw"
   %ER%
   cd ..
 ) else (
-cd tbb44_20150728oss\build\vs2010
-rem devenv  makefile.sln /Upgrade /nologo
+cd tbb-2017_U5\build\vs2012
+devenv  makefile.sln /Upgrade /nologo
 rem msbuild /p:Configuration=Debug /clp:Verbosity=minimal /nologo makefile.sln /flp1:logfile=build_errors.txt;errorsonly /flp2:logfile=build_warnings.txt;warningsonly
-rem msbuild /p:Configuration=Release /clp:Verbosity=minimal /nologo makefile.sln /flp1:logfile=build_errors.txt;errorsonly /flp2:logfile=build_warnings.txt;warningsonly
+msbuild /p:Configuration=Release /clp:Verbosity=minimal /nologo makefile.sln /flp1:logfile=build_errors.txt;errorsonly /flp2:logfile=build_warnings.txt;warningsonly
 echo Creating dirs
 mkdir %PREFIX%\tbb
 mkdir %PREFIX%\tbb\lib
@@ -25,11 +26,11 @@
 mkdir %PREFIX%\tbb\bin\intel64\vc14

 echo Copy files
-copy /y intel64\Debug\*.lib %PREFIX%\tbb\lib\intel64\vc14
-copy /y intel64\Debug\*.dll %PREFIX%\tbb\bin\intel64\vc14
-copy /y intel64\Release\*.lib %PREFIX%\tbb\lib\intel64\vc14
-copy /y intel64\Release\*.dll %PREFIX%\tbb\bin\intel64\vc14
-xcopy /d /y /e ..\..\src\include %PREFIX%\tbb\include
+copy /y x64\Debug\*.lib %PREFIX%\tbb\lib\intel64\vc14
+copy /y x64\Debug\*.dll %PREFIX%\tbb\bin\intel64\vc14
+copy /y x64\Release\*.lib %PREFIX%\tbb\lib\intel64\vc14
+copy /y x64\Release\*.dll %PREFIX%\tbb\bin\intel64\vc14
+xcopy /d /y /e ..\..\include %PREFIX%\tbb\include

 cd ..\..\..
 )


Update build_win.bat

Update build_win.bat

fix window generate

--- build_win.bat
+++ build_win.bat
@@ -1,3 +1,3 @@
-rem set GYP_MSVS_VERSION=2010e
+set GYP_MSVS_VERSION=2010e
 ./tools/gyp/gyp --depth=./ picasso.gyp --generator-output=vcproj


Fixed merge

Fixed merge

--- links.cmd
+++ links.cmd
@@ -1,123 +1,123 @@
-:: ln == mklink /h
-:: hard link folders (dir junction) = mklink /j dir1 dir2
-:: hard link files = mklink /h
-:: ln -f for folder: if exist FOLDER_TO_REPLACE_WITH_LINK rmdir /s FOLDER_TO_REPLACE_WITH_LINK&&mklink /j FOLDER_TO_REPLACE_WITH_LINK FOLDER_TO_LINK_TO
-:: ln -f for file: if exist FILE_TO_REPLACE_WITH_LINK del FILE_TO_REPLACE_WITH_LINK&&mklink /h FILE_TO_REPLACE_WITH_LINK FILE_TO_LINK_TO
-
-
-::	FIREFOX ADD-ON
-::
-::Sync icons folder
-::ln -f share\images\icons\*       drivers\firefox\skin\images\icons
-if exist drivers\firefox\skin\images\icons rmdir /q /s drivers\firefox\skin\images\icons
-mklink /j drivers\firefox\skin\images\icons share\images\icons\
-
-::Sync lib folder
-::ln -f share\js\lib\jquery.min.js drivers\firefox\content\js\lib
-if exist drivers\firefox\content\js\lib rmdir /q /s drivers\firefox\content\js\lib
-mklink /j drivers\firefox\content\js\lib share\js\lib\
-
-::Sync apps JSON
-::ln -f share\apps.json            drivers\firefox\content
-if exist drivers\firefox\content\apps.json del drivers\firefox\content\apps.json
-mklink /h drivers\firefox\content\apps.json share\apps.json
-
-::Sync Wappalyzer.js
-::ln -f share\js\wappalyzer.js     drivers\firefox\content\js
-if exist drivers\firefox\content\js\wappalyzer.js del drivers\firefox\content\js\wappalyzer.js
-mklink /h drivers\firefox\content\js\wappalyzer.js share\js\wappalyzer.js
-
-
-
-::	FIREFOX JETPACK
-::
-::Sync icons folder
-::ln -f share\images\icons\*       drivers\firefox-jetpack\images\icons
-if exist drivers\firefox-jetpack\images\icons rmdir /q /s drivers\firefox-jetpack\images\icons
-mklink /j drivers\firefox-jetpack\images\icons share\images\icons
-
-::Sync apps JSON
-::ln -f share\apps.json            drivers\firefox-jetpack\data
-if exist drivers\firefox-jetpack\data\apps.json del drivers\firefox-jetpack\data\apps.json
-mklink /h drivers\firefox-jetpack\data\apps.json share\apps.json
-
-::Sync Wappalyzer.js
-::ln -f share\js\wappalyzer.js     drivers\firefox-jetpack\lib
-if exist drivers\firefox-jetpack\lib\wappalyzer.js del drivers\firefox-jetpack\lib\wappalyzer.js
-mklink /h drivers\firefox-jetpack\lib\wappalyzer.js share\js\wappalyzer.js
-
-
-
-::	CHROME EXTENSION
-::
-::Sync icons folder
-::ln -f share\images\icons\*       drivers\chrome\images\icons
-if exist drivers\chrome\images\icons rmdir /q /s drivers\chrome\images\icons
-mklink /j drivers\chrome\images\icons share\images\icons
-
-::Sync lib folder
-::ln -f share\js\lib\jquery.min.js drivers\chrome\js\lib
-if exist drivers\chrome\js\lib rmdir /q /s drivers\chrome\js\lib
-mklink /j drivers\chrome\js\lib share\js\lib
-
-::Sync apps JSON
-::ln -f share\apps.json            drivers\chrome
-if exist drivers\chrome\apps.json del drivers\chrome\apps.json
-mklink /h drivers\chrome\apps.json share\apps.json
-
-::Sync Wappalyzer.js
-::ln -f share\js\wappalyzer.js     drivers\chrome\js
-if exist drivers\chrome\js\wappalyzer.js del drivers\chrome\js\wappalyzer.js
-mklink /h drivers\chrome\js\wappalyzer.js share\js\wappalyzer.js
-
-
-
-::	BOOKMARKLET
-::
-::Sync icons folder
-::ln -f share\images\icons\*       drivers\bookmarklet\images\icons
-if exist drivers\bookmarklet\images\icons rmdir /q /s drivers\bookmarklet\images\icons
-mklink /j drivers\bookmarklet\images\icons share\images\icons
-
-::Sync apps JSON
-::ln -f share\apps.json            drivers\bookmarklet\json
-if exist drivers\bookmarklet\json del drivers\bookmarklet\json
-mklink /h drivers\bookmarklet\json share\apps.json
-
-::Sync Wappalyzer.js
-::ln -f share\js\wappalyzer.js     drivers\bookmarklet\js
-if exist drivers\bookmarklet\js\wappalyzer.js del drivers\bookmarklet\js\wappalyzer.js
-mklink /h drivers\bookmarklet\js\wappalyzer.js share\js\wappalyzer.js
-
-
-
-::	HTML DRIVER
-::
-::Sync icons folder
-::ln -f share\images\icons\*       drivers\html\images\icons
-if exist drivers\html\images\icons rmdir /q /s drivers\html\images\icons
-mklink /j drivers\html\images\icons share\images\icons
-
-::Sync apps JSON
-::ln -f share\apps.json            drivers\html
-if exist drivers\html\apps.json del drivers\html\apps.json
-mklink /h drivers\html\apps.json share\apps.json
-
-::Sync Wappalyzer.js
-::ln -f share\js\wappalyzer.js     drivers\html\js
-if exist drivers\html\js\wappalyzer.js del drivers\html\js\wappalyzer.js
-mklink /h drivers\html\js\wappalyzer.js share\js\wappalyzer.js
-
-
-
-::	PHP DRIVER
-::
-::Sync apps JSON
-::ln -f share\apps.json            drivers\php
-if exist drivers\php\apps.json del drivers\php\apps.json
-mklink /h drivers\php\apps.json share\apps.json
-
-::Sync Wappalyzer.js
-::ln -f share\js\wappalyzer.js     drivers\php\js
-if exist drivers\php\js\wappalyzer.js del drivers\php\js\wappalyzer.js
+::	Copyright (c) 2012 q-- <https://github.com/q-->
+::
+::	Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+::
+::	The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+::
+::	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+:: ln == mklink /h
+:: hard link folders (dir junction) = mklink /j dir1 dir2
+:: hard link files = mklink /h
+:: ln -f for folder: if exist FOLDER_TO_REPLACE_WITH_LINK rmdir /s FOLDER_TO_REPLACE_WITH_LINK&&mklink /j FOLDER_TO_REPLACE_WITH_LINK FOLDER_TO_LINK_TO
+:: ln -f for file: if exist FILE_TO_REPLACE_WITH_LINK del FILE_TO_REPLACE_WITH_LINK&&mklink /h FILE_TO_REPLACE_WITH_LINK FILE_TO_LINK_TO
+
+
+::	FIREFOX ADD-ON
+::
+::Sync icons folder
+::ln -f share\images\icons\*       drivers\firefox\skin\images\icons
+if exist drivers\firefox\skin\images\icons rmdir /q /s drivers\firefox\skin\images\icons
+mklink /j drivers\firefox\skin\images\icons share\images\icons\
+
+::Sync apps JSON
+::ln -f share\apps.json            drivers\firefox\content
+if exist drivers\firefox\content\apps.json del drivers\firefox\content\apps.json
+mklink /h drivers\firefox\content\apps.json share\apps.json
+
+::Sync Wappalyzer.js
+::ln -f share\js\wappalyzer.js     drivers\firefox\content\js
+if exist drivers\firefox\content\js\wappalyzer.js del drivers\firefox\content\js\wappalyzer.js
+mklink /h drivers\firefox\content\js\wappalyzer.js share\js\wappalyzer.js
+
+
+
+::	FIREFOX JETPACK
+::
+::Sync icons folder
+::ln -f share\images\icons\*       drivers\firefox-jetpack\images\icons
+if exist drivers\firefox-jetpack\images\icons rmdir /q /s drivers\firefox-jetpack\images\icons
+mklink /j drivers\firefox-jetpack\images\icons share\images\icons
+
+::Sync apps JSON
+::ln -f share\apps.json            drivers\firefox-jetpack\data
+if exist drivers\firefox-jetpack\data\apps.json del drivers\firefox-jetpack\data\apps.json
+mklink /h drivers\firefox-jetpack\data\apps.json share\apps.json
+
+::Sync Wappalyzer.js
+::ln -f share\js\wappalyzer.js     drivers\firefox-jetpack\lib
+if exist drivers\firefox-jetpack\lib\wappalyzer.js del drivers\firefox-jetpack\lib\wappalyzer.js
+mklink /h drivers\firefox-jetpack\lib\wappalyzer.js share\js\wappalyzer.js
+
+
+
+::	CHROME EXTENSION
+::
+::Sync icons folder
+::ln -f share\images\icons\*       drivers\chrome\images\icons
+if exist drivers\chrome\images\icons rmdir /q /s drivers\chrome\images\icons
+mklink /j drivers\chrome\images\icons share\images\icons
+
+::Sync apps JSON
+::ln -f share\apps.json            drivers\chrome
+if exist drivers\chrome\apps.json del drivers\chrome\apps.json
+mklink /h drivers\chrome\apps.json share\apps.json
+
+::Sync Wappalyzer.js
+::ln -f share\js\wappalyzer.js     drivers\chrome\js
+if exist drivers\chrome\js\wappalyzer.js del drivers\chrome\js\wappalyzer.js
+mklink /h drivers\chrome\js\wappalyzer.js share\js\wappalyzer.js
+
+
+
+::	BOOKMARKLET
+::
+::Sync icons folder
+::ln -f share\images\icons\*       drivers\bookmarklet\images\icons
+if exist drivers\bookmarklet\images\icons rmdir /q /s drivers\bookmarklet\images\icons
+mklink /j drivers\bookmarklet\images\icons share\images\icons
+
+::Sync apps JSON
+::ln -f share\apps.json            drivers\bookmarklet\json
+if exist drivers\bookmarklet\json del drivers\bookmarklet\json
+mklink /h drivers\bookmarklet\json share\apps.json
+
+::Sync Wappalyzer.js
+::ln -f share\js\wappalyzer.js     drivers\bookmarklet\js
+if exist drivers\bookmarklet\js\wappalyzer.js del drivers\bookmarklet\js\wappalyzer.js
+mklink /h drivers\bookmarklet\js\wappalyzer.js share\js\wappalyzer.js
+
+
+
+::	HTML DRIVER
+::
+::Sync icons folder
+::ln -f share\images\icons\*       drivers\html\images\icons
+if exist drivers\html\images\icons rmdir /q /s drivers\html\images\icons
+mklink /j drivers\html\images\icons share\images\icons
+
+::Sync apps JSON
+::ln -f share\apps.json            drivers\html
+if exist drivers\html\apps.json del drivers\html\apps.json
+mklink /h drivers\html\apps.json share\apps.json
+
+::Sync Wappalyzer.js
+::ln -f share\js\wappalyzer.js     drivers\html\js
+if exist drivers\html\js\wappalyzer.js del drivers\html\js\wappalyzer.js
+mklink /h drivers\html\js\wappalyzer.js share\js\wappalyzer.js
+
+
+
+::	PHP DRIVER
+::
+::Sync apps JSON
+::ln -f share\apps.json            drivers\php
+if exist drivers\php\apps.json del drivers\php\apps.json
+mklink /h drivers\php\apps.json share\apps.json
+
+::Sync Wappalyzer.js
+::ln -f share\js\wappalyzer.js     drivers\php\js
+if exist drivers\php\js\wappalyzer.js del drivers\php\js\wappalyzer.js
 mklink /h drivers\php\js\wappalyzer.js share\js\wappalyzer.js


Adds script to deploy test targets.

Adds script to deploy test targets.

error: pathspec 'Python/Prerequisites/deploy_test_targets.cmd' did not match any file(s) known to git

--- Python/Prerequisites/deploy_test_targets.cmd
+++ Python/Prerequisites/deploy_test_targets.cmd
@@ -0,0 +1,37 @@
+@setlocal
+@echo off
+rem
+rem The test targets files redirect projects to use the targets deployed
+rem to the Experimental hive. By installing these targets, you can test
+rem modifications easily without having to manually redeploy files to
+rem your MSBuild directory.
+rem
+rem This script should be run as an administrator.
+rem
+
+echo This script should be run as an administrator.
+
+set D=%~dp0
+
+call :docopy "%ProgramFiles(x86)%\MSBuild\Microsoft\VisualStudio\v14.0"
+call :docopy "%ProgramFiles(x86)%\MSBuild\Microsoft\VisualStudio\v12.0"
+
+pause
+exit /B 0
+
+:docopy
+
+set TARGET=%~1\Python Tools\
+
+if not exist "%~1" exit /B 0
+
+pushd "%D%..\Product\BuildTasks\TestTargets"
+echo.
+echo Copying:
+echo     from %CD%
+echo     to %TARGET%
+if not exist "%TARGET%" mkdir "%TARGET%"
+copy /Y "*.targets" "%TARGET%"
+popd
+
+exit /B 0


added myget.bat to force nightly build target

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

--- myget.bat
+++ myget.bat
@@ -0,0 +1 @@
+build.bat Nightly


ARROW-2337: Use Boost shared libraries in Windows release verification script. Parquet fixes

With these changes, the Windows verification script passes cleanly for me with 0.11.0 RC1

Author: Wes McKinney <wesm+git@apache.org>

Closes #2710 from wesm/ARROW-2337 and squashes the following commits:

d514d5c31 <Wes McKinney> Use Boost shared libraries in Windows release verification script. Fixes for Parquet migration

--- dev/release/verify-release-candidate.bat
+++ dev/release/verify-release-candidate.bat
@@ -33,9 +33,9 @@
 set INSTALL_DIR=%_VERIFICATION_DIR%\install

 @rem Requires GNU Wget for Windows
-wget -O %_TARBALL% %_DIST_URL%/apache-arrow-%1-rc%2/%_TARBALL%
+wget --no-check-certificate -O %_TARBALL% %_DIST_URL%/apache-arrow-%1-rc%2/%_TARBALL% || exit /B

-tar xvf %_TARBALL% -C %_VERIFICATION_DIR_UNIX%
+tar xf %_TARBALL% -C %_VERIFICATION_DIR_UNIX%

 set PYTHON=3.6

@@ -43,7 +43,7 @@
 @rem script execution
 call conda create -p %_VERIFICATION_CONDA_ENV% -f -q -y python=%PYTHON% || exit /B

-call activate %_VERIFICATION_CONDA_ENV%
+call activate %_VERIFICATION_CONDA_ENV% || exit /B

 call conda install -y ^
       six pytest setuptools numpy pandas cython ^
@@ -51,7 +51,7 @@
       cmake ^
       git ^
       boost-cpp ^
-      snappy zlib brotli gflags lz4-c zstd -c conda-forge
+      snappy zlib brotli gflags lz4-c zstd -c conda-forge || exit /B

 set GENERATOR=Visual Studio 14 2015 Win64
 set CONFIGURATION=release
@@ -73,13 +73,17 @@

 cmake -G "%GENERATOR%" ^
       -DCMAKE_INSTALL_PREFIX=%ARROW_HOME% ^
-      -DARROW_BOOST_USE_SHARED=OFF ^
+      -DARROW_BOOST_USE_SHARED=ON ^
       -DCMAKE_BUILD_TYPE=%CONFIGURATION% ^
       -DARROW_CXXFLAGS="/MP" ^
       -DARROW_PYTHON=ON ^
       -DARROW_PARQUET=ON ^
       ..  || exit /B
 cmake --build . --target INSTALL --config %CONFIGURATION%  || exit /B
+
+@rem Get testing datasets for Parquet unit tests
+git clone https://github.com/apache/parquet-testing.git %_VERIFICATION_DIR%\parquet-testing
+set PARQUET_TEST_DATA=%_VERIFICATION_DIR%\parquet-testing\data

 @rem Needed so python-test.exe works
 set PYTHONPATH=%CONDA_PREFIX%\Lib;%CONDA_PREFIX%\Lib\site-packages;%CONDA_PREFIX%\python35.zip;%CONDA_PREFIX%\DLLs;%CONDA_PREFIX%;%PYTHONPATH%


[-Diot.gatway.host="localhost"] -> [-Diot.gateway.host="localhost"

--- modules/analytics/distribution/src/bin/wso2server.bat
+++ modules/analytics/distribution/src/bin/wso2server.bat
@@ -196,7 +196,7 @@

 set JAVA_ENDORSED=".\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"

-set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof"  -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dlogger.server.name="IoT-Analytics" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dcatalina.base="%CARBON_HOME%\lib\tomcat" -Dwso2.carbon.xml=%CARBON_HOME%\repository\conf\carbon.xml -Dwso2.registry.xml="%CARBON_HOME%\repository\conf\registry.xml" -Dwso2.user.mgt.xml="%CARBON_HOME%\repository\conf\user-mgt.xml" -Dwso2.transports.xml="%CARBON_HOME%\repository\conf\mgt-transports.xml" -Djava.util.logging.config.file="%CARBON_HOME%\repository\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\repository\conf"  -Dcomponents.repo="%CARBON_HOME%\repository\components" -Dconf.location="%CARBON_HOME%\repository\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path="true" -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9443" -Diot.gatway.host="localhost" -Diot.gateway.https.port="8243" -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8
+set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof"  -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dlogger.server.name="IoT-Analytics" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dcatalina.base="%CARBON_HOME%\lib\tomcat" -Dwso2.carbon.xml=%CARBON_HOME%\repository\conf\carbon.xml -Dwso2.registry.xml="%CARBON_HOME%\repository\conf\registry.xml" -Dwso2.user.mgt.xml="%CARBON_HOME%\repository\conf\user-mgt.xml" -Dwso2.transports.xml="%CARBON_HOME%\repository\conf\mgt-transports.xml" -Djava.util.logging.config.file="%CARBON_HOME%\repository\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\repository\conf"  -Dcomponents.repo="%CARBON_HOME%\repository\components" -Dconf.location="%CARBON_HOME%\repository\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path="true" -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9443" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8243" -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8

 :runJava
 echo JAVA_HOME environment variable is set to %JAVA_HOME%


try fix cmake config on appveyor

try fix cmake config on appveyor

--- recipes/fastscapelib/install_cpp_headers.bat
+++ recipes/fastscapelib/install_cpp_headers.bat
@@ -2,9 +2,10 @@
 cd build_cpp

 cmake %SRC_DIR% -G "%CMAKE_GENERATOR%" ^
-                -D VERSION_TAG=%PKG_VERSION% ^
-                -D BUILD_TESTS=OFF ^
-                -D CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX%
+                -DVERSION_TAG="%PKG_VERSION%" ^
+                -DCMAKE_PREFIX_PATH="%PREFIX%" ^
+                -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
+                -DBUILD_TESTS=OFF
 if errorlevel 1 exit 1

 cmake --build . --target install


Fixed path to local yarn not hidden

Fixed path to local yarn not hidden

--- deploy.cmd
+++ deploy.cmd
@@ -87,7 +87,7 @@
 echo Prepare environment to build WebApp
 :: .a Install Yarn
 echo Install Yarn if unavailable
-SET YARN_PATH=%DEPLOYMENT_SOURCE%\node_modules\.bin\yarn.cmd
+SET YARN_PATH=%DEPLOYMENT_SOURCE%\node_modules\yarn\bin\yarn.cmd
 IF NOT EXIST %YARN_PATH% (
   pushd %DEPLOYMENT_SOURCE%
   call :ExecuteCmd %NPM_CMD% i --no-save yarn


fix the deployment script

fix the deployment script

--- deploy.cmd
+++ deploy.cmd
@@ -98,7 +98,7 @@
 call :SelectNodeVersion

 :: 3. Install npm packages, bower, grunt, and bower packages
-pushd "%DEPLOYMENT_TARGET%"
+pushd "%DEPLOYMENT_TARGET%\Resume"

 echo Installing npm packages...
 call :ExecuteCmd !NPM_CMD! install


more diagnostic

more diagnostic

--- deploy.cmd
+++ deploy.cmd
@@ -82,6 +82,7 @@
 :Deployment
 echo Handling node.js deployment.
 echo hello, world
+node --version
 jake.bat prepareTempDirectory

 :: 1. KuduSync


removed rimrafing as it slowed down the build performance

--- deploy.cmd
+++ deploy.cmd
@@ -100,8 +100,6 @@
 :: 3. Install npm packages
 IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
   pushd "%DEPLOYMENT_TARGET%"
-  call :ExecuteCmd npm install rimraf -g
-  call :ExecuteCmd rimraf node_modules
   call :ExecuteCmd !NPM_CMD! install
   IF !ERRORLEVEL! NEQ 0 goto error
   popd


Added bootstrap, which also does build

Added bootstrap, which also does build

git-svn-id: 9ecf60ce9baff443e30a0472d3fd222fcb8117cf@1272 7b97033b-253e-4a5c-9b07-e25f9089a9fd

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

--- Applications/PSL/bin/windows/bootstrap-psl.cmd
+++ Applications/PSL/bin/windows/bootstrap-psl.cmd
@@ -0,0 +1,17 @@
+set SPECWARE4=\Progra~1\Specware4
+rem SWPATH needs /s rather than \s so URI parsing works
+set SWPATH=/Progra~1/Specware4;/
+set XEMACS=C:\Progra~1\XEmacs\XEmacs-21.4.10
+rem set XEMACS=C:\Progra~1\XEmacs\XEmacs-21.4.6
+rem Set allegro to the version you have
+rem set ALLEGRO=C:\Progra~1\acl62
+set ALLEGRO=C:\Progra~1\acl61
+
+set SPECWARE_BIN=%SPECWARE4%\Applications\Specware\bin\windows
+
+set LISP_EXECUTABLE=%ALLEGRO%\alisp.exe
+set LISP_HEAP_IMAGE=%SPECWARE_BIN%\Specware4.dxl
+set LISP_DIRECTORY=%Specware4%/
+cd "%Specware4%"
+
+%XEMACS%\i586-pc-win32\xemacs.exe -debug-init -l "%ALLEGRO%/xeli/fi-site-init" -l "%SPECWARE4%/Library/IO/Emacs/load"  -l "%SPECWARE4%/Applications/PSL/bin/windows/psl-init" -f "bootstrap-psl" &


gtfo.

gtfo.

--- create-project-intellij.cmd
+++ create-project-intellij.cmd
@@ -1,7 +0,0 @@
-@echo off
-
-set PATH=%PATH%;"C:\Program Files\Java\jdk1.7.0_71\bin"
-
-gradlew genIntellijRuns
-
-pause


updater renovation

updater renovation

--- Update_S3.bat
+++ Update_S3.bat
@@ -1,14 +1,17 @@
 @echo off
-If Not Exist updater.hashfile call certUtil -hashfile config.js md5 > updater.hashfile
-call certUtil -hashfile config.js md5 > updater_temp.hashfile
-call FC updater.hashfile updater_temp.hashfile >NUL && set stash=0 || set stash=1
-del /f updater_temp.hashfile
-if "%stash%" == "1" (call git stash)
-echo S3 Updating...
+for /f %%i in ('call git status --porcelain') do set stash=%%i
+if not [%stash%] == [] (
+  echo Stashing local changes...
+  call git add .
+  call git stash -q
+)
+echo Updating S3 App...
 call git pull origin master
-call certUtil -hashfile config.js md5 > updater.hashfile
-if "%stash%" == "1" (call git stash apply)
-echo S3 Updating Dependencies...
+if not [%stash%] == [] (
+  echo Restoring local changes...
+  call git stash apply -q
+)
+echo Updating S3 Dependencies...
 call npm update
 echo Done
-pause+pause


Let's see if tcl/tk test runs on windows buildbot with this fix.

--- PCbuild/rt.bat
+++ PCbuild/rt.bat
@@ -30,7 +30,7 @@
 set suffix=
 set qmode=
 set dashO=
-set tcltk=
+set tcltk=tcltk

 :CheckOpts
 if "%1"=="-O" (set dashO=-O)     & shift & goto CheckOpts


removed debugging code

removed debugging code

--- scripts/copy_src_python.bat
+++ scripts/copy_src_python.bat
@@ -1,7 +1,6 @@
+@ECHO OFF
+
 SET VSREDIST=%1%
-ECHO Visual studio redist directory is %VSREDIST%
-PAUSE Press return to continue...
-@ECHO OFF

 REM ############################################################################
 REM # Copy master __init__.py file, plus LICENCE, CHANGES, README, and INSTALL #


Remove compiler setup script as we are using conda and mingw.

--- run_with_env.cmd
+++ run_with_env.cmd
@@ -1,47 +0,0 @@
-:: To build extensions for 64 bit Python 3, we need to configure environment
-:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
-:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1)
-::
-:: To build extensions for 64 bit Python 2, we need to configure environment
-:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of:
-:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0)
-::
-:: 32 bit builds do not require specific environment configurations.
-::
-:: Note: this script needs to be run with the /E:ON and /V:ON flags for the
-:: cmd interpreter, at least for (SDK v7.0)
-::
-:: More details at:
-:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
-:: http://stackoverflow.com/a/13751649/163740
-::
-:: Author: Olivier Grisel
-:: License: BSD 3 clause
-@ECHO OFF
-
-SET COMMAND_TO_RUN=%*
-SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
-
-SET MAJOR_PYTHON_VERSION="%PYTHON_VERSION:~0,1%"
-IF %MAJOR_PYTHON_VERSION% == "2" (
-    SET WINDOWS_SDK_VERSION="v7.0"
-) ELSE IF %MAJOR_PYTHON_VERSION% == "3" (
-    SET WINDOWS_SDK_VERSION="v7.1"
-) ELSE (
-    ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
-    EXIT 1
-)
-
-IF "%PYTHON_ARCH%"=="64" (
-    ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
-    SET DISTUTILS_USE_SDK=1
-    SET MSSdk=1
-    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
-    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
-    ECHO Executing: %COMMAND_TO_RUN%
-    call %COMMAND_TO_RUN% || EXIT 1
-) ELSE (
-    ECHO Using default MSVC build environment for 32 bit architecture
-    ECHO Executing: %COMMAND_TO_RUN%
-    call %COMMAND_TO_RUN% || EXIT 1
-)


Changed the way that the provisioning script/KB2999226.cmd determines the platform flavor from using a double-find with an errorlevel check to actual token parsing using "for /f".

--- script/KB2999226.cmd
+++ script/KB2999226.cmd
@@ -47,12 +47,16 @@
   for /f "tokens=*" %%v in ("%%b") do set "PlatformVersionMinor=%%v"
 )

+:: Get the PlatformFlavor from SystemInfo
+for /f "delims=:; tokens=1,2" %%a in ('systeminfo') do (
+  if "%%a" == "OS Name" set "PlatformFlavorRow=%%b"
+)
+
 :: Detect whether we're using a server or client flavor
-systeminfo | find "OS Name:" | find /c "Microsoft Windows Server" >NUL
-if errorlevel 1 (
-    set "PlatformFlavor=Client"
+for /f "tokens=1,2,3" %%a in ("%PlatformFlavorRow%") do if "%%a" == "Microsoft" if "%%b" == "Windows" if "%%c" == "Server" (
+  set "PlatformFlavor=Server"
 ) else (
-    set "PlatformFlavor=Server"
+  set "PlatformFlavor=Client"
 )

 echo ==^> Detected Windows Platform Version ^(%PlatformFlavor%^): %PlatformVersionMajor%.%PlatformVersionMinor%


serve bat

serve bat

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

--- serve.bat
+++ serve.bat
@@ -0,0 +1 @@
+jekyll serve


Update Setup file for new VC versions.

Update Setup file for new VC versions.

--- setup.cmd
+++ setup.cmd
@@ -16,65 +16,45 @@
 @echo off

 REM =====================================================================================
-if "a" == "a%MPC_ROOT%" set MPC_ROOT=c:\MPC
-if "a" == "a%BOOST_VERSION%" set BOOST_VERSION=boost_1_57_0
+if "a" == "a%MPC_ROOT%" set MPC_ROOT=c:\MPC\MPC
+if "a" == "a%BOOST_VERSION%" set BOOST_VERSION=boost_1_61_0
 if "a" == "a%BOOST_ROOT%" set BOOST_ROOT=c:\boost\%BOOST_VERSION%
-if "a" == "a%BOOST_LIB_DIRECTORY%" set BOOST_LIB_DIRECTORY=x64\lib
-if "a" == "a%BOOST_LIB_PATH%" set BOOST_LIB_PATH=%BOOST_ROOT%\%BOOST_LIB_DIRECTORY%
 REM END OF VALUES TO BE SET
 REM =====================================================================================
+
 REM Microsoft moved 32 bit apps to a new program files directory on 64 bit systems
 set PROGRAM_FILES_X86=Program Files
 if exist "C:\Program Files (x86)" set PROGRAM_FILES_X86=Program Files (x86)
-
-REM Verify setup by checking for expected files/directories
-set SETUP_CHECKING=MPC_ROOT=%MPC_ROOT%
-if not exist "%MPC_ROOT%\mpc.pl" goto setup_is_bad
-
-set SETUP_CHECKING=BOOST_ROOT=%BOOST_ROOT%
-if not exist "%BOOST_ROOT%\boost" goto setup_is_bad
-
-set SETUP_CHECKING=BOOST_LIB_PATH="%BOOST_LIB_PATH%"
-if not exist "%BOOST_LIB_PATH%" goto setup_is_bad

 REM Find visual studio.
 REM You can short-circuit this by setting VCVER before running this
 REM However this also avoids the check to see if VC is installed in the expected place.
 set SETUP_CHECKING=Setup checking visual studio common tools
-if not "a" == "a%VCVER%" goto setup_is_ok
+if not "a" == "a%VCVER%" goto vcver_is_ok

 set VCVER=15
 set SETUP_CHECKING=VS150COMNTOOLS=%VS150COMNTOOLS%
-if exist "%VS150COMNTOOLS%VSVARS32.BAT" goto setup_is_ok
+if exist "%VS150COMNTOOLS%VSVARS32.BAT" goto vcver_is_ok

 set VCVER=14
 set SETUP_CHECKING=VS140COMNTOOLS=%VS140COMNTOOLS%
-if exist "%VS140COMNTOOLS%VSVARS32.BAT" goto setup_is_ok
+if exist "%VS140COMNTOOLS%VSVARS32.BAT" goto vcver_is_ok

 set VCVER=12
 set SETUP_CHECKING=VS120COMNTOOLS=%VS120COMNTOOLS%
-if exist "%VS120COMNTOOLS%VSVARS32.BAT" goto setup_is_ok
+if exist "%VS120COMNTOOLS%VSVARS32.BAT" goto vcver_is_ok

 set VCVER=11
 set SETUP_CHECKING=VS110COMNTOOLS=%VS110COMNTOOLS%
-if exist "%VS110COMNTOOLS%VSVARS32.BAT" goto setup_is_ok
+if exist "%VS110COMNTOOLS%VSVARS32.BAT" goto vcver_is_ok

 set VCVER=10
 set SETUP_CHECKING=VS100COMNTOOLS=%VS100COMNTOOLS%
-if exist "%VS100COMNTOOLS%VSVARS32.BAT" goto setup_is_ok
+if exist "%VS100COMNTOOLS%VSVARS32.BAT" goto vcver_is_ok

-REM goto setup_is_bad  (you are here)
+goto setup_is_bad

-:setup_is_bad
-ECHO Setup check failed: %SETUP_CHECKING%
-ECHO Edit the setup.cmd file or change environment variables
-goto end
-
-:setup_is_ok
-set SETUP_CHECKING=
-
-set HighQueue_ROOT=%CD%
-
+:vcver_is_ok
 rem must be outside the if because of the parens in the directory name [what was microsoft thinking?]
 if %VCVER%==15 goto isVC15
 if %VCVER%==14 goto isVC14
@@ -94,6 +74,23 @@

 :vcIsSet

+if "a" == "a%BOOST_LIB_DIRECTORY%" set BOOST_LIB_DIRECTORY=lib64-msvc-%VCVER%.0
+if "a" == "a%BOOST_LIB_PATH%" set BOOST_LIB_PATH=%BOOST_ROOT%\%BOOST_LIB_DIRECTORY%
+
+REM Verify setup by checking for expected files/directories
+set SETUP_CHECKING=MPC_ROOT=%MPC_ROOT%
+if not exist "%MPC_ROOT%\mpc.pl" goto setup_is_bad
+
+set SETUP_CHECKING=BOOST_ROOT=%BOOST_ROOT%
+if not exist "%BOOST_ROOT%\boost" goto setup_is_bad
+
+set SETUP_CHECKING=BOOST_LIB_PATH="%BOOST_LIB_PATH%"
+if not exist "%BOOST_LIB_PATH%" goto setup_is_bad
+
+set SETUP_CHECKING=
+
+set HighQueue_ROOT=%CD%
+
 echo Found MPC at: %MPC_ROOT%
 echo Found BOOST at: %BOOST_ROOT%
 echo Found Visual Studio version %VCVER%
@@ -102,14 +99,21 @@
 if "a" == "a%BASE_PATH%" set BASE_PATH=%PATH%
 if "a" == "a%BASE_INCLUDE%" set BASE_INCLUDE=%INCLUDE%

-set RELEASE64_PATH=%HighQueue_ROOT%\bin;%HighQueue_ROOT%\Output\Release;%MPC_ROOT%;%BOOST_ROOT%\x64\lib;%HighQueue_ROOT%\lib;%BASE_PATH%
-set DEBUG64_PATH=%HighQueue_ROOT%\bin;%HighQueue_ROOT%\Output\Debug;%MPC_ROOT%;%BOOST_ROOT%\x64\lib;%HighQueue_ROOT%\lib;%BASE_PATH%
-set RELEASE32_PATH=%HighQueue_ROOT%\bin;%HighQueue_ROOT%\Output\Release;%MPC_ROOT%;%BOOST_ROOT%\x86\lib;%HighQueue_ROOT%\lib;%BASE_PATH%
-set DEBUG32_PATH=%HighQueue_ROOT%\bin;%HighQueue_ROOT%\Output\Debug;%MPC_ROOT%;%BOOST_ROOT%\x86\lib;%HighQueue_ROOT%\lib;%BASE_PATH%
+set RELEASE64_PATH=%HighQueue_ROOT%\bin;%HighQueue_ROOT%\Output\Release;%MPC_ROOT%;%BOOST_LIB_PATH%;%HighQueue_ROOT%\lib;%BASE_PATH%
+set DEBUG64_PATH=%HighQueue_ROOT%\bin;%HighQueue_ROOT%\Output\Debug;%MPC_ROOT%;%BOOST_LIB_PATH%;%HighQueue_ROOT%\lib;%BASE_PATH%
+set RELEASE32_PATH=%HighQueue_ROOT%\bin;%HighQueue_ROOT%\Output\Release;%MPC_ROOT%;%BOOST_LIB_PATH%;%HighQueue_ROOT%\lib;%BASE_PATH%
+set DEBUG32_PATH=%HighQueue_ROOT%\bin;%HighQueue_ROOT%\Output\Debug;%MPC_ROOT%;%BOOST_LIB_PATH%;%HighQueue_ROOT%\lib;%BASE_PATH%
 set PATH=%RELEASE64_PATH%
 set INCLUDE=%BOOST_ROOT%;%BASE_INCLUDE%

 title HighQueue
+goto end
+
+:setup_is_bad
+ECHO Setup check failed: %SETUP_CHECKING%
+ECHO Edit` the setup.cmd file or change environment variables
+goto end
+
 :end


update script

update script

--- build_script.bat
+++ build_script.bat
@@ -5,8 +5,8 @@
 goto custom_python:

 :default_value_python:
-set pythonexe="c:\Python363_x64\python"
-if not exist %pythonexe% set pythonexe="c:\Python36_x64\python"
+set pythonexe="c:\Python363_x64\python.exe"
+if not exist %pythonexe% set pythonexe="c:\Python36_x64\python.exe"
 :custom_python:
 @echo [python] %pythonexe%
 %pythonexe% -u setup.py build_script


Making some improvements to the setup script.

--- setup.bat
+++ setup.bat
@@ -1,6 +1,6 @@
 @echo off
 set /p name="Enter your application name: " %=%

-fart -r *.cs,*.xaml,*.xml,*.csproj "Bootstrap" %name%
+fart -r -a -i *.cs,*.xaml,*.xml,*.csproj "Bootstrap" %name%
 fart -f *.* "Bootstrap" %name%
-fart -r *.csproj,*.user,*.sln "Bootstrap" %name%+fart -r -a -i *.csproj,*.user,*.sln "Bootstrap" %name%


Updates setup.bat for Windows to be nicer (closes #146)

--- setup.bat
+++ setup.bat
@@ -1,7 +1,8 @@
 @ECHO OFF

 echo.
-echo Welcome %USERNAME%!
+echo Hello %USERNAME%!
+echo.
 echo "This setup will guide you through the process of installing mobilot on your machine."
 echo.

@@ -10,7 +11,7 @@
 IF NOT "%answer%"=="n" (

   echo.
-  echo ^> Creating folders under "app/storage/" ...
+  echo ^> Creating storage folders "app/storage/" ...
   mkdir app\storage\logs
   mkdir app\storage\cache
   mkdir app\storage\meta
@@ -18,11 +19,12 @@
   mkdir app\storage\views

   echo.
-  echo ^> Creating folders under "public/" ...
+  echo ^> Creating uploads folder "public/" ...
   mkdir public\upload

   echo.
   echo ^> composer install
+  echo One moment please ...
   call composer install

   echo.
@@ -31,7 +33,7 @@
 )

 IF "%answer%"=="n" (
-  echo ^>  Create a database named "mobilot" and than run this script again
+  echo ^>  Create a database named "mobilot" and than run this script again.
   exit /b
 )

@@ -53,12 +55,34 @@
 @xcopy /s /I setup %location%

 echo.
-SET /p answer3= ^> IMPORTANT: Configure %location% before continuing (press ENTER)
+SET /p answer3= ^> IMPORTANT: Configure %location% before continuing (press ENTER). Note that for some local environments (such as MAMP) you might need to specify a unix_socket.
+
 echo.
+echo ^> php artisan migrate
+echo One moment please ...
 call php artisan migrate

 echo.
+SET /p answer5= ^> Finally let us take a deep breath ... ... and install npm and bower modules! (press ENTER)
+echo ^> npm install
+npm install
+
+echo ^> bower install
+echo "When asked, always choose the later module versions required by Mobilot."
+cd public
+bower install
+
+echo.
 echo ^> Mobilot setup completed!
+
+echo.
+echo Hints:
+echo ^> To manually serve Mobilot run: php artisan serve
+echo ^> If something went wrong on the way like mistyping or misconfiguring the "database.php", you can confidently try repeating the process.
+echo.
+echo Further help  – https://github.com/fhstp-mfg/mobilot/wiki/Setup
+echo Report issues – https://github.com/fhstp-mfg/mobilot/issues
+echo.

 SET /p answer4= ^> Would you like to serve Mobilot now? (Y/n)

@@ -70,5 +94,5 @@
   echo ^> INFO: To serve Mobilot run: "php artisan serve"
 )

-echo ^> Good bye!
+echo ^> Good bye then :)
 exit /b 0


Distribution build

Distribution build

--- setup.cmd
+++ setup.cmd
@@ -11,4 +11,4 @@

 call "%ProgramFiles%\nodejs\nodevars.bat"
 cd %~dp0
-call npm install+call npm install --save-dev


Turn Lean and Mean ON

Turn Lean and Mean ON

--- pcmaker/buildvtk.bat
+++ pcmaker/buildvtk.bat
@@ -55,7 +55,7 @@

 echo beginning pcmaker config at >> %vtk_build_log%
 time /t >> %vtk_build_log%
-%vtk_source_tree%\pcmaker\Debug\pcmaker.exe %vtk_source_tree% %vtk_build_tree% c:\msdev 0 1 0 1 1 0 0 0 0 1 1 0 0 >> %vtk_build_log%
+%vtk_source_tree%\pcmaker\Debug\pcmaker.exe %vtk_source_tree% %vtk_build_tree% c:\msdev 0 1 0 1 1 1 0 0 0 1 1 0 0 >> %vtk_build_log%
 rem          | | | | | | | | | | | | DFA
 rem          | | | | | | | | | | | geae
 rem          | | | | | | | | | | gemsvolume


Commented out some safe and useful apps

Commented out some safe and useful apps

Removed entries related to creating recovery media and/or reimaging machine since these may actually be needed if system is not repairable.

Removed some Cyberlink entries for DVD/BD playback since Windows 8/8.1 does not come with first party software to play physical media movies.

Removed some Adobe CS tools that are still being used by some older suites

Removed Dell Quickset and Asus ATK since they are hotkey drivers for laptops that control volume, brightness, keyboard LED backlighting (have been known to cause error codes in DevMan if missing)

Removed MS mouse and keyboard center since this is the driver and macro button configure tool for microsoft mice and keyboards

Removed Intel Rapid Storage Technology (not to be confused with Rapid Start Technology) since this is a necessary driver in most Vista/7 systems. Systems may not be able to use Windows Update without this installed. Known bug in Windows 7 pre SP1.

Removed ClickFree since this is a legit external backup software.

Removed Hp SimplePass since this is the fingerprint reader driver and can produce an error code in DevMan if missing.

--- resources/stage_2_de-bloat/oem/programs_to_target_by_GUID.bat
+++ resources/stage_2_de-bloat/oem/programs_to_target_by_GUID.bat
@@ -47,8 +47,8 @@
 :: Acer Quick Access
 start /wait msiexec /qn /norestart /x {C1FA525F-D701-4B31-9D32-504FC0CF0B98}

-:: Acer Recovery Management
-start /wait msiexec /qn /norestart /x {07F2005A-8CAC-4A4B-83A2-DA98A722CA61}
+:: Acer Recovery Management // Disabled by /u/kamakaze_chickn for Tron
+::start /wait msiexec /qn /norestart /x {07F2005A-8CAC-4A4B-83A2-DA98A722CA61}

 :: Acer User Experience Improvement Program Framework and associated GUIDs
 start /wait msiexec /qn /norestart /x {12A718F2-2357-4D41-9E1F-18583A4745F7}
@@ -72,8 +72,8 @@
 start /wait msiexec /qn /norestart /x {FABDFEBE-A430-48B4-89F2-B35594E43965}
 start /wait msiexec /qn /norestart /x {902C3D36-9254-437D-98AC-913B78E60864}

-:: Adobe Bridge 1.0
-start /wait msiexec /qn /norestart /x {B74D4E10-1033-0000-0000-000000000001}
+:: Adobe Bridge 1.0 // Disabled by /u/kamakaze_chickn for Tron
+::start /wait msiexec /qn /norestart /x {B74D4E10-1033-0000-0000-000000000001}

 :: Adobe Content Viewer
 start /wait msiexec /qn /norestart /x {483A865C-A74A-12BF-1276-D0111A488F50}
@@ -81,8 +81,8 @@
 :: Adobe Community Help
 start /wait msiexec /qn /norestart /x {A127C3C0-055E-38CF-B38F-1E85F8BBBFFE}

-:: Adobe Common File Installer
-start /wait msiexec /qn /norestart /x {8EDBA74D-0686-4C99-BFDD-F894678E5B39}
+:: Adobe Common File Installer // Disabled by /u/kamakaze_chickn for Tron
+::start /wait msiexec /qn /norestart /x {8EDBA74D-0686-4C99-BFDD-F894678E5B39}

 :: Adobe Download Assistant
 start /wait msiexec /qn /norestart /x {5C804EBB-475F-4555-A225-1D6573F158BD}
@@ -209,8 +209,8 @@
 :: ASUS Ai Charger
 start /wait msiexec /qn /norestart /x {7FB64E72-9B0E-4460-A821-040C341E414A}

-:: ASUS ATK Package
-start /wait msiexec /qn /norestart /x {AB5C933E-5C7D-4D30-B314-9C83A49B94BE}
+:: ASUS ATK Package // Disabled by /u/kamakaze_chickn for Tron
+::start /wait msiexec /qn /norestart /x {AB5C933E-5C7D-4D30-B314-9C83A49B94BE}

 :: ASUS AudioWizard
 start /wait msiexec /qn /norestart /x {57E770A2-2BAF-4CAA-BAA3-BD896E2254D3}
@@ -1119,8 +1119,8 @@
 start /wait msiexec /qn /norestart /x {546D97C7-9DF6-4A2D-BE02-2C0B25FFE1E3}
 start /wait msiexec /qn /norestart /x {39688AE1-0398-4133-942C-EECA9BBD64CC}

-:: Clickfree
-start /wait msiexec /qn /norestart /x {1EB9B986-CECA-4E05-B454-C9343EE9DDE7}
+:: Clickfree // Disabled by /u/kamakaze_chickn for Tron
+::start /wait msiexec /qn /norestart /x {1EB9B986-CECA-4E05-B454-C9343EE9DDE7}

 :: Comcast Desktop Software (v1.2.0.9) 23
 start /wait msiexec /qn /norestart /x {CEF7211D-CE3A-44C4-B321-D84A2099AE94}
@@ -1163,13 +1163,13 @@
 start /wait msiexec /qn /norestart /x {40BF1E83-20EB-11D8-97C5-0009C5020658}
 start /wait msiexec /qn /norestart /x {34D95765-2D5A-470F-A39F-BC9DEAAAF04F}

-:: CyberLink PowerDVD
-start /wait msiexec /qn /norestart /x {D6E853EC-8960-4D44-AF03-7361BB93227C}
-start /wait msiexec /qn /norestart /x {DEC235ED-58A4-4517-A278-C41E8DAEAB3B}
-start /wait msiexec /qn /norestart /x {A8516AC9-AAF1-47F9-9766-03E2D4CDBCF8}
-start /wait msiexec /qn /norestart /x {CB099890-1D5F-11D5-9EA9-0050BAE317E1}
-start /wait msiexec /qn /norestart /x {2BF2E31F-B8BB-40A7-B650-98D28E0F7D47}
-start /wait msiexec /qn /norestart /x {B46BEA36-0B71-4A4E-AE41-87241643FA0A}
+:: CyberLink PowerDVD // Disabled by /u/kamakaze_chickn for Tron
+::start /wait msiexec /qn /norestart /x {D6E853EC-8960-4D44-AF03-7361BB93227C}
+::start /wait msiexec /qn /norestart /x {DEC235ED-58A4-4517-A278-C41E8DAEAB3B}
+::start /wait msiexec /qn /norestart /x {A8516AC9-AAF1-47F9-9766-03E2D4CDBCF8}
+::start /wait msiexec /qn /norestart /x {CB099890-1D5F-11D5-9EA9-0050BAE317E1}
+::start /wait msiexec /qn /norestart /x {2BF2E31F-B8BB-40A7-B650-98D28E0F7D47}
+::start /wait msiexec /qn /norestart /x {B46BEA36-0B71-4A4E-AE41-87241643FA0A}

 :: CyberLink PowerDirector // PowerProducer // PowerRecover
 start /wait msiexec /qn /norestart /x {607679B0-485D-45B0-A5FA-7464130FE570}
@@ -1192,8 +1192,8 @@
 :: CyberLink PowerDirector 12
 start /wait msiexec /qn /norestart /x {E1646825-D391-42A0-93AA-27FA810DA093}

-:: CyberLink Power Media Player 14
-start /wait msiexec /qn /norestart /x {32C8E300-BDB4-4398-92C2-E9B7D8A233DB}
+:: CyberLink Power Media Player 14 // Disabled by /u/kamakaze_chickn for Tron
+::start /wait msiexec /qn /norestart /x {32C8E300-BDB4-4398-92C2-E9B7D8A233DB}

 :: CyberLink LabelPrint
 start /wait msiexec /qn /norestart /x {C59C179C-668D-49A9-B6EA-0121CCFC1243}
@@ -1206,16 +1206,16 @@
 :: Dell Access
 start /wait msiexec /qn /norestart /x {F839C6BD-E92E-48FA-9CE6-7BFAF94F7096}

-:: Dell Backup and Recovery Manager
-start /wait msiexec /qn /norestart /x {975DFE7C-8E56-45BC-A329-401E6B1F8102}
-start /wait msiexec /qn /norestart /x {50B4B603-A4C6-4739-AE96-6C76A0F8A388}
-start /wait msiexec /qn /norestart /x {731B0E4D-F4C7-450C-95B0-E1A3176B1C75}
-start /wait msiexec /qn /norestart /x {AB2FDE4F-6BED-4E9E-B676-3DCCEBB1FBFE}
-start /wait msiexec /qn /norestart /x {43CAC9A1-1993-4F65-9096-7C9AFC2BBF54}
-start /wait msiexec /qn /norestart /x {97308CC9-FAED-4A1C-9593-64B2F1FD852D}
-start /wait msiexec /qn /norestart /x {4DEF2722-7EB8-4C5F-8F0A-0295A310002A}
-start /wait msiexec /qn /norestart /x {AE9EB677-66F4-40C0-9269-35067D8C555B}
-if exist %SystemDrive%\dell\dbrm rd /s /q %SystemDrive%\dell\dbrm
+:: Dell Backup and Recovery Manager // Disabled by /u/kamakaze_chickn for Tron
+::start /wait msiexec /qn /norestart /x {975DFE7C-8E56-45BC-A329-401E6B1F8102}
+::start /wait msiexec /qn /norestart /x {50B4B603-A4C6-4739-AE96-6C76A0F8A388}
+::start /wait msiexec /qn /norestart /x {731B0E4D-F4C7-450C-95B0-E1A3176B1C75}
+::start /wait msiexec /qn /norestart /x {AB2FDE4F-6BED-4E9E-B676-3DCCEBB1FBFE}
+::start /wait msiexec /qn /norestart /x {43CAC9A1-1993-4F65-9096-7C9AFC2BBF54}
+::start /wait msiexec /qn /norestart /x {97308CC9-FAED-4A1C-9593-64B2F1FD852D}
+::start /wait msiexec /qn /norestart /x {4DEF2722-7EB8-4C5F-8F0A-0295A310002A}
+::start /wait msiexec /qn /norestart /x {AE9EB677-66F4-40C0-9269-35067D8C555B}
+::if exist %SystemDrive%\dell\dbrm rd /s /q %SystemDrive%\dell\dbrm

 :: Dell Best of Web 1.00.0000
 start /wait msiexec /qn /norestart /x {BC8233D8-59BA-4D40-92B9-4FDE7452AA8B}
@@ -1442,9 +1442,9 @@
 :: Dell Protected Workspace
 wmic product where name="Dell Protected Workspace" call uninstall /nointeractive 2>nul

-:: Dell QuickSet32 and QuickSet64
-start /wait msiexec /qn /norestart /x {ED2A3C11-3EA8-4380-B59C-F2C1832731B0}
-start /wait msiexec /qn /norestart /x {C4972073-2BFE-475D-8441-564EA97DA161}
+:: Dell QuickSet32 and QuickSet64 // Disabled by /u/kamakaze_chickn for Tron
+::start /wait msiexec /qn /norestart /x {ED2A3C11-3EA8-4380-B59C-F2C1832731B0}
+::start /wait msiexec /qn /norestart /x {C4972073-2BFE-475D-8441-564EA97DA161}

 :: Dell Resource CD
 start /wait msiexec /qn /norestart /x {42929F0F-CE14-47AF-9FC7-FF297A603021}
@@ -1511,7 +1511,7 @@
 start /wait msiexec /qn /norestart /x {2DFA9084-CEB3-4A48-B9F7-9038FEF1B8F4}
 start /wait msiexec /qn /norestart /x {4E91898E-4DED-4B17-94F0-FA61AACCDEB0}

-:: EA Download Manager
+:: EA Download Manager (deprecated, replaced with Origin)
 start /wait msiexec /qn /norestart /x {EF7E931D-DC84-471B-8DB6-A83358095474}

 :: eBay Worldwide
@@ -1994,14 +1994,14 @@
 :: HP QuickTransfer
 start /wait msiexec /qn /norestart /x {E7004147-2CCA-431C-AA05-2AB166B9785D}

-:: HP Recovery Manager
-start /wait msiexec /qn /norestart /x {528AB81B-D65A-4AB0-A2B6-82B51A087D01}
-start /wait msiexec /qn /norestart /x {64BAA990-F1FC-4145-A7B1-E41FBBC9DA47}
-start /wait msiexec /qn /norestart /x {D817481A-193E-4332-A4F3-E19132F744F0}
-start /wait msiexec /qn /norestart /x {6369FC9E-FC8D-493F-AD87-D51FAB492705}
-start /wait msiexec /qn /norestart /x {DB97D0DE-0AA1-413C-8398-92C7FA3F4A67}
-start /wait msiexec /qn /norestart /x {4F46FDB9-B906-47BF-B3D5-C62E01B3C5EE}
-start /wait msiexec /qn /norestart /x {98C4DE92-27C8-482C-8431-514828756E80}
+:: HP Recovery Manager // Disabled by /u/kamakaze_chickn for Tron
+::start /wait msiexec /qn /norestart /x {528AB81B-D65A-4AB0-A2B6-82B51A087D01}
+::start /wait msiexec /qn /norestart /x {64BAA990-F1FC-4145-A7B1-E41FBBC9DA47}
+::start /wait msiexec /qn /norestart /x {D817481A-193E-4332-A4F3-E19132F744F0}
+::start /wait msiexec /qn /norestart /x {6369FC9E-FC8D-493F-AD87-D51FAB492705}
+::start /wait msiexec /qn /norestart /x {DB97D0DE-0AA1-413C-8398-92C7FA3F4A67}
+::start /wait msiexec /qn /norestart /x {4F46FDB9-B906-47BF-B3D5-C62E01B3C5EE}
+::start /wait msiexec /qn /norestart /x {98C4DE92-27C8-482C-8431-514828756E80}

 :: HP Registration Service
 start /wait msiexec /qn /norestart /x {D1E8F2D7-7794-4245-B286-87ED86C1893C}
@@ -2015,11 +2015,11 @@
 :: HP Setup
 start /wait msiexec /qn /norestart /x {438363A8-F486-4C37-834C-4955773CB3D3}

-:: HP SimplePass
-start /wait msiexec /qn /norestart /x {314FAD12-F785-4471-BCE8-AB506642B9A1}
-start /wait msiexec /qn /norestart /x {F1390872-2500-4408-A46C-CD16C960C661}
-start /wait msiexec /qn /norestart /x {BBEB46E1-810D-449F-A9C5-4D60F3BF187D}
-start /wait msiexec /qn /norestart /x {30E20E5D-5E4E-4874-A35A-952DB3582C29}
+:: HP SimplePass // Disabled by /u/kamakaze_chickn for Tron
+::start /wait msiexec /qn /norestart /x {314FAD12-F785-4471-BCE8-AB506642B9A1}
+::start /wait msiexec /qn /norestart /x {F1390872-2500-4408-A46C-CD16C960C661}
+::start /wait msiexec /qn /norestart /x {BBEB46E1-810D-449F-A9C5-4D60F3BF187D}
+::start /wait msiexec /qn /norestart /x {30E20E5D-5E4E-4874-A35A-952DB3582C29}

 :: HP Security Assistant 3.0.4
 start /wait msiexec /qn /norestart /x {ED1BD69A-07E3-418C-91F1-D856582581BF}
@@ -2247,10 +2247,10 @@
 :: Intel (R) Pro Alerting Agent
 start /wait msiexec /qn /norestart /x {FCDDBA94-7389-49E5-B287-2661460BAF18}

-:: Intel(R) Rapid Storage Technology
-start /wait msiexec /qn /norestart /x {96714280-14E6-4DF7-BACD-F797C0F17C3D}
-start /wait msiexec /qn /norestart /x {205AE40D-8AD7-4F29-A430-DD2168DA562D}
-start /wait msiexec /qn /norestart /x {93F692D4-0C4D-4EED-9BFE-657C1D5959FE}
+:: Intel(R) Rapid Storage Technology // Disabled by /u/kamakaze_chickn for Tron
+::start /wait msiexec /qn /norestart /x {96714280-14E6-4DF7-BACD-F797C0F17C3D}
+::start /wait msiexec /qn /norestart /x {205AE40D-8AD7-4F29-A430-DD2168DA562D}
+::start /wait msiexec /qn /norestart /x {93F692D4-0C4D-4EED-9BFE-657C1D5959FE}

 :: Intel(R) Security Assist
 start /wait msiexec /qn /norestart /x {4B230374-6475-4A73-BA6E-41015E9C5013}
@@ -2377,8 +2377,8 @@
 start /wait msiexec /qn /norestart /x {C2B5B5B0-2545-4E94-B4BA-548D4BF0B196}
 start /wait msiexec /qn /norestart /x {50816F92-1652-4A7C-B9BC-48F682742C4B}

-:: Lenovo OneKey Recovery
-start /wait msiexec /qn /norestart /x {46F4D124-20E5-4D12-BE52-EC177A7A4B42}
+:: Lenovo OneKey Recovery // Disabled by /u/kamakaze_chickn for Tron
+::start /wait msiexec /qn /norestart /x {46F4D124-20E5-4D12-BE52-EC177A7A4B42}

 :: Lenovo Patch Utility
 start /wait msiexec /qn /norestart /x {C6FB6B4A-1378-4CD3-9CD3-42BA69FCBD43}
@@ -2440,7 +2440,7 @@
 start /wait msiexec /qn /norestart /x {FD4EC278-C1B1-4496-99ED-C0BE1B0AA521}
 start /wait msiexec /qn /norestart /x {EFC9FE7C-ECE8-4282-8F77-FEDCAD374C77}

-:: Lenovo Web Start
+:: Lenovo Web Start (Pokki Start Menu)
 if exist "%LOCALAPPDATA%\Pokki\Engine\HostAppService.exe" "%LOCALAPPDATA%\Pokki\Engine\HostAppService.exe" /UNINSTALL04bb6df446330549a2cb8d67fbd1a745025b7bd1

 :: Lenovo Welcome
@@ -2526,12 +2526,12 @@
 :: Microsoft DVD App Installation for Microsoft.WindowsDVDPlayer_2019.6.11761.0_neutral_~_8wekyb3d8bbwe (x64)
 start /wait msiexec /qn /norestart /x {986E003C-E56D-5A47-110E-D3C81F0E8535}

-:: Microsoft Mouse and Keyboard Center (various versions)
-start /wait msiexec /qn /norestart /x {91150000-0051-0000-1000-0000000FF1CE}
-start /wait msiexec /qn /norestart /x {7A56D81D-6406-40E7-9184-8AC1769C4D69}
-start /wait msiexec /qn /norestart /x {B8A9EB6B-E41A-4B69-B996-3BFCFA743E5C}
-start /wait msiexec /qn /norestart /x {E20B2752-0909-4B28-B8A9-A9BE519CA1A1}
-start /wait msiexec /qn /norestart /x {22F9A831-CA56-4406-85FE-47FFB0472804}
+:: Microsoft Mouse and Keyboard Center (various versions) // Disabled by /u/kamakaze_chickn for Tron
+::start /wait msiexec /qn /norestart /x {91150000-0051-0000-1000-0000000FF1CE}
+::start /wait msiexec /qn /norestart /x {7A56D81D-6406-40E7-9184-8AC1769C4D69}
+::start /wait msiexec /qn /norestart /x {B8A9EB6B-E41A-4B69-B996-3BFCFA743E5C}
+::start /wait msiexec /qn /norestart /x {E20B2752-0909-4B28-B8A9-A9BE519CA1A1}
+::start /wait msiexec /qn /norestart /x {22F9A831-CA56-4406-85FE-47FFB0472804}

 :: Microsoft Office 15 Click-to-Run Extensibility Component (various versions)
 start /wait msiexec /qn /norestart /x {90150000-008C-0000-0000-0000000FF1CE}
@@ -2690,9 +2690,9 @@
 :: RapidBoot Shield
 start /wait msiexec /qn /norestart /x {D446E416-1045-4C70-9341-F73333DCB149}

-:: Recovery Manager
-start /wait msiexec /qn /norestart /x {44B2A0AB-412E-4F8C-B058-D1E8AECCDFF5}
-start /wait msiexec /qn /norestart /x {C7231F7C-6530-4E65-ADA6-5B392CF5BEB1}
+:: Recovery Manager (HP Reimage Software by Cyberlink) // Disabled by /u/kamakaze_chickn for Tron
+::start /wait msiexec /qn /norestart /x {44B2A0AB-412E-4F8C-B058-D1E8AECCDFF5}
+::start /wait msiexec /qn /norestart /x {C7231F7C-6530-4E65-ADA6-5B392CF5BEB1}

 :: RealDownloader
 start /wait msiexec /qn /norestart /x {C8E8D2E3-EF6A-4B1D-A09E-7B27EBE2F3CE}
@@ -2830,7 +2830,7 @@
 :: Sony Quick Web Access
 start /wait msiexec /qn /norestart /x {13EC74A6-4707-4D26-B9B9-E173403F3B08}

-:: Sony Reader for PC
+:: Sony Reader for PC (Flagged as malware by some scanners)
 start /wait msiexec /qn /norestart /x {CF5B430D-C563-4EE6-803D-A8A133DFCE5E}

 :: Sony Remote Play with Playstation(R)3
@@ -2865,12 +2865,12 @@
 start /wait msiexec /qn /norestart /x {E682702C-609C-4017-99E7-3129C163955F}
 start /wait msiexec /qn /norestart /x {07441A52-E208-478A-92B7-5C337CA8C131}

-:: Sony VAIO Care // VAIO Care Recovery // VAIO Help and Support
-start /wait msiexec /qn /norestart /x {D9FFE40D-1A85-4541-992C-5EF505F391A4}
-start /wait msiexec /qn /norestart /x {55A60C1D-BEBF-4249-BFB2-F4E5C2E77988}
-start /wait msiexec /qn /norestart /x {471F7C0A-CA3A-4F4C-8346-DE36AD5E23D1}
-start /wait msiexec /qn /norestart /x {6ED1750E-F44F-4635-8F0D-B76B9262B7FB}
-start /wait msiexec /qn /norestart /x {AD3E7141-A22E-40F1-A7A4-55E898AE35E3}
+:: Sony VAIO Care // VAIO Care Recovery // VAIO Help and Support // Disabled by /u/kamakaze_chickn for Tron
+::start /wait msiexec /qn /norestart /x {D9FFE40D-1A85-4541-992C-5EF505F391A4}
+::start /wait msiexec /qn /norestart /x {55A60C1D-BEBF-4249-BFB2-F4E5C2E77988}
+::start /wait msiexec /qn /norestart /x {471F7C0A-CA3A-4F4C-8346-DE36AD5E23D1}
+::start /wait msiexec /qn /norestart /x {6ED1750E-F44F-4635-8F0D-B76B9262B7FB}
+::start /wait msiexec /qn /norestart /x {AD3E7141-A22E-40F1-A7A4-55E898AE35E3}

 :: Sony VAIO Control Center // CPU Fan Diagnostic // Data Restore Tool // Easy Connect
 start /wait msiexec /qn /norestart /x {8E797841-A110-41FD-B17A-3ABC0641187A}
@@ -3041,8 +3041,8 @@
 :: TOSHIBARegistration
 start /wait msiexec /qn /norestart /x {5AF550B4-BB67-4E7E-82F1-2C4300279050}

-:: TOSHIBA Recovery Media Creator
-start /wait msiexec /qn /norestart /x {B65BBB06-1F8E-48F5-8A54-B024A9E15FDF}
+:: TOSHIBA Recovery Media Creator // Disabled by /u/kamakaze_chickn for Tron
+::start /wait msiexec /qn /norestart /x {B65BBB06-1F8E-48F5-8A54-B024A9E15FDF}

 :: Toshiba ReelTime
 start /wait msiexec /qn /norestart /x {24811C12-F4A9-4D0F-8494-A7B8FE46123C}
@@ -3058,8 +3058,8 @@
 start /wait msiexec /qn /norestart /x {008D69EB-70FF-46AB-9C75-924620DF191A}
 start /wait msiexec /qn /norestart /x {3FBF6F99-8EC6-41B4-8527-0A32241B5496}

-:: Toshiba System Driver
-start /wait msiexec /qn /norestart /x {16562A90-71BC-41A0-B890-D91B0C267120}
+:: Toshiba System Driver // Disabled by /u/kamakaze_chickn for Tron
+::start /wait msiexec /qn /norestart /x {16562A90-71BC-41A0-B890-D91B0C267120}

 :: Toshiba System Settings
 start /wait msiexec /qn /norestart /x {B040D5C9-C9AA-430A-A44E-696656012E61}


#160820142142

--- autocommit.bat
+++ autocommit.bat
@@ -4,6 +4,6 @@
 set _my_datetime=#%mydate%%mytime%
 git add --all
 git commit -m "%_my_datetime%"
-git push origin master
+git push heroku master

 PAUSE


cmdize.bat: more descriptive comments over vbs

--- bin/cmdize.bat
+++ bin/cmdize.bat
@@ -103,14 +103,17 @@
 del /q "%TEMP%\%~n0.$$"
 rem type "%~f1"
 for /f "tokens=1,* delims=]" %%r in ( ' call "%windir%\System32\find.exe" /n /v "" ^<"%~f1" ' ) do (
-	rem Filtering and commenting "Option Explicit". This ugly code
-	rem tries as much as possible but fails if "Option" and "Explicit"
+	rem Filtering and commenting "Option Explicit".
+	rem This ugly code tries as much as possible to recognize and
+	rem comment this directive. It fails if "Option" and "Explicit"
 	rem are located on two neighbor lines, consecutively, one by one.
 	rem But it is too hard to imagine that there is someone who
-	rem practices this coding style.
+	rem practices such a strange coding style.
 	for /f "usebackq tokens=1,2" %%a in ( '%%s' ) do if /i "%%~a" == "Option" for /f "usebackq tokens=1,* delims=:'" %%i in ( 'x%%b' ) do if /i "%%~i" == "xExplicit" (
+		echo:%~n0: Commenting Option Explicit in "%~1">&2
+		echo:rem To prevent compilation error due to embedding into a batch file,
+		echo:rem the following line was commented automatically.
 		set /p "=rem " <nul
-		echo:%~n0: Commenting Option Explicit in "%~1">&2
 	)
 	echo:%%s
 )


Really put relative paths in etwpackage.zip

--- package_etw.bat
+++ package_etw.bat
@@ -64,6 +64,7 @@
 xcopy %UIforETW%\bin\UIforETWStatic_devrel.exe %destdir%\bin\UIforETW.exe /y
 xcopy %destdir%\bin\UIforETW*.exe %~dp0bin /y

+cd /d %UIforETW%
 python %UIforETW%make_zip_file.py %UIforETW%etwpackage.zip etwpackage

 @echo Now upload the new etwpackage.zip


Clean and display .m2/repository contents in /build m2. [skip ci]

--- bin/build.cmd
+++ bin/build.cmd
@@ -107,10 +107,11 @@
     at(home).env(ISZ("SIREUM_SOURCE_BUILD" ~> "false")).console.runCheck()

   val repository = Os.home / ".m2" / "repository"
+  repository.removeAll()

   println()
   println("Artifacts")
-  for (m2p <- m2Paths; p <- (m2p / "dest").overlayMove(repository, F, F, _ => T, T).keys) {
+  for (m2p <- m2Paths; p <- (m2p / "dest").overlayMove(repository, F, F, _ => T, T).values) {
     println(s"* $p")
   }
   println()


Updated the file to rever to the latest version

git-svn-id: 90776817adfbd895fc5cfa90f675377e0a62e745@1450291 13f79535-47bb-0310-9956-ffa450edef68

--- service/apacheds.bat
+++ service/apacheds.bat
@@ -20,7 +20,7 @@
 REM this script starts ApacheDS (as non-windows-service)

 REM IF NOT exist target/apacheds-service-*.jar GOTO :MVN
-IF NOT exist target/apacheds-service-2.0.0-M8.jar GOTO :MVN
+IF NOT exist target/apacheds-service-2.0.0-M11.jar GOTO :MVN
    echo "Service jar exists"
    GOTO :JAVA

@@ -44,5 +44,5 @@

 set DEF_EXT_OP_RESP="-Ddefault.extendedOperation.responses=org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory"

-java %DEF_CTRLS% %EXT_CTRLS% %DEF_EXT_OP_REQ% %DEF_EXT_OP_RESP% -Dlog4j.configuration="file:///%cd%/target/instance/conf/log4j.properties" -jar target/apacheds-service-2.0.0-M8.jar %cd%/target/instance
+java %DEF_CTRLS% %EXT_CTRLS% %DEF_EXT_OP_REQ% %DEF_EXT_OP_RESP% -Dlog4j.configuration="file:///%cd%/target/instance/conf/log4j.properties" -jar target/apacheds-service-2.0.0-M11.jar %cd%/target/instance


Fixed gremlin console bug

Fixed gremlin console bug

git-svn-id: 9ddf022f45b579842a47abc018ed2b18cdc52108@6816 3625ad7b-9c83-922f-a72b-73d79161f2ea

--- graphdb/script/console.bat
+++ graphdb/script/console.bat
@@ -38,6 +38,7 @@

 :doneSetArgs

-call %JAVA% -client -Dorientdb.build.number="@BUILD@" -cp "%ORIENTDB_HOME%\lib\*;" com.orientechnologies.orient.graph.console.OGremlinConsole %CMD_LINE_ARGS%
+set ORIENTDB_SETTINGS=-Dcache.level1.enabled=false -Dcache.level2.enabled=false
+call %JAVA% -client %ORIENTDB_SETTINGS% -Dfile.encoding=utf-8 -Dorientdb.build.number="@BUILD@" -cp "%ORIENTDB_HOME%\lib\*;" com.orientechnologies.orient.graph.console.OGremlinConsole %CMD_LINE_ARGS%

 :end


added general info

added general info

--- start.bat
+++ start.bat
@@ -1,8 +1,12 @@
 @ECHO OFF
-ECHO This will compile a Spigot jar for you.
-ECHO This will take 10 to 15 minutes depending on how your PC handles it.
-ECHO There will be many lines of text. Don't worry, as it's all part of the process.
-ECHO Continue?
+ECHO SpigotBuilder v1.1.2
+ECHO Developed by colebob9!
+ECHO Source: github.com/colebob9/spigotbuilder
+ECHO.
+ECHO This will compile a Spigot jar for you.
+ECHO The process will take 10 to 15 minutes depending on how your PC handles it.
+ECHO Many lines of text will be on screen. Don't worry, as it's all part of the process.
+ECHO.
 PAUSE
 :BuildTools
 ECHO Downloading BuildTools...


Add Windows script for running Light Maestro.

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

--- start.cmd
+++ start.cmd
@@ -0,0 +1,2 @@
+@echo off
+c:\python33\python.exe lightmaestro.py -c LoggingConsole -p 16,4.0


Delete gradlew.bat

Delete gradlew.bat

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


Fix an error in build-test.cmd (#8890)

Fix an error in build-test.cmd (#8890)

* Fix an error in CMake Probe

* Add double qutation around %__ProjectDir

* Revert "Fix an error in CMake Probe"

This reverts commit 78be1c0a2909d633023758fdebcc558bf07e3a4c.

--- build-test.cmd
+++ build-test.cmd
@@ -105,14 +105,14 @@
 REM === Restore Build Tools
 REM ===
 REM =========================================================================================
-call %__ProjectDir%\init-tools.cmd
+call "%__ProjectDir%\init-tools.cmd"

 REM =========================================================================================
 REM ===
 REM === Resolve runtime dependences
 REM ===
 REM =========================================================================================
-call %__TestDir%\setup-runtime-dependencies.cmd /arch %__BuildArch% /outputdir %__BinDir%
+call "%__TestDir%\setup-runtime-dependencies.cmd" /arch %__BuildArch% /outputdir %__BinDir%

 if defined __UpdateInvalidPackagesArg (
   goto skipnative
@@ -170,7 +170,7 @@
 set __msbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%"
 set __msbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%"

-call %__ProjectDir%\run.cmd build -Project="%__NativeTestIntermediatesDir%\install.vcxproj" -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__msbuildNativeArgs% %__RunArgs% %__unprocessedBuildArgs%
+call "%__ProjectDir%\run.cmd" build -Project="%__NativeTestIntermediatesDir%\install.vcxproj" -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__msbuildNativeArgs% %__RunArgs% %__unprocessedBuildArgs%
 if errorlevel 1 (
     echo %__MsgPrefix%Error: build failed. Refer to the build log files for details:
     echo     %__BuildLog%
@@ -201,11 +201,11 @@
 set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root"
 set "CORE_OVERLAY=%XunitTestBinBase%\Tests\coreoverlay"

-call %__ProjectDir%\run.cmd build -Project=%__ProjectDir%\tests\build.proj  -UpdateDependencies -BatchRestorePackages -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs%
+call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\build.proj  -UpdateDependencies -BatchRestorePackages -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs%

 set __BuildLogRootName=Tests_GenerateRuntimeLayout

-call %__ProjectDir%\run.cmd build -Project=%__ProjectDir%\tests\runtest.proj -BinPlaceRef -BinPlaceProduct -CopyCrossgenToProduct -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs%
+call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\runtest.proj -BinPlaceRef -BinPlaceProduct -CopyCrossgenToProduct -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs%
 if errorlevel 1 (
     echo BinPlace of mscorlib.dll failed
     exit /b 1
@@ -218,7 +218,7 @@
         exit /b 1
     )

-    call %__ProjectDir%\run.cmd build -Project=%__ProjectDir%\tests\runtest.proj -CreateNonWindowsTestOverlay -RuntimeId="%__RuntimeId%"  -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs%
+    call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\runtest.proj -CreateNonWindowsTestOverlay -RuntimeId="%__RuntimeId%"  -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs%
     for /R %__PackagesDir%\TestNativeBins\%__RuntimeId% %%f in (*.so) do copy %%f %Core_Overlay%
     for /R %__PackagesDir%\TestNativeBins\%__RuntimeId% %%f in (*.dylib) do copy %%f %Core_Overlay%

@@ -256,7 +256,7 @@
   set __up=-updateinvalidpackageversions
 )

-call %__ProjectDir%\run.cmd build -Project=%__ProjectDir%\tests\build.proj -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__up% %__RunArgs% %__unprocessedBuildArgs%
+call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\build.proj -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__up% %__RunArgs% %__unprocessedBuildArgs%
 if errorlevel 1 (
     echo %__MsgPrefix%Error: build failed. Refer to the build log files for details:
     echo     %__BuildLog%
@@ -277,7 +277,7 @@
 set __msbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%"
 set __msbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%"

-call %__ProjectDir%\run.cmd build -Project=%__ProjectDir%\tests\runtest.proj -testOverlay -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__unprocessedBuildArgs%
+call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\runtest.proj -testOverlay -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__unprocessedBuildArgs%
 if errorlevel 1 (
     echo %__MsgPrefix%Error: build failed. Refer to the build log files for details:
     echo     %__BuildLog%


build: more platforms for release

build: more platforms for release

--- buildcross.bat
+++ buildcross.bat
@@ -2,7 +2,10 @@
 rem NOTE: see also:
 rem https://github.com/golang/go/wiki/WindowsCrossCompiling
 rem https://github.com/golang/go/wiki/InstallFromSource#install-c-tools
-for %%p in (windows_386 windows_amd64) do call :build rsrc %%p
+call :build rsrc windows_386
+call :build rsrc windows_amd64
+call :build rsrc linux_amd64
+call :build rsrc darwin_amd64
 set GOOS=
 set GOARCH=
 goto :eof
@@ -17,7 +20,7 @@
 set FNAME=%APP%_%PLATFORM%
 if "%GOOS%"=="windows" set FNAME=%FNAME%.exe
 :: Do the build
-echo %FNAME%
+echo == %FNAME% ==
 go build -i -v -o %FNAME% .
 goto :eof


Update Appveyor CI

Update Appveyor CI

--- conda/bld.bat
+++ conda/bld.bat
@@ -51,7 +51,7 @@
 rmdir toolchain /s /q

 for %%x in (%BUILD_TARGETS%) do (
-    conda build %%x -c %ANACONDA_CHANNEL% -c conda-forge
+    conda build %%x -c %ANACONDA_CHANNEL% %ANACONDA_BUILD_FLAGS%
     if %errorlevel% neq 0 (
         if exist %REPOSITORY% (
             rmdir %REPOSITORY% /s /q


Update edit.cmd

Update edit.cmd

--- edit.cmd
+++ edit.cmd
@@ -1,2 +1,3 @@
 start /B "" "C:\Program Files\Typora\Typora.exe" .\content
+php cecil.phar clean
 php cecil.phar serve -o


add the action_enter_edit_organization_level function and associated trigger

--- programs_manager/programs_manager_database/program_manager_test_database/install_program_manager_test_db.bat
+++ programs_manager/programs_manager_database/program_manager_test_database/install_program_manager_test_db.bat
@@ -75,5 +75,9 @@

 "C:\Program Files\PostgreSQL\9.6\bin\psql.exe" -h localhost -U postgres -d program_manager_test_db  -p 5432 -f C:\funda_components\programs_manager\programs_manager_database\utility_functions\trig_log_organizations_history.sql 1>> install_program_manager_test_db.log 2>>&1

+"C:\Program Files\PostgreSQL\9.6\bin\psql.exe" -h localhost -U postgres -d program_manager_test_db  -p 5432 -f ..\action_enter_edit_organization_level.sql 1>> install_program_manager_test_db.log 2>>&1
+
+"C:\Program Files\PostgreSQL\9.6\bin\psql.exe" -h localhost -U postgres -d program_manager_test_db  -p 5432 -f C:\funda_components\programs_manager\programs_manager_database\utility_functions\trig_log_organization_level_history.sql 1>> install_program_manager_test_db.log 2>>&1
+
 REM Install the master user
 "C:\Program Files\PostgreSQL\9.6\bin\psql.exe" -h localhost -U postgres -d program_manager_test_db  -p 5432 -f C:\funda_components\system_user\system_user_database\utility_functions\run_install_master_user.sql 1>> install_program_manager_test_db.log 2>>&1


Added commented-out beginnings of installing pyaudiolab.

--- topographica-win/create_python_topo/setup.bat
+++ topographica-win/create_python_topo/setup.bat
@@ -18,6 +18,15 @@
 ..\util\gunzip -c ..\..\external\Gnosis_Utils-1.2.1.tar.gz > ..\..\external\Gnosis_Utils-1.2.1.tar
 ..\util\tar xvf ..\..\external\Gnosis_Utils-1.2.1.tar
 copy ..\..\external\Gnosis_Utils-1.2.1 .
+REM REM pyaudiolab
+REM ..\util\gunzip -c ..\..\external\pyaudiolab-0.6.6.tar.gz > ..\..\external\pyaudiolab-0.6.6.tar
+REM ..\util\tar xvf ..\..\external\pyaudiolab-0.6.6.tar
+REM copy ..\..\external\pyaudiolab-0.6.6 .
+
+REM REM CEBALERT: this should be down with the libfile
+REM REM section, but by then I've lost track of where gunzip is!
+REM ..\util\gunzip -c libsndfile-1.0.17.tar.gz > libsndfile-1.0.17.tar
+REM ..\util\tar xvf libsndfile-1.0.17.tar

@@ -57,12 +66,23 @@
 c:\python24\python.exe setup.py install
 cd ..

-REM CEBALERT: why isn't the jpeg package installed? (What's it required for?)
+REM REM * ctypes
+REM start /w ctypes-1.0.1.win32-py2.4.exe
+REM
+REM REM * libsndfile
+REM move libsndfile-1.0.17\* c:\python24\libs
+
+REM REM * pyaudiolab
+REM REM cd pyaudiolab-0.6.6
+REM REM c:\python24\python.exe setup.py install
+REM cd ..
+
+REM CEBHACKALERT: add the jpeg package

 REM * weave
-REM CEBALERT: when scipy is compiled by default in the linux distribution, and it's
-REM "from scipy import weave" rather than "import weave", then remove this
+REM we just take it from scipy, since it's not available
+REM separately as a binary (unless we ourselves build it).
 xcopy /E /I c:\python24\Lib\site-packages\scipy\weave c:\python24\Lib\site-packages\weave


Fix Build.bat

Fix Build.bat

--- .build/Build.bat
+++ .build/Build.bat
@@ -1,4 +1,4 @@
-call "%VS120COMNTOOLS%VsDevCmd.bat"
+call "%VS140COMNTOOLS%VsDevCmd.bat"
 nuget.exe restore "..\Mono.Helpers.sln"
 msbuild "..\Mono.Helpers.sln" /t:Clean /p:Configuration=Release
 msbuild "..\Mono.Helpers.sln" /p:Configuration=Release


build: script updated for new Windows image (#119)

--- .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


Improved example of Windows batch file.

Improved example of Windows batch file.

--- run.example.bat
+++ run.example.bat
@@ -1,4 +1,7 @@
 REM This is an example file, please copy it to run.bat file. Then make changes there.
+
+REM Just making console window larger.
+mode con cols=120 lines=40 >nul

 REM This example shows how to generate the playlist for specified anime by id.
 node index.js --id=14373 --type=sub --action=playlist


Added osgspotlight to example set.

Added osgspotlight to example set.

git-svn-id: 23b6355f2bb369032457de4eb5f713ee134f73a8@3631 16af8721-9629-0410-8352-f15c8da7e697

--- runexamples.bat
+++ runexamples.bat
@@ -100,7 +100,7 @@
 osgscribe cow.osg

 echo osgsequence
-osgsequence cow.osg dumptruck.osg cessna.osg
+osgsequence cow.osg dumptruck.osg cessna.osg glider.osg

 echo osgshaders
 osgshaders
@@ -119,6 +119,9 @@

 echo osgspheresegment
 osgspheresegment
+
+echo osgspotlight
+osgspotlight

 echo osgstereoimage
 osgstereoimage Images/dog_left_eye.jpg Images/dog_right_eye.jpg


Fix prebuild.bat.

Fix prebuild.bat.

--- runprebuild.bat
+++ runprebuild.bat
@@ -15,7 +15,7 @@
 set bits=AnyCPU

 rem ## Default "configuration" choice ((r)elease, (d)ebug)
-set configuration=release
+set configuration=r

 rem ## Default "run compile batch" choice (y(es),n(o))
 set compile_at_end=y
@@ -25,8 +25,7 @@
 echo        Visual Studio %vstudio%
 echo        .NET Framework %framework%
 echo        %bits%x Architecture
-if %compile_at_end%==y echo And you would like to compile straight
-after prebuild...
+if %compile_at_end%==y echo And you would like to compile straight after prebuild...
 echo.
 echo Simply tap [ENTER] four times.
 echo.
@@ -42,8 +41,7 @@
 goto vstudio

 :framework
-set /p framework="Choose your .NET framework (3_5, 4_0 (Unsupported on
-VS2008)) [%framework%]: "
+set /p framework="Choose your .NET framework (3_5, 4_0 (Unsupported on VS2008)) [%framework%]: "
 if %framework%==3_5 goto bits
 if %framework%==4_0 goto frameworkcheck
 echo "%framework%" isn't a valid choice!
@@ -68,8 +66,7 @@
 goto bits

 :configuration
-set /p configuration="Choose your configuration ((r)elease or
-(d)ebug)? [%configuration%]: "
+set /p configuration="Choose your configuration ((r)elease or (d)ebug)? [%configuration%]: "
 if %configuration%==r goto final
 if %configuration%==d goto final
 if %configuration%==release goto final
@@ -93,16 +90,7 @@
 echo.
 echo Creating compile batch file for your convinence...
 if %framework%==3_5 set fpath=C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild
-if %framework%==4_0 set
-fpath=C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\msbuild
-if %bits%==64 (
-    set args=/p:Platform=x64
-    set bits=x64
-)
-if %bits%==86 (
-    set args=/p:Platform=x86
-    set bits=x86
-)
+if %framework%==4_0 set fpath=C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\msbuild
 if %bits%==x64 set args=/p:Platform=x64
 if %bits%==x86 set args=/p:Platform=x86
 if %configuration%==r  (
@@ -120,8 +108,7 @@
 echo %fpath% Aurora.sln %args% %cfg% > %filename% /p:DefineConstants=ISWIN

 echo.
-set /p compile_at_end="Done, %filename% created. Compile now? (y,n)
-[%compile_at_end%]"
+set /p compile_at_end="Done, %filename% created. Compile now? (y,n) [%compile_at_end%]"
 if %compile_at_end%==y (
     %filename%
     pause


Added --enable-release and --disable-release to the commandline ooptions.

--- configure.bat
+++ configure.bat
@@ -6,17 +6,22 @@

 if '%1' == '--enable-debug'        goto DEBUG
 if '%1' == '--disable-debug'       goto RELEASE
-set cps_release=debug
+if '%1' == '--enable-release'      goto RELEASE
+if '%1' == '--disable-release'     goto DEBUG
+set cps_plus=debug
+set cps_minus=release
 goto QMAKE

 :DEBUG
 shift
-set cps_release=debug
+set cps_plus=debug
+set cps_minus=release
 goto QMAKE

 :RELEASE
 shift
-set cps_release=release
+set cps_plus=release
+set cps_minus=debug

 :QMAKE
 cd copasi
@@ -43,8 +48,8 @@
 echo executing in copasi:
 rem  echo   for %%d in (%subdirs%) do del %%d\.qmake.internal.cache
 for %%d in (%subdirs%) do del %%d\.qmake.internal.cache
-echo   qmake "CONFIG+=%cps_release%" %1 %2
-%QTDIR%\bin\qmake "CONFIG+=%cps_release%" %1 %2
+echo   qmake "CONFIG+=%cps_plus%" "CONFIG-=%cps_minus%" %1 %2
+%QTDIR%\bin\qmake "CONFIG+=%cps_plus%" "CONFIG-=%cps_minus%" %1 %2
 nmake qmake_all
 cd ..


solution upgraded to visual studio 2015

solution upgraded to visual studio 2015

--- ClickToBuild.bat
+++ ClickToBuild.bat
@@ -1,49 +0,0 @@
-@echo off
-
-set SolutionDir=%~p0
-
-if not "%VS120COMNTOOLS%" == "" call :BuildVS120Targets
-if not "%VS140COMNTOOLS%" == "" call :BuildVS140Targets
-
-pause
-exit /b
-
-
-:BuildVS120Targets
-echo Invoking %VS120COMNTOOLS%\..\..\VC\vcvarsall.bat x86_amd64
-call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
-call :BuildTargets v120
-@goto:eof
-
-
-:BuildVS140Targets
-echo Invoking %VS140COMNTOOLS%\..\..\VC\vcvarsall.bat x86_amd64
-call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
-call :BuildTargets v140
-@goto:eof
-
-
-
-:BuildTargets
-set platformToolset=%1
-
-call :BuildTarget Release Win32 %platformToolset%
-call :BuildTarget Release x64 %platformToolset%
-
-call :BuildTarget Debug Win32 %platformToolset%
-call :BuildTarget Debug x64 %platformToolset%
-@goto:eof
-
-
-:BuildTarget
-set target=%1
-set platform=%2
-set platformToolset=%3
-
-@echo [ Building Hypodermic (%target%-%platform%-%platformToolset%) ]
-
-echo MSBuild %SolutionDir%\Hypodermic.sln /m /t:Clean /p:Configuration=%target% /p:Platform=%platform% /p:PlatformToolset=%platformToolset%
-MSBuild %SolutionDir%\Hypodermic.sln /m /t:Clean /p:Configuration=%target% /p:Platform=%platform% /p:PlatformToolset=%platformToolset%
-MSBuild %SolutionDir%\Hypodermic.sln /m /p:Configuration=%target% /p:Platform=%platform% /p:PlatformToolset=%platformToolset%
-
-@goto:eof


Fix Windows test script return value. (#533)

Using %ERRORLEVEL% inside an IF...() block captures the variable's
value as the block is entered.  Use !ERRORLEVEL! so error handling
works as expected.
Use %ERRORLEVEL% NEQ 0 in case of negative values.
Ensure zero is returned if tests passed, regardless of cleanup errors.
Refactor cmake flags to reduce duplication.

--- kokoro/windows/build.bat
+++ kokoro/windows/build.bat
@@ -56,42 +56,44 @@
   set BUILD_SHA=%KOKORO_GITHUB_COMMIT%
 )

+set CMAKE_FLAGS=-DRE2_BUILD_TESTING=OFF -GNinja -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe
+
 :: Skip building SPIRV-Tools tests for VS2013
 if %VS_VERSION% == 2013 (
-  cmake -DRE2_BUILD_TESTING=OFF -DSHADERC_SKIP_TESTS=ON -DSPIRV_SKIP_TESTS=ON -GNinja -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe ..
-) else (
-  cmake -DRE2_BUILD_TESTING=OFF -GNinja -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe ..
+  set CMAKE_FLAGS=%CMAKE_FLAGS% -DSHADERC_SKIP_TESTS=ON -DSPIRV_SKIP_TESTS=ON
 )

-if %ERRORLEVEL% GEQ 1 exit /b %ERRORLEVEL%
+cmake %CMAKE_FLAGS% ..
+if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%

 echo "Build glslang... %DATE% %TIME%"
 ninja glslangValidator
-if %ERRORLEVEL% GEQ 1 exit /b %ERRORLEVEL%
+if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%

 echo "Build everything... %DATE% %TIME%"
 ninja
-if %ERRORLEVEL% GEQ 1 exit /b %ERRORLEVEL%
+if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%

 echo "Check Shaderc for copyright notices... %DATE% %TIME%"
 ninja check-copyright
-if %ERRORLEVEL% GEQ 1 exit /b %ERRORLEVEL%
+if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
 echo "Build Completed %DATE% %TIME%"
+
+:: This lets us use !ERRORLEVEL! inside an IF ... () and get the actual error at that point.
+setlocal ENABLEDELAYEDEXPANSION

 :: ################################################
 :: Run the tests (We no longer run tests on VS2013)
 :: ################################################
-if NOT %VS_VERSION% == 2013 (
-echo "Running Tests... %DATE% %TIME%"
-ctest -C %BUILD_TYPE% --output-on-failure -j4
-if %ERRORLEVEL% GEQ 1 exit /b %ERRORLEVEL%
-echo "Tests Completed %DATE% %TIME%"
+echo "Running tests... %DATE% %TIME%"
+if %VS_VERSION% NEQ 2013 (
+  ctest -C %BUILD_TYPE% --output-on-failure -j4
+  if !ERRORLEVEL! NEQ 0 exit /b !ERRORLEVEL!
 )
+echo "Tests passed %DATE% %TIME%"

 :: Clean up some directories.
 rm -rf %SRC%\build
 rm -rf %SRC%\third_party

-
-exit /b %ERRORLEVEL%
-
+exit /b 0


Adding tests_runner.bat

Adding tests_runner.bat

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

--- tests_runner.bat
+++ tests_runner.bat
@@ -0,0 +1,5 @@
+
+call "./env/Scripts/activate"
+py.test --cov-report html --cov --doctest-modules --cache-clear --ignore=examples
+
+pause


Added batch file to make it easier to run the tests on various versions of Python

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

--- run_tests.bat
+++ run_tests.bat
@@ -0,0 +1,4 @@
+c:\Python27\python.exe -m unittest discover
+c:\Python34\python.exe -m unittest discover
+c:\Python35\python.exe -m unittest discover
+pause


patching live cpython-3.10.8 IDLE

patching live cpython-3.10.8 IDLE

https://github.com/winpython/winpython/issues/1121

--- run_complement_newbuild.bat
+++ run_complement_newbuild.bat
@@ -8,8 +8,8 @@
 rem 2021-03-13: notebook classic stuff removal
 rem 2021-05-23: use "%PYTHON%" for the executable instead of "%WINPYDIR%\python.exe"
 rem 2021-11-12: patch numba restrictor
-
-
+rem 2022-10-19 patch cpython bug https://github.com/winpython/winpython/issues/1121
+
 rem if build error, launch "WinPython Command Prompt.exe" dos ico, then try manual install of requirements.txt
 rem that is:  pip install --pre  --no-index --trusted-host=None --find-links=C:\WinP\packages.srcreq -c C:\WinP\constraints.txt -r   C:\WinP\bd39\requirements_test.txt Qt5_requirements64.txt Cod_requirements64.txt
 rem python -m pip freeze>C:\WinP\bd39\req_test150.txt between intermediate steps
@@ -46,14 +46,13 @@
 echo finish install of nteract_on_jupyter (2018-12-27)
 rem * =================
 if exist  "%WINPYDIR%\Lib\site-packages\nteract_on_jupyter" "%WINPYDIR%\Scripts\jupyter.exe" serverextension enable nteract_on_jupyter
-if exist  "%WINPYDIR%\Lib\site-packages\nteract_on_jupyter" "%WINPYDIR%\Scripts\jupyter.exe" server extension enable nteract_on_jupyter

 rem * ==================
-echo finish install of Voila (2019-07-21)
+echo finish install of nteract_on_jupyter (2018-12-27)
 rem * =================
-if exist  "%WINPYDIR%\Lib\site-packages\voila" "%WINPYDIR%\Scripts\jupyter.exe" serverextension enable voila --sys-prefix
-if exist  "%WINPYDIR%\Lib\site-packages\voila" "%WINPYDIR%\Scripts\jupyter.exe" server extension enable voila --sys-prefix
+if exist  "%WINPYDIR%\Lib\site-packages\nteract_on_jupyter" "%WINPYDIR%\Scripts\jupyter.exe" serverextension enable nteract_on_jupyter
+if exist  "%WINPYDIR%\Lib\site-packages\nteract_on_jupyter" "%WINPYDIR%\Scripts\jupyter.exe" server extension enable nteract_on_jupyter

@@ -76,6 +75,18 @@
    "%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r%this_source%, 'read_text()', 'read_text(encoding='+chr(39)+'utf-8'+chr(39)+')' )"
    "%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r%this_source%, 'join(self.lines))', 'join(self.lines), encoding='+chr(39)+'utf-8'+chr(39)+')' )"
 )
+
+
+rem * ===========================
+rem 2022-10-19 patch cpython bug https://github.com/winpython/winpython/issues/1121
+rem * ===========================
+set qt56p=%WINPYDIR%\Lib\idlelib\macosx.py
+if exist  "%qt56p%" (
+  "%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%WINPYDIR%\Lib\idlelib\macosx.py', 'from test.support ', '#stonebig  patch cpython/pull/98313/files:  from test.support' )"
+  echo "DID I patch numba%??"
+) else (
+  echo "I DIDN'T patch of numba !"
+)

 rem * ===========================
 rem 2021-11-12: patch numba-0.54.1 restrictor


exit /b

exit /b

--- bin/test-box-virtualbox.bat
+++ bin/test-box-virtualbox.bat
@@ -75,4 +75,4 @@
 exit /b

 :done
-exit %result%
+exit /b %result%


we don't want this here anymore

we don't want this here anymore

--- release/armitage-windows/armitage-debug.bat
+++ release/armitage-windows/armitage-debug.bat
@@ -1,2 +0,0 @@
-java -jar armitage.jar
-


Added new tasks to disable from Windows 10.

Signed-off-by: anex5 <56b5d6c4009d4ecf6dc83c29940abaab2935d225@gmail.com>

--- sctacsks_disable.cmd
+++ sctacsks_disable.cmd
@@ -43,6 +43,41 @@
 echo."\Microsoft\Windows\Media Center\SqlLiteRecoveryTask">> %FN%
 echo."\Microsoft\Windows\Media Center\UpdateRecordPath" >> %FN%

+echo."Microsoft\Windows\Speech\SpeechModelDownloadTask">> %FN%
+echo."Microsoft\Windows\SpacePort\SpaceAgentTask">> %FN%
+echo."Microsoft\Windows\SpacePort\SpaceManagerTask">> %FN%
+echo."Microsoft\Windows\NlaSvc\WiFiTask">> %FN%
+echo."Microsoft\Windows\WCM\WiFiTask">> %FN%
+echo."Microsoft\Windows\Management\Provisioning\Logon">> %FN%
+echo."Microsoft\Windows\License Manager\TempSignedLicenseExchange">> %FN%
+echo."Microsoft\Windows\ErrorDetails\EnableErrorDetailsUpdate">> %FN%
+echo."Microsoft\Windows\ErrorDetails\ErrorDetailsUpdate">> %FN%
+echo."Microsoft\Windows\DUSM\dusmtask">> %FN%
+echo."Microsoft\XblGameSave\XblGameSaveTask">> %FN%
+echo."Microsoft\XblGameSave\XblGameSaveTaskLogon">> %FN%
+echo."Microsoft\Windows\Device Information\Device">> %FN%
+echo."Microsoft\Windows\ApplicationData\appuriverifierinstall">> %FN%
+echo."Microsoft\Windows\ApplicationData\appuriverifierdaily">> %FN%
+echo."Microsoft\Windows\Windows Media Sharing\UpdateLibrary">> %FN%
+echo."Microsoft\Windows\WDI\ResolutionHost">> %FN%
+echo."Microsoft\Windows\Mobile Broadband Accounts\MNO Metadata Parser">> %FN%
+echo."Microsoft\Windows\Location\Notifications">> %FN%
+echo."Microsoft\Windows\Location\WindowsActionDialog">> %FN%
+echo."Microsoft\Windows\RetailDemo\CleanupOfflineContent">> %FN%
+echo."Microsoft\Windows\Windows Error Reporting\QueueReporting">> %FN%
+echo."Microsoft\Windows\Shell\FamilySafetyMonitor">> %FN%
+echo."Microsoft\Windows\Shell\FamilySafetyMonitorToastTask">> %FN%
+echo."Microsoft\Windows\Shell\FamilySafetyRefreshTask">> %FN%
+echo."Microsoft\Windows\Power Efficiency Diagnostics\AnalyzeSystem">> %FN%
+echo."Microsoft\Windows\Maintenance\WinSAT">> %FN%
+echo."Microsoft\Windows\FileHistory\File History (maintenance mode)">> %FN%
+echo."Microsoft\Windows\Data Integrity Scan\Data Integrity Scan">> %FN%
+echo."Microsoft\Windows\Data Integrity Scan\Data Integrity Scan for Crash Recovery">> %FN%
+echo."Microsoft\Windows\DiskFootprint\StorageSense">> %FN%
+echo."Microsoft\Windows\DiskFootprint\Diagnostics">> %FN%
+echo."Microsoft\Windows\DiskCleanup\SilentCleanup">> %FN%
+
+
 for /f "tokens=* delims=," %%f in (.\%FN%) do (
   @echo.Отключение %%f
   start "" /b /w %WINDIR%\SysWOW64\schtasks.exe /Change /TN %%f /DISABLE


Forgot to add a file from the last commit.

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

--- Release/UpdateReleaseBinaries.cmd
+++ Release/UpdateReleaseBinaries.cmd
@@ -0,0 +1,17 @@
+@echo off
+
+cd "%0\..\"
+echo Current Folder: %CD%
+echo This script will update the release binaries with the latest successful release build.
+pause
+
+xcopy /Y /D ..\Source\bin\Release\*.* ".NET 4.0\"
+xcopy /Y /D ..\Source\bin\Release\x64\*.* ".NET 4.0\x64\"
+xcopy /Y /D ..\Source\bin\Release\x86\*.* ".NET 4.0\x86\"
+
+xcopy /Y /D ..\Source\bin\3.5\Release\*.* ".NET 3.5\"
+xcopy /Y /D ..\Source\bin\3.5\Release\x64\*.* ".NET 3.5\x64\"
+xcopy /Y /D ..\Source\bin\3.5\Release\x86\*.* ".NET 3.5\x86\"
+
+echo Completed.
+pause


change realview-run.bat script

change realview-run.bat script

--- tools/qemu-system-arm/win32/realview-run.bat
+++ tools/qemu-system-arm/win32/realview-run.bat
@@ -5,4 +5,4 @@
     unzip.exe sdcard.zip -d "%USERPROFILE%\.xboot"

 :RunQemu
-qemu-system-arm.exe -M realview -name "realview" -localtime -serial vc -sd "%USERPROFILE%\.xboot\sdcard.img" -kernel ..\..\..\output\xboot.elf
+qemu-system-arm.exe -M realview -name "ARM RealView Emulation Baseboard" -localtime -serial vc -sd "%USERPROFILE%\.xboot\sdcard.img" -kernel ..\..\..\output\xboot.elf


change sdcard.img's directory to %USERPROFILE%\.xboot\sdcard.img

--- tools/qemu-system-arm/win32/realview-run.bat
+++ tools/qemu-system-arm/win32/realview-run.bat
@@ -1,7 +1,8 @@
 @echo off

-if exist sdcard.img goto RunQemu
-    unzip.exe sdcard.zip
+if exist "%USERPROFILE%\.xboot\sdcard.img" goto RunQemu
+    mkdir "%USERPROFILE%\.xboot"
+    unzip.exe sdcard.zip -d "%USERPROFILE%\.xboot"

 :RunQemu
-qemu-system-arm.exe -M realview -name "realview" -localtime -serial vc -sd sdcard.img -kernel ..\..\..\output\xboot.elf
+qemu-system-arm.exe -M realview -name "realview" -localtime -serial vc -sd "%USERPROFILE%\.xboot\sdcard.img" -kernel ..\..\..\output\xboot.elf