Fix alias.bat handling "user-aliases.cmd" with spaces (#1531)

* Fix alias.bat handling "user-aliases.cmd" with spaces

This fixes the alias command when user-aliases.cmd is located in a path with spaces (like when Cmder is installed into the program-files directory).
I've also made the alphabetical case of the ALIASES variable consistent.

* address review comments

--- bin/alias.bat
+++ bin/alias.bat
@@ -1,8 +1,8 @@
 @echo off

-if "%aliases%" == "" (
-  set ALIASES=%CMDER_ROOT%\config\user-aliases.cmd
+if "%ALIASES%" == "" (
+  set ALIASES="%CMDER_ROOT%\config\user-aliases.cmd"
 )

 setlocal enabledelayedexpansion
@@ -21,7 +21,7 @@
   set currentarg=%~1

   if /i "%currentarg%" equ "/f" (
-    set aliases=%~2
+    set ALIASES=%~2
     shift
     goto :do_shift
   ) else if /i "%currentarg%" == "/reload" (
@@ -50,16 +50,16 @@
   )
 rem #endregion parseargument

-if "%aliases%" neq "%CMDER_ROOT%\config\user-aliases.cmd" (
-  set _x=!_x:/f %aliases% =!
+if "%ALIASES%" neq "%CMDER_ROOT%\config\user-aliases.cmd" (
+  set _x=!_x:/f "%ALIASES%" =!

-  if not exist "%aliases%" (
-    echo ;= @echo off>"%aliases%"
-    echo ;= rem Call DOSKEY and use this file as the macrofile>>"%aliases%"
-    echo ;= %%SystemRoot%%\system32\doskey /listsize=1000 /macrofile=%%0%%>>"%aliases%"
-    echo ;= rem In batch mode, jump to the end of the file>>"%aliases%"
-    echo ;= goto:eof>>"%aliases%"
-    echo ;= Add aliases below here>>"%aliases%"
+  if not exist "%ALIASES%" (
+    echo ;= @echo off>"%ALIASES%"
+    echo ;= rem Call DOSKEY and use this file as the macrofile>>"%ALIASES%"
+    echo ;= %%SystemRoot%%\system32\doskey /listsize=1000 /macrofile=%%0%%>>"%ALIASES%"
+    echo ;= rem In batch mode, jump to the end of the file>>"%ALIASES%"
+    echo ;= goto:eof>>"%ALIASES%"
+    echo ;= Add aliases below here>>"%ALIASES%"
   )
 )

@@ -110,11 +110,11 @@

 :p_help
 echo.Usage:
-echo.
+echo.
 echo.	alias [options] [alias=full command]
-echo.
+echo.
 echo.Options:
-echo.
+echo.
 echo.     /d [alias]     Delete an [alias].
 echo.     /f [macrofile] Path to the [macrofile] you want to store the new alias in.
 echo.                    Default: %cmder_root%\config\user-aliases.cmd


get it working on Windows

get it working on Windows

--- js/bin/jsc.bat
+++ js/bin/jsc.bat
@@ -26,4 +26,4 @@

 if "x%FLEX_HOME%"=="x" (set FLEX_HOME=%~dp0..\..) else echo Using Flex SDK: %FLEX_HOME%

-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar “%SCRIPT_HOME%\..\lib\mxmlc.jar" -external-library-path="$SCRIPT_HOME\..\libs\temp\externals\bin\JS.swc” %*+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%FALCON_HOME%\js\lib\mxmlc.jar" -js-output-type=FLEXJS -external-library-path="%FLEX_HOME%\js\libs\temp\externals\bin\JS.swc" %*


Fixed install extenstions on Windows os by extInstall.bat

--- assembly-sdk/src/assembly/extInstall.bat
+++ assembly-sdk/src/assembly/extInstall.bat
@@ -27,13 +27,13 @@
 )

 rem Prepare to re-build Codenvy IDE
-call java -cp "sdk-tools\codenvy-sdk-tools.jar" org.eclipse.che.ide.sdk.tools.InstallExtension --extDir=%EXT_DIR_REL_PATH% --extResourcesDir=%EXT_RES_DIR_REL_PATH%
+call java -cp "sdk-tools\che-plugin-sdk-tools.jar" org.eclipse.che.ide.sdk.tools.InstallExtension --extDir=%EXT_DIR_REL_PATH% --extResourcesDir=%EXT_RES_DIR_REL_PATH%

 rem Re-build Codenvy IDE
 cd %EXT_RES_WORK_DIR_REL_PATH%
 call mvn clean package -Dskip-validate-sources=true
 cd ../..
-1>nul  2>&1 copy /B /Y "%EXT_RES_WORK_DIR_REL_PATH%\target\*.war" "webapps\ws.war"
-1>nul  2>&1 rmdir /S /Q webapps\ws
+1>nul  2>&1 copy /B /Y "%EXT_RES_WORK_DIR_REL_PATH%\target\*.war" "webapps\che.war"
+1>nul  2>&1 rmdir /S /Q webapps\che

 echo Restart Codenvy IDE if it is currently running


helper script

helper script

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

--- json_antlr.bat
+++ json_antlr.bat
@@ -0,0 +1 @@
+mvn antlr3:antlr


remove old pdb files

remove old pdb files


added pause back

added pause back


fixed windows script

fixed windows script

--- build_win.bat
+++ build_win.bat
@@ -42,7 +42,7 @@
 rem copy build\UniverseEarthExtensions.js %panda%
 rem copy build\universe.js %panda%

-# Instrument with jscoverage
+rem Instrument with jscoverage

 ./utils/jscoverage.exe -v --no-instrument=lib --no-instrument=test --exclude=nbproject --exclude=.git --exclude=build --exclude=docs --exclude=examples --exclude=utils --exclude=build.sh --exclude=build_win.bat . /tmp/instrumented
 move /tmp/instrumented build/instrumented


shell.bat : update to reflect python support in shell


Delete run.bat

Delete run.bat

--- run.bat
+++ run.bat
@@ -1 +0,0 @@
-"C:\Users\c1613172\Documents\Visual Studio 2010\Projects\modular\Debug\modular.exe" /stesteProf.script > saida.txt


Conda: fixed path in Windows builder

Conda: fixed path in Windows builder

--- contrib/packaging-python/conda/bld.bat
+++ contrib/packaging-python/conda/bld.bat
@@ -29,9 +29,9 @@
  -DBUILD_TESTING=OFF ^
  -DBUILD_GMOCK=OFF ^
  -DBUILD_BENCHMARKING=OFF ^
- -DIRRLICHT_ROOT="C:\Users\builder\Documents\irrlicht-1.8.4" ^
- -DIRRLICHT_LIBRARY="C:\Users\builder\Documents\irrlicht-1.8.4\lib\Win64-visualStudio\Irrlicht.lib" ^
- -DEIGEN3_INCLUDE_DIR="C:/Users/SBEL CI/Documents/eigen-3.3.9" ^
+ -DIRRLICHT_ROOT=""C:\Users\SBEL CI\Documents\irrlicht-1.8.4" ^
+ -DIRRLICHT_LIBRARY=""C:\Users\SBEL CI\Documents\irrlicht-1.8.4\lib\Win64-visualStudio\Irrlicht.lib" ^
+ -DEIGEN3_INCLUDE_DIR="C:\Users\SBEL CI\Documents\eigen-3.3.9" ^
  -DENABLE_MODULE_CASCADE=ON ^
  -DCASCADE_INCLUDE_DIR="%CONDA_INSTALL_LOCN%"\Library\include\opencascade ^
  -DCASCADE_LIBDIR="%CONDA_INSTALL_LOCN%"\Library\lib ^


tweaked cmd.exe driver

tweaked cmd.exe driver

git-svn-id: 624b1297895c6a0854a6163ae82eed457435abc7@10 d98658ec-b809-11dd-8622-756dacf128ff

--- bin/go.bat
+++ bin/go.bat
@@ -1,7 +1,6 @@
 @echo off
-rem Copyright (c) 2002-2003 ActiveState Corp.
-rem Author: Trent Mick (TrentM@ActiveState.com)
+rem Windows shell driver for 'go' (http://code.google.com/p/go-tool/).
 set GO_SHELL_SCRIPT=%TEMP%\__tmp_go.bat
-call go.py %1 %2 %3 %4 %5 %6 %7 %8 %9
+call python -m go %1 %2 %3 %4 %5 %6 %7 %8 %9
 if exist %GO_SHELL_SCRIPT% call %GO_SHELL_SCRIPT%
 set GO_SHELL_SCRIPT=


Remove old testing.bat

Remove old testing.bat

--- test/testing.bat
+++ test/testing.bat
@@ -1,9 +0,0 @@
-@echo off
-Setlocal EnableDelayedExpansion EnableExtensions
-
-if not defined LUAROCKS_REPO set LUAROCKS_REPO=https://luarocks.org
-
-appveyor DownloadFile %LUAROCKS_REPO%/stdlib-41.0.0-1.src.rock
-luarocks build stdlib
-
-endlocal


cleanup: support different disk drives

cleanup: support different disk drives

GitOrigin-RevId: cd9c395c9293caa2af02066dbf5e6f0f5050825e


add build script for visual studio 2017

add build script for visual studio 2017

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

--- build64-vc15.bat
+++ build64-vc15.bat
@@ -0,0 +1,78 @@
+:: this builds the release version with Visual Studio 2017
+
+@echo off
+
+::
+:: https://msdn.microsoft.com/en-us/library/fwkeyyhe.aspx : compiler options
+:: https://msdn.microsoft.com/en-us/library/y0zzbyt4.aspx : linker options
+:: https://msdn.microsoft.com/en-us/library/f1cb223a.aspx : Output-File (/F) Options
+::
+:: /FC : Causes the compiler to display the full path of source code files passed to the compiler in diagnostics.
+:: /Zi : Select the type of debugging information created for your program and whether this information is kept in object (.obj) files or in a program database (PDB).
+::       Produces a program database (PDB) that contains type information and symbolic debugging information for use with the debugger.
+:: /MD : Causes the application to use the multithread-specific and DLL-specific version of the run-time library. Defines _MT and _DLL and causes the compiler to place the library name MSVCRT.lib into the .obj file.
+:: /Gy : Enables function-level linking. Prevents unused functions from being included.
+:: /Ox : Uses maximum optimization (/Ob2gity /Gs).Uses maximum optimization (/Ob2gity /Gs).
+:: /OPT:REF : eliminates functions and data that are never referenced (depends on /Gy, but seems to do nothing for this program)
+::
+
+:: TODO: how should i have known to use /MD? SDL2 has written nowhere how it was compiled.
+
+:: https://www.libsdl.org/release/SDL2-devel-2.0.4-VC.zip
+:: https://sourceforge.net/projects/glew/files/glew/1.13.0/glew-1.13.0-win32.zip/download
+
+:: well whadoyouknow! ending even a fucking COMMENT with a caret does something weird
+
+set SDL2DIR=.\lib\SDL2-devel-2.0.4-VC
+set GL3WDIR=.\lib\gl3w
+set IMGUIDIR=.\lib\imgui
+set BUILDDIR=.\build
+
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat"  x64
+
+rmdir /S /Q build
+mkdir build
+
+
+cl /FC /MD /Ox /Gy /Fo%BUILDDIR%\ /Fd%BUILDDIR%\ /Fm%BUILDDIR%\ /Fe%BUILDDIR%\aniplot.exe ^
+    main.cpp ^
+    aniplotlib.cpp ^
+    %IMGUIDIR%\examples\sdl_opengl3_example\imgui_impl_sdl_gl3.cpp ^
+    %IMGUIDIR%\imgui.cpp %IMGUIDIR%\imgui_draw.cpp ^
+    %IMGUIDIR%\imgui_demo.cpp ^
+    %GL3WDIR%\GL\gl3w.c ^
+    /D_HAS_EXCEPTIONS=0 /DNDEBUG ^
+    /I %IMGUIDIR% ^
+    /I %IMGUIDIR%\examples\sdl_opengl3_example ^
+    /I %SDL2DIR%\include ^
+    /I %GL3WDIR% ^
+    SDL2.lib SDL2main.lib user32.lib opengl32.lib ws2_32.lib ^
+    /link /SUBSYSTEM:CONSOLE ^
+          /LIBPATH:"%SDL2DIR%\lib\x64" /OPT:REF /OPT:ICF
+
+if %errorlevel% neq 0 goto error
+
+rmdir /S /Q dist
+mkdir dist
+copy %BUILDDIR%\aniplot.exe .\dist\
+copy %SDL2DIR%\lib\x64\SDL2.dll .\dist\
+
+if %errorlevel% neq 0 goto error
+
+if exist "upx.exe" (
+    upx --lzma .\dist\aniplot.exe
+    upx --lzma .\dist\SDL2.dll
+)
+
+echo(
+echo ------------------------------
+echo enjoy aniplot in ./dist folder
+
+goto :EOF
+
+
+:error
+echo(
+echo ------------------------------
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%


[CB-1485] - missing apache header

[CB-1485] - missing apache header

--- bin/create.bat
+++ bin/create.bat
@@ -1,3 +1,22 @@
+goto comment
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+:comment
+
 @ECHO OFF
 IF NOT DEFINED JAVA_HOME GOTO MISSING
 FOR %%X in (ant.bat) do (


Remove -server argument, as it prevents starting a 32-Bit JRE and is default for 64-Bit JVMs anyway.

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1822456 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: d844d60944c0d7a05c72e58394248dd172e2a524

--- bin/jmeter.bat
+++ bin/jmeter.bat
@@ -176,11 +176,8 @@
     rem set DDRAW=%DDRAW% -Dsun.java2d.ddscale=true
 )

-rem Server mode
-set SERVER=-server
-
 rem Collect the settings defined above
-set ARGS=%SERVER% %DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS% %RUN_IN_DOCKER%
+set ARGS=%DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS% %RUN_IN_DOCKER%

 %JM_START% %JM_LAUNCH% %ADD_MODS% %ARGS% %JVM_ARGS% -jar "%JMETER_BIN%ApacheJMeter.jar" %JMETER_CMD_LINE_ARGS%


Fix a Java=>Oracle URL

Fix a Java=>Oracle URL

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/trunk@1125926 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 14697745fc991cce3e8092dfe786ca2734fde379

--- bin/jmeter.bat
+++ bin/jmeter.bat
@@ -62,8 +62,9 @@
 rem and for NT handling to skip to.

 rem The following link describes the -XX options:
-rem http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp
+rem http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html
 rem http://java.sun.com/developer/TechTips/2000/tt1222.html has some more descriptions
+rem Unfortunately TechTips no longer seem to be available

 rem See the unix startup file for the rationale of the following parameters,
 rem including some tuning recommendations


Create _service_ioBroker.bat

Create _service_ioBroker.bat

error: pathspec 'build/windows/_service_ioBroker.bat' did not match any file(s) known to git

--- build/windows/_service_ioBroker.bat
+++ build/windows/_service_ioBroker.bat
@@ -0,0 +1,2 @@
+%WINDIR%\system32\net.exe stop ioBroker
+%WINDIR%\system32\net.exe start ioBroker


Remove files that should have been git ignored

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

--- bundle.bat
+++ bundle.bat
@@ -0,0 +1 @@
+jar -cvf bundle.jar Z80Processor-2.0.2.pom Z80Processor-2.0.2.pom.asc Z80Processor-2.0.2.jar Z80Processor-2.0.2.jar.asc Z80Processor-2.0.2-javadoc.jar Z80Processor-2.0.2-javadoc.jar.asc Z80Processor-2.0.2-sources.jar Z80Processor-2.0.2-sources.jar.asc


Added build batch script with pause for building from the GUI shell.

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

--- buildw.cmd
+++ buildw.cmd
@@ -0,0 +1,3 @@
+@echo off
+call "%~dp0build" %*
+pause


Fix cmake_vs2008.bat to use new deps dir.

--- cmake_vs2008.bat
+++ cmake_vs2008.bat
@@ -1,7 +1,7 @@
 @echo off
 echo.
-SET QMAKESPEC=%NAALI_DEP_PATH%\Qt\mkspecs\win32-msvc2008
-SET QTDIR=%NAALI_DEP_PATH%\Qt
+SET QMAKESPEC=%TUNDRAQT47_DEP_PATH%\Qt\mkspecs\win32-msvc2008
+SET QTDIR=%TUNDRAQT47_DEP_PATH%\Qt
 cmake.exe -G "Visual Studio 9 2008"
 echo.
 pause


chore: bump to reportgenerator dep

chore: bump to reportgenerator dep

--- tools/testcoverage.bat
+++ tools/testcoverage.bat
@@ -9,7 +9,7 @@

 cd ../../%destination%

-set "reportgenerator=%UserProfile%\.nuget\packages\reportgenerator\4.1.7\tools\net47\ReportGenerator.exe"
+set "reportgenerator=%UserProfile%\.nuget\packages\reportgenerator\4.1.9\tools\net47\ReportGenerator.exe"
 set "targetdir=."

 "%reportGenerator%" -reports:coverage.xml -reporttypes:HtmlInline -targetdir:%targetdir%


added command line build for vc6.  found an easy way.  I updated my vc6 to sp6 to make it work.

--- makeAndRun.bat
+++ makeAndRun.bat
@@ -1,16 +1,17 @@
 rem ****
-rem * for this command line build to work independent of where it was created
+rem * Command line build - For CppUTest - Run from dsw directory
 rem *
-rem * Generate Project/Export Makefiles
-rem *
-rem * then do these edits to the generated files
-rem * CppUTest.dep - change the relitive path to ....\program files to \program files
-rem * AllTests.mak - At the end of the makefile where the depended upon CppUTest is made
-rem*       Change cd "\absolute\path\CppUTest" to cd ..
-PATH=C:\Program Files\Microsoft Visual Studio\VC98\Bin;%PATH%
-rem nmake /f CppUTest.mak CFG="CppUTest - Win32 Debug" all
-cd tests
-nmake /f AllTests.mak all
-cd Debug
-AllTests -v
-cd ..\..
+rem * A single parameter is suported and it is the last parameter of msdev
+rem * for example:
+rem * 	/clean
+rem * make sure to use the the slash
+
+rem * this needs to be in your path
+rem ****PATH=C:\Program Files\Microsoft Visual Studio\VC98\Bin;%PATH%
+
+msdev CppUTest.dsp /MAKE "CppUTest - Debug" %1
+msdev tests\AllTests.dsp /MAKE "AllTests - Debug" %1
+if "%1" EQU "/clean" goto end
+if "%1" EQU "/CLEAN" goto end
+tests\Debug\AllTests -v
+:end


enable hardware engines in OpenSSL

enable hardware engines in OpenSSL

--- mk-openssl.bat
+++ mk-openssl.bat
@@ -19,8 +19,8 @@
 if "%CPU%" == "win64" set SHARED_RCFLAGS=-F pe-x86-64

 del /s *.o *.a *.exe >> nul 2>&1
-if "%CPU%" == "win32" perl Configure mingw   shared no-unit-test no-ssl2 no-ssl3 no-rc5 no-idea no-hw no-dso no-sse2 --prefix=C:\w\openssl
-if "%CPU%" == "win64" perl Configure mingw64 shared no-unit-test no-ssl2 no-ssl3 no-rc5 no-idea no-hw no-dso no-asm  --prefix=C:\w\openssl
+if "%CPU%" == "win32" perl Configure mingw   shared no-unit-test no-ssl2 no-ssl3 no-rc5 no-idea no-dso no-sse2 --prefix=C:\w\openssl
+if "%CPU%" == "win64" perl Configure mingw64 shared no-unit-test no-ssl2 no-ssl3 no-rc5 no-idea no-dso no-asm  --prefix=C:\w\openssl
 sh -c mingw32-make depend
 sh -c mingw32-make

@@ -32,7 +32,7 @@

 xcopy /y /q    apps\openssl.exe "%_DST%\"
 xcopy /y /q    apps\*.dll       "%_DST%\"
-rem xcopy /y /q    engines\*.dll    "%_DST%\"
+xcopy /y /q    engines\*.dll    "%_DST%\"
  copy /y       apps\openssl.cnf "%_DST%\openssl.cfg"
 xcopy /y /s /q include\*.*      "%_DST%\include\"
 xcopy /y /q    ms\applink.c     "%_DST%\include\openssl\"


initial myrobotlab.bat file for windows

initial myrobotlab.bat file for windows

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

--- myrobotlab.bat
+++ myrobotlab.bat
@@ -0,0 +1,19 @@
+rem TODO move vars to top
+rem TODO have --id as an optional var
+rem @ECHO OFF
+
+set APPDIR=%CD%
+echo APPDIR=%APPDIR%
+
+set CLASSPATH="%CLASSPATH%;%APPDIR%\target\classes\*;%APPDIR%\libraries\jars\*;%APPDIR%\myrobotlab.jar"
+
+echo CLASSPATH=%CLASSPATH%
+
+rem TODO - option to package jdk for now use bin in path
+set JAVA=java
+
+rem Processing/Arduino handle this in an array - no need for now
+set JAVA_OPTIONS="-Djava.library.path=libraries/native -Djna.library.path=libraries/native -Dfile.encoding=UTF-8"
+
+"%JAVA%" %JAVA_OPTIONS% org.myrobotlab.service.Runtime --from-launcher --log-level info -s webgui WebGui intro Intro python Python
+


Added Abp.Zero.AspNetCore to pack.bat

Added Abp.Zero.AspNetCore to pack.bat

--- nupkg/pack.bat
+++ nupkg/pack.bat
@@ -5,6 +5,7 @@

 dotnet "pack" "..\src\Abp.Zero" -c "Release" -o "." --version-suffix "%VERSION_SUFFIX%"
 dotnet "pack" "..\src\Abp.Zero.Owin" -c "Release" -o "." --version-suffix "%VERSION_SUFFIX%"
+dotnet "pack" "..\src\Abp.Zero.AspNetCore" -c "Release" -o "." --version-suffix "%VERSION_SUFFIX%"
 dotnet "pack" "..\src\Abp.Zero.Ldap" -c "Release" -o "." --version-suffix "%VERSION_SUFFIX%"
 dotnet "pack" "..\src\Abp.Zero.EntityFramework" -c "Release" -o "." --version-suffix "%VERSION_SUFFIX%"
 dotnet "pack" "..\src\Abp.Zero.EntityFrameworkCore" -c "Release" -o "." --version-suffix "%VERSION_SUFFIX%"


change copyso.bat

change copyso.bat

--- copyso.bat
+++ copyso.bat
@@ -1,15 +1,17 @@
-@echo off
-cd %~dp0
-:BUILD
-call ndk-build V=1 NDK_DEBUG=0
+@echo off
+cd %~dp0
+:BUILD
+call ndk-build V=1 NDK_DEBUG=0
+echo
 :WAIT
-set /p KEY=
-cls
-if "%KEY%"=="C" (
-  call ndk-build clean
-  set KEY=
-  goto WAIT
-
-) else (
-  goto BUILD
+set /p KEY=
+cls
+if "%KEY%"=="C" (
+  call ndk-build clean
+  echo
+  set KEY=0
+  goto WAIT
+
+) else (
+  goto BUILD
 )


:rocket: adding deployment files for azure

--- deploy.cmd
+++ deploy.cmd
@@ -4,6 +4,38 @@
 :: KUDU Deployment Script
 :: Version: 1.0.6
 :: ----------------------
+
+:: Utility Functions
+:: -----------------
+
+:SelectNodeVersion
+
+IF DEFINED KUDU_SELECT_NODE_VERSION_CMD (
+  :: The following are done only on Windows Azure Websites environment
+  call %KUDU_SELECT_NODE_VERSION_CMD% "%DEPLOYMENT_SOURCE%" "%DEPLOYMENT_TARGET%" "%DEPLOYMENT_TEMP%"
+  IF !ERRORLEVEL! NEQ 0 goto error
+
+  IF EXIST "%DEPLOYMENT_TEMP%\__nodeVersion.tmp" (
+    SET /p NODE_EXE=<"%DEPLOYMENT_TEMP%\__nodeVersion.tmp"
+    IF !ERRORLEVEL! NEQ 0 goto error
+  )
+
+  IF EXIST "%DEPLOYMENT_TEMP%\__npmVersion.tmp" (
+    SET /p NPM_JS_PATH=<"%DEPLOYMENT_TEMP%\__npmVersion.tmp"
+    IF !ERRORLEVEL! NEQ 0 goto error
+  )
+
+  IF NOT DEFINED NODE_EXE (
+    SET NODE_EXE=node
+  )
+
+  SET NPM_CMD="!NODE_EXE!" "!NPM_JS_PATH!"
+) ELSE (
+  SET NPM_CMD=npm
+  SET NODE_EXE=node
+)
+
+goto :EOF

 :: Prerequisites
 :: -------------


revert build_dep.bat

revert build_dep.bat

Former-commit-id: 490de95ffc1d0d831004fa011794a9fd5bad77cd
Former-commit-id: d1667f5060843aa7b6692308ea061c9d2ce4af8e

--- Dep/build_dep.bat
+++ Dep/build_dep.bat
@@ -2,8 +2,64 @@

 echo Building dependencies...

+if exist lib (rd lib /q /s)
+md lib
+cd lib
+md Debug
+md Release
+cd ../
+REM ######################################################################################################
+echo Building protobuf...
+
+if exist protobuf (rd protobuf /q /s)
+git clone -b 2.7.0 https://github.com/google/protobuf.git
+
+cd protobuf/cmake
+md build
+cd build
+cmake -G "Visual Studio 14 Win64" -Dprotobuf_BUILD_SHARED_LIBS=ON -Dprotobuf_BUILD_TESTS=OFF ..
+"%VS140COMNTOOLS%..\IDE\Devenv" protobuf.sln /build "Debug|x64"
+"%VS140COMNTOOLS%..\IDE\Devenv" protobuf.sln /build "Release|x64"
+copy Debug\*.dll ..\..\..\lib\Debug /Y
+copy Debug\*.lib ..\..\..\lib\Debug /Y
+copy Release\*.dll ..\..\..\lib\Release /Y
+copy Release\*.lib ..\..\..\lib\Release /Y
+cd ..\..\..\
+REM ######################################################################################################
+echo Building libevent...
+
+if exist libevent (rd libevent /q /s)
+git clone -b master https://github.com/libevent/libevent.git
+
+cd libevent
+md build
+cd build
+cmake -G "Visual Studio 14 Win64" -DEVENT__DISABLE_OPENSSL=ON ..
+"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Debug|x64" /project event_core_static.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Release|x64" /project event_core_static.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Debug|x64" /project event_static.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Release|x64" /project event_static.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Debug|x64" /project event_extra_static.vcxproj
+"%VS140COMNTOOLS%..\IDE\Devenv" libevent.sln /build "Release|x64" /project event_extra_static.vcxproj
+copy lib\Debug\*.lib ..\..\lib\Debug /Y
+copy lib\Release\*.lib ..\..\lib\Release /Y
+cd ..\..\
+REM ######################################################################################################
+echo Building glog...
+if exist glog (rd glog /q /s)
+git clone -b v035 https://github.com/google/glog.git
+
+cd glog
+md build
+cd build
+cmake -G "Visual Studio 14 Win64" ..
+"%VS140COMNTOOLS%..\IDE\Devenv" google-glog.sln /build "Debug|x64"
+"%VS140COMNTOOLS%..\IDE\Devenv" google-glog.sln /build "Release|x64"
+copy Debug\*.lib ..\..\lib\Debug /Y
+copy Release\*.lib ..\..\lib\Release /Y
+cd ..\..\
+REM ######################################################################################################
 echo Building evpp...
-

 cd evpp
 cd vsprojects


Make x64 the only build option

Make x64 the only build option

x86 is entirely untested.

--- BuildDeps.cmd
+++ BuildDeps.cmd
@@ -1,5 +1,6 @@
 @echo off

+:: 32-bit builds not supported as they have not been tested.
 set __BuildArch=x64
 set __BuildType=Debug

@@ -7,7 +8,6 @@
 :Arg_Loop
 if "%1" == "" goto ArgsDone
 if /i "%1" == "/?" goto Usage
-if /i "%1" == "x64"    (set __BuildArch=x64&&shift&goto Arg_Loop)

 if /i "%1" == "Debug"    (set __BuildType=Debug&shift&goto Arg_Loop)
 if /i "%1" == "Release"   (set __BuildType=Release&shift&goto Arg_Loop)
@@ -54,8 +54,7 @@
 :Usage
 echo.
 echo Usage:
-echo %0 BuildArch BuildType where:
+echo %0 BuildType where:
 echo.
-echo BuildArch can be: x64
 echo BuildType can be: Debug, Release
 exit /b 1


Fix ng build

Fix ng build

--- deploy.cmd
+++ deploy.cmd
@@ -142,9 +142,9 @@
     IF !ERRORLEVEL! NEQ 0 goto error
   )

-  call :ExecuteCmd ng build --output-path="./../ng2app"
+  call :ExecuteCmd ng build --output-path="./../wwwroot/ng2app"
   IF !ERRORLEVEL! NEQ 0 (
-    call :ExecuteCmd npm run jspm:i
+    call :ExecuteCmd ng build --output-path="./../wwwroot/ng2app"
     IF !ERRORLEVEL! NEQ 0 goto error
   )


Clean of clean

Clean of clean

--- deploy.cmd
+++ deploy.cmd
@@ -8,29 +8,25 @@
 IF (%1%=="") GOTO SetTsc
 cd %1%

-GOTO Clean
-
 :SetTsc
 IF EXIST ".\node_modules\.bin\tsc.cmd" (
     SET tsc=CALL ".\node_modules\.bin\tsc.cmd"
     GOTO Build
 )
 IF EXIST "%ProgramFiles(x86)%\Microsoft Sdks\Typescript\0.9\tsc.exe" (
-    set tsc="%ProgramFiles(x86)%\Microsoft Sdks\Typescript\0.9\tsc.exe"
+    SET tsc="%ProgramFiles(x86)%\Microsoft Sdks\Typescript\0.9\tsc.exe"
     GOTO Build
 )
 IF EXIST "%ProgramFiles%\Microsoft Sdks\Typescript\0.9\tsc.exe" (
-    set tsc="%ProgramFiles%\Microsoft Sdks\Typescript\0.9\tsc.exe"
-    goto Build
+    SET tsc="%ProgramFiles%\Microsoft Sdks\Typescript\0.9\tsc.exe"
+    GOTO Build
 GOTO
 ECHO TypeScript compiler not found
 EXIT 999

-:Clean
+:Build
 ECHO Cleaning folder
 del %DEPLOYMENT_TARGET%\*.* /S /Q
-
-:Build
 ECHO Building TypeScript: pblander.ts (using %tsc%)
 %tsc% src\game\pblander.ts
 xcopy %DEPLOYMENT_SOURCE%\src %DEPLOYMENT_TARGET% /S /Y


Fix path

Fix path

--- deploy.cmd
+++ deploy.cmd
@@ -23,5 +23,5 @@
 7z a -t7z -m0=lzma2 -mx=9 -aoa -mfb=64 -md=32m -ms=on -mhe -r Win32-x64-%version%.7z APE-win32-x64

 :: Push to mega.nz
-megaput --username=%mega_user% --password=%mega_pass% --path=APE/ Win32-ia32-%version%.7z
-megaput --username=%mega_user% --password=%mega_pass% --path=APE/ Win32-x64-%version%.7z
+megaput --username=%mega_user% --password=%mega_pass% --path=/APE/ Win32-ia32-%version%.7z
+megaput --username=%mega_user% --password=%mega_pass% --path=/APE/ Win32-x64-%version%.7z


fix syntax in tsc sourceMap argument

fix syntax in tsc sourceMap argument


added ipv4 reset script

added ipv4 reset script

error: pathspec 'windows/reset-ipv4.bat' did not match any file(s) known to git

--- windows/reset-ipv4.bat
+++ windows/reset-ipv4.bat
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+netsh winsock reset catalog
+netsh int ipv4 reset reset.log


Add Windows deployment script

Add Windows deployment script

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

--- deployment.bat
+++ deployment.bat
@@ -0,0 +1,3 @@
+REM Change --ffmpeg-dir argument as necessary
+python setup.py clean --all build_ext --inplace --ffmpeg-dir=C:\work\ffmpeg-4.0-win64-dev -c msvc
+pip wheel .


Correcting script to revert changes in git repo after release

--- Build/createRelease.bat
+++ Build/createRelease.bat
@@ -20,10 +20,10 @@

 %msbuild% default.msbuild /v:q /t:MakeRelease

-hg revert -C %ROOTDIR%\MbCache.ProxyImpl.Castle\Properties\AssemblyInfo.cs
-hg revert -C %ROOTDIR%\MbCache.ProxyImpl.LinFu\Properties\AssemblyInfo.cs
-hg revert -C %ROOTDIR%\MbCache\Properties\AssemblyInfo.cs
-hg revert -C %ROOTDIR%\MbCacheTest\Properties\AssemblyInfo.cs
+git checkout -- %ROOTDIR%\MbCache.ProxyImpl.Castle\Properties\AssemblyInfo.cs
+git checkout -- %ROOTDIR%\MbCache.ProxyImpl.LinFu\Properties\AssemblyInfo.cs
+git checkout -- %ROOTDIR%\MbCache\Properties\AssemblyInfo.cs
+git checkout -- %ROOTDIR%\MbCacheTest\Properties\AssemblyInfo.cs

 echo -------------------------------
 echo.


Removing old code for castle proxy

Removing old code for castle proxy

--- Build/createRelease.bat
+++ Build/createRelease.bat
@@ -20,7 +20,6 @@

 %msbuild% default.msbuild /v:q /t:MakeRelease

-git checkout -- %ROOTDIR%\MbCache.ProxyImpl.Castle\Properties\AssemblyInfo.cs
 git checkout -- %ROOTDIR%\MbCache.ProxyImpl.LinFu\Properties\AssemblyInfo.cs
 git checkout -- %ROOTDIR%\MbCache\Properties\AssemblyInfo.cs
 git checkout -- %ROOTDIR%\MbCacheTest\Properties\AssemblyInfo.cs


Update references to rename solution file

--- Build/nuget-restore.bat
+++ Build/nuget-restore.bat
@@ -1,5 +1,5 @@
 @echo off
 SET ROOT=%~dp0..
 SET NuGetExe=%ROOT%\Tools\NuGet.exe
-SET SolutionFile=%ROOT%\UnitsNet.sln
+SET SolutionFile=%ROOT%\UnitsNet.2015.sln
 %NuGetExe% restore %SolutionFile%


Modify default platform variable.

Modify default platform variable.

--- 3rdparty/Build3rdParty.bat
+++ 3rdparty/Build3rdParty.bat
@@ -15,7 +15,7 @@
 )

 if not defined PLATFORM (
-    set PLATFORM=Win32
+    set PLATFORM=x64
 )

 rem glfw =============================


Wrong order of the generated dependency twizzling.

--- configure.bat
+++ configure.bat
@@ -1,691 +1,691 @@
-:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-::
-:: Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-:: All rights reserved.
-:: Contact: Nokia Corporation (qt-info@nokia.com)
-::
-:: This file is part of the Qt Mobility Components.
-::
-:: $QT_BEGIN_LICENSE:LGPL$
-:: No Commercial Usage
-:: This file contains pre-release code and may not be distributed.
-:: You may use this file in accordance with the terms and conditions
-:: contained in the Technology Preview License Agreement accompanying
-:: this package.
-::
-:: GNU Lesser General Public License Usage
-:: Alternatively, this file may be used under the terms of the GNU Lesser
-:: General Public License version 2.1 as published by the Free Software
-:: Foundation and appearing in the file LICENSE.LGPL included in the
-:: packaging of this file.  Please review the following information to
-:: ensure the GNU Lesser General Public License version 2.1 requirements
-:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-::
-:: In addition, as a special exception, Nokia gives you certain additional
-:: rights.  These rights are described in the Nokia Qt LGPL Exception
-:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-::
-:: If you have questions regarding the use of this file, please contact
-:: Nokia at qt-info@nokia.com.
-::
-::
-::
-::
-::
-::
-::
-::
-:: $QT_END_LICENSE$
-::
-:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-
-@echo off
-
-set QT_MOBILITY_PREFIX= C:\QtMobility
-set BUILD_PATH=%CD%
-set SOURCE_PATH= %~dp0
-cd /D %SOURCE_PATH%
-set SOURCE_PATH=%CD%
-cd /D %BUILD_PATH%
-
-set PROJECT_CONFIG=%BUILD_PATH%\config.in
-set PROJECT_LOG=%BUILD_PATH%\config.log
-set RELEASEMODE=release
-set WIN32_RELEASEMODE=debug_and_release build_all
-set QT_MOBILITY_LIB=
-set BUILD_UNITTESTS=no
-set BUILD_EXAMPLES=no
-set BUILD_DEMOS=no
-set BUILD_DOCS=yes
-set BUILD_TOOLS=yes
-set MOBILITY_MODULES=bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors gallery telephony organizer feedback
-set MOBILITY_MODULES_UNPARSED=
-set VC_TEMPLATE_OPTION=
-set QT_PATH=
-set QMAKE_CACHE=%BUILD_PATH%\.qmake.cache
-
-if exist "%QMAKE_CACHE%" del /Q %QMAKE_CACHE%
-if exist "%PROJECT_LOG%" del /Q %PROJECT_LOG%
-if exist "%PROJECT_CONFIG%" del /Q %PROJECT_CONFIG%
-
-echo QT_MOBILITY_SOURCE_TREE = %SOURCE_PATH:\=/% > %QMAKE_CACHE%
-echo QT_MOBILITY_BUILD_TREE = %BUILD_PATH:\=/% >> %QMAKE_CACHE%
-set QMAKE_CACHE=
-
-:cmdline_parsing
-if "%1" == ""                   goto startProcessing
-if "%1" == "-debug"             goto debugTag
-if "%1" == "-release"           goto releaseTag
-if "%1" == "-silent"            goto silentTag
-if "%1" == "-prefix"            goto prefixTag
-if "%1" == "-libdir"            goto libTag
-if "%1" == "-bindir"            goto binTag
-if "%1" == "-headerdir"         goto headerTag
-if "%1" == "-plugindir"         goto pluginTag
-if "%1" == "-examplesdir"       goto examplesDirTag
-if "%1" == "-demosdir"          goto demosDirTag
-if "%1" == "-tests"             goto testTag
-if "%1" == "-examples"          goto exampleTag
-if "%1" == "-demos"             goto demosTag
-if "%1" == "-qt"                goto qtTag
-if "%1" == "-vc"                goto vcTag
-if "%1" == "-no-docs"           goto nodocsTag
-if "%1" == "-no-tools"          goto noToolsTag
-if "%1" == "-modules"           goto modulesTag
-if "%1" == "/?"                 goto usage
-if "%1" == "-h"                 goto usage
-if "%1" == "-help"              goto usage
-if "%1" == "--help"             goto usage
-if "%1" == "-symbian-unfrozen"  goto unfrozenTag
-
-
-echo Unknown option: "%1"
-goto usage
-
-:usage
-echo Usage: configure.bat [-prefix (dir)] [headerdir (dir)] [libdir (dir)]
-    echo                  [-bindir (dir)] [-tests] [-examples]
-    echo                  [-debug] [-release] [-silent]
-    echo.
-    echo Options:
-    echo.
-    echo -prefix (dir) ..... This will install everything relative to dir
-    echo                     (default prefix: C:\QtMobility)
-    echo -headerdir (dir) .. Header files will be installed to dir
-    echo                     (default prefix: PREFIX/include)
-    echo -libdir (dir) ..... Libraries will be installed to dir
-    echo                     (default PREFIX/lib)
-    echo -bindir (dir) ..... Executables will be installed to dir
-    echo                     (default PREFIX/bin)
-    echo -plugindir (dir) .. Plug-ins will be installed to dir
-    echo                     (default PREFIX/plugins)
-    echo -examplesdir (dir)  Examples will be installed to dir
-    echo                     (default PREFIX/bin)
-    echo -demosdir (dir) ... Demos will be installed to dir
-    echo                     (default PREFIX/bin)
-    echo -debug ............ Build with debugging symbols
-    echo -release .......... Build without debugging symbols
-    echo -silent ........... Reduces build output
-    echo -tests ............ Build unit tests (not build by default)
-    echo                     Note, this adds test symbols to all libraries
-    echo                     and should not be used for release builds.
-    echo -examples ......... Build example applications
-    echo -demos ............ Build demo applications
-    echo -no-docs .......... Do not build documentation (build by default)
-    echo -modules ^<list^> ... Build only the specified modules (default all)
-    echo                     Choose from: bearer contacts gallery location publishsubscribe
-    echo                     messaging multimedia systeminfo serviceframework telephony
-    echo                     sensors versit organizer feedback
-    echo                     Modules should be separated by a space and surrounded
-    echo                     by double quotation. If a selected module depends on other modules
-    echo                     those modules (and their dependencies) will automatically be enabled.
-    echo -vc ............... Generate Visual Studio make files
-
-
-if exist "%PROJECT_CONFIG%" del %PROJECT_CONFIG%
-goto exitTag
-
-:qtTag
-shift
-set QT_PATH=%1\
-shift
-goto cmdline_parsing
-
-:debugTag
-if "%RELEASEMODE%" == "release" set RELEASEMODE=debug
-set WIN32_RELEASEMODE=
-shift
-goto cmdline_parsing
-
-:releaseTag
-if "%RELEASEMODE%" == "debug"   set RELEASEMODE=release
-set WIN32_RELEASEMODE=
-shift
-goto cmdline_parsing
-
-:silentTag
-echo CONFIG += silent > %PROJECT_CONFIG%
-shift
-goto cmdline_parsing
-
-:prefixTag
-shift
-set QT_MOBILITY_PREFIX=%1
-shift
-goto cmdline_parsing
-
-:libTag
-shift
-echo QT_MOBILITY_LIB = %1 >> %PROJECT_CONFIG%
-shift
-goto cmdline_parsing
-
-:binTag
-shift
-echo QT_MOBILITY_BIN = %1 >> %PROJECT_CONFIG%
-shift
-goto cmdline_parsing
-
-:headerTag
-shift
-echo QT_MOBILITY_INCLUDE = %1 >> %PROJECT_CONFIG%
-shift
-goto cmdline_parsing
-
-:pluginTag
-shift
-echo QT_MOBILITY_PLUGINS = %1 >> %PROJECT_CONFIG%
-shift
-echo
-goto cmdline_parsing
-
-:examplesDirTag
-shift
-echo QT_MOBILITY_EXAMPLES = %1 >> %PROJECT_CONFIG%
-shift
-echo
-goto cmdline_parsing
-
-:demosDirTag
-shift
-echo QT_MOBILITY_DEMOS =%1 >> %PROJECT_CONFIG%
-shift
-echo
-goto cmdline_parsing
-
-:unfrozenTag
-REM Should never be used in release builds
-REM Some SDK's seem to exclude Q_AUTOTEST_EXPORT symbols if the
-REM libraries are frozen. This breaks unit tests relying on the auto test exports
-REM This flag unfreezes the SYMBIAN libraries for the purpose of unit test building.
-REM Ideally this should be connected to '-tests' option but that would prevent
-REM integration testing for frozen symbols as the CI system should test unit tests
-REM and frozen symbol compliance.
-echo symbian_symbols_unfrozen = 1 >> %PROJECT_CONFIG%
-shift
-goto cmdline_parsing
-
-:testTag
-set BUILD_UNITTESTS=yes
-shift
-goto cmdline_parsing
-
-:exampleTag
-set BUILD_EXAMPLES=yes
-shift
-goto cmdline_parsing
-
-:demosTag
-set BUILD_DEMOS=yes
-shift
-goto cmdline_parsing
-
-:vcTag
-shift
-set VC_TEMPLATE_OPTION=-tp vc
-goto cmdline_parsing
-
-:nodocsTag
-set BUILD_DOCS=no
-shift
-goto cmdline_parsing
-
-:noToolsTag
-set BUILD_TOOLS=no
-shift
-goto cmdline_parsing
-
-:modulesTag
-shift
-:: %1 can have leading/trailing quotes, so we can't use if "%1" == ""
-if xx%1xx == xxxx (
-    echo. >&2
-    echo >&2The -modules option requires a list of modules.
-    echo. >&2
-    goto usage
-)
-
-:: Remove leading/trailing quotes, if we have them
-set MOBILITY_MODULES_UNPARSED=xxx%1xxx
-set MOBILITY_MODULES_UNPARSED=%MOBILITY_MODULES_UNPARSED:"xxx=%
-set MOBILITY_MODULES_UNPARSED=%MOBILITY_MODULES_UNPARSED:xxx"=%
-set MOBILITY_MODULES_UNPARSED=%MOBILITY_MODULES_UNPARSED:xxx=%
-
-REM reset default modules as we expect a modules list
-set MOBILITY_MODULES=
-
-echo Checking selected modules:
-:modulesTag2
-
-for /f "tokens=1,*" %%a in ("%MOBILITY_MODULES_UNPARSED%") do (
-    set FIRST=%%a
-    set REMAINING=%%b
-)
-
-: What we want is a switch as we need to check module name and only want to
-: distinguish between false and correct module names being passed
-if %FIRST% == bearer (
-    echo     Bearer Management selected
-) else if %FIRST% == contacts (
-    echo     Contacts selected ^(implies ServiceFramework^)
-) else if %FIRST% == location (
-    echo     Location selected
-) else if %FIRST% == messaging (
-    echo     Messaging selected
-) else if %FIRST% == multimedia (
-    echo     Multimedia selected
-) else if %FIRST% == publishsubscribe (
-    echo     PublishSubscribe selected
-) else if %FIRST% == systeminfo (
-    echo     Systeminfo selected
-) else if %FIRST% == serviceframework (
-    echo     ServiceFramework selected
-) else if %FIRST% == telephony (
-    echo     Telephony selected
-) else if %FIRST% == versit (
-    echo     Versit selected ^(implies Contacts and Organizer^)
-) else if %FIRST% == organizer (
-    echo     Organizer selected
-) else if %FIRST% == feedback (
-    echo     Feedback selected
-) else if %FIRST% == sensors (
-    echo     Sensors selected
-) else if %FIRST% == gallery (
-    echo     Gallery selected
-) else (
-    echo     Unknown module %FIRST%
-    goto errorTag
-)
-
-set MOBILITY_MODULES=%MOBILITY_MODULES% %FIRST%
-
-if "%REMAINING%" == "" (
-    shift
-) else (
-    set MOBILITY_MODULES_UNPARSED=%REMAINING%
-    goto modulesTag2
-)
-
-SET REMAINING=
-SET FIRST=
-goto cmdline_parsing
-
-:startProcessing
-
-echo CONFIG += %RELEASEMODE% >> %PROJECT_CONFIG%
-echo CONFIG_WIN32 += %WIN32_RELEASEMODE% %RELEASEMODE% >> %PROJECT_CONFIG%
-set RELEASEMODE=
-set WIN32_RELEASEMODE=
-
-set CURRENTDIR=%CD%
-echo %CURRENTDIR%
-if exist %QT_MOBILITY_PREFIX% goto prefixExists
-mkdir %QT_MOBILITY_PREFIX%
-if errorlevel 1 goto invalidPrefix
-cd /D %QT_MOBILITY_PREFIX%
-set QT_MOBILITY_PREFIX=%CD%
-cd /D %CURRENTDIR%
-rd /S /Q %QT_MOBILITY_PREFIX%
-goto endprefixProcessing
-
-:invalidPrefix
-echo "%QT_MOBILITY_PREFIX%" is not a valid directory path.
-goto :exitTag
-
-:prefixExists
-cd /D %QT_MOBILITY_PREFIX%
-set QT_MOBILITY_PREFIX=%CD%
-cd /D %CURRENTDIR%
-
-:endprefixProcessing
-echo QT_MOBILITY_PREFIX = %QT_MOBILITY_PREFIX:\=/% >> %PROJECT_CONFIG%
-
-echo build_unit_tests = %BUILD_UNITTESTS% >> %PROJECT_CONFIG%
-set BUILD_UNITTESTS=
-
-echo build_examples = %BUILD_EXAMPLES% >> %PROJECT_CONFIG%
-set BUILD_EXAMPLES=
-
-echo build_demos = %BUILD_DEMOS% >> %PROJECT_CONFIG%
-set BUILD_DEMOS=
-
-echo build_docs = %BUILD_DOCS% >> %PROJECT_CONFIG%
-set BUILD_DOCS=
-
-echo build_tools = %BUILD_TOOLS% >> %PROJECT_CONFIG%
-set BUILD_TOOLS=
-
-echo qmf_enabled = no >> %PROJECT_CONFIG%
-
-echo !symbian:isEmpty($$QT_MOBILITY_INCLUDE):QT_MOBILITY_INCLUDE=$$QT_MOBILITY_PREFIX/include >> %PROJECT_CONFIG%
-echo isEmpty($$QT_MOBILITY_LIB):QT_MOBILITY_LIB=$$QT_MOBILITY_PREFIX/lib >> %PROJECT_CONFIG%
-echo isEmpty($$QT_MOBILITY_BIN):QT_MOBILITY_BIN=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
-echo isEmpty($$QT_MOBILITY_PLUGINS):QT_MOBILITY_PLUGINS=$$QT_MOBILITY_PREFIX/plugins >> %PROJECT_CONFIG%
-echo isEmpty($$QT_MOBILITY_EXAMPLES):QT_MOBILITY_EXAMPLES=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
-echo isEmpty($$QT_MOBILITY_DEMOS):QT_MOBILITY_DEMOS=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
-
-echo mobility_modules = %MOBILITY_MODULES%  >> %PROJECT_CONFIG%
-echo contains(mobility_modules,contacts): mobility_modules *= serviceframework  >> %PROJECT_CONFIG%
-echo contains(mobility_modules,versit): mobility_modules *= contacts organizer  >> %PROJECT_CONFIG%
-
-echo Checking available Qt
-call %QT_PATH%qmake -v >> %PROJECT_LOG% 2>&1
-if errorlevel 1 goto qmakeNotFound
-goto qmakeFound
-:qmakeNotFound
-echo ... Not found  >> %PROJECT_LOG% 2>&1
-if "%QT_PATH%" == "" (
-    echo >&2Cannot find 'qmake' in your PATH.
-    echo >&2Your PATH is: %PATH%
-) else (
-    echo >&2Cannot find 'qmake' in %QT_PATH%.
-)
-echo >&2Aborting.
-goto errorTag
-
-:qmakeFound
-call %QT_PATH%qmake -query QT_VERSION
-
-goto checkMake
-
-:makeTest
-setlocal
-    set CURRENT_PWD=%CD%
-
-    if %BUILD_PATH% == %SOURCE_PATH% (
-        cd %SOURCE_PATH%\config.tests\make
-        if exist make del make
-    ) else (
-        rmdir /S /Q config.tests\make
-        mkdir config.tests\make
-        cd config.tests\make
-    )
-
-    for /f "tokens=2,3" %%a in ('call %QT_PATH%qmake %SOURCE_PATH%\config.tests\make\make.pro 2^>^&1 1^>NUL') do (
-        if "%%a" == "MESSAGE:" (
-            set BUILDSYSTEM=%%b)
-    )
-
-    if "%BUILDSYSTEM%" == "symbian-abld" (
-        call make -h >> %PROJECT_LOG% 2>&1
-        if not errorlevel 1 (
-            echo ... Symbian abld make found.
-            set MAKE=make
-        )
-    ) else if "%BUILDSYSTEM%" == "symbian-sbsv2" (
-        call make -h >> %PROJECT_LOG% 2>&1
-        if not errorlevel 1 (
-            echo ... Symbian sbsv2 make found.
-            set MAKE=make
-        )
-    ) else if "%BUILDSYSTEM%" == "win32-nmake" (
-        call nmake /? >> %PROJECT_LOG% 2>&1
-        if not errorlevel 1 (
-            echo ... nmake found.
-            set MAKE=nmake
-        )
-    ) else if "%BUILDSYSTEM%" == "win32-mingw" (
-        call mingw32-make -v >> %PROJECT_LOG% 2>&1
-        if not errorlevel 1 (
-            echo ... mingw32-make found.
-            set MAKE=mingw32-make
-        )
-    ) else (
-        echo ... Unknown target environment %BUILDSYSTEM%.
-    )
-    call cd %CURRENT_PWD%
-call endlocal&set %1=%MAKE%&set %2=%BUILDSYSTEM%&goto :EOF
-
-:checkMake
-echo Checking make
-call :makeTest MOBILITY_MAKE MOBILITY_BUILDSYSTEM
-if not "%MOBILITY_MAKE%" == "" goto compileTests
-
-echo >&2Cannot find 'nmake', 'mingw32-make' or 'make' in your PATH
-echo >&2Aborting.
-goto errorTag
-
-:compileTest
-setlocal
-    @echo off
-    echo Checking %1
-    set CURRENT_PWD=%CD%
-
-    if %BUILD_PATH% == %SOURCE_PATH% (
-        cd %SOURCE_PATH%\config.tests\%2
-        if exist %2 del %2
-    ) else (
-        rmdir /S /Q config.tests\%2
-        mkdir config.tests\%2
-        cd config.tests\%2
-    )
-
-    call %QT_PATH%qmake %SOURCE_PATH%\config.tests\%2\%2.pro >> %PROJECT_LOG% 2>&1
-
-    set FAILED=0
-    if "%MOBILITY_BUILDSYSTEM%" == "symbian-sbsv2" (
-        call %MOBILITY_MAKE% release-armv5 >> %PROJECT_LOG% 2>&1
-        for /f "tokens=2" %%i in ('%MOBILITY_MAKE% release-armv5 SBS^="@sbs --check"') do set FAILED=1
-    ) else if "%MOBILITY_BUILDSYSTEM%" == "symbian-abld" (
-        call %MOBILITY_MAKE% release-gcce >> %PROJECT_LOG% 2>&1
-        for /f "tokens=2" %%i in ('%MOBILITY_MAKE% release-gcce ABLD^="@ABLD.BAT -c" 2^>^&1') do if not %%i == bldfiles set FAILED=1
-    ) else (
-        REM Make for other builds
-        call %MOBILITY_MAKE% >> %PROJECT_LOG% 2>&1
-        REM have to check error level for windows / other builds to be sure.
-        if errorlevel 1 (
-           set FAILED=1
-        )
-    )
-
-    if %FAILED% == 0 (
-        echo ... OK
-        echo %2_enabled = yes >> %PROJECT_CONFIG%
-    ) else (
-        echo ... Not Found
-        echo %2_enabled = no >> %PROJECT_CONFIG%
-    )
-
-    cd %CURRENT_PWD%
-endlocal&goto :EOF
-
-:compileTests
-REM We shouldn't enable some of these if the corresponding modules are not enabled
-echo.
-echo Start of compile tests
-REM compile tests go here.
-for /f "tokens=3" %%i in ('call %QT_PATH%qmake %SOURCE_PATH%\config.tests\make\make.pro 2^>^&1 1^>NUL') do set BUILDSYSTEM=%%i
-if "%BUILDSYSTEM%" == "symbian-abld" goto symbianTests
-if "%BUILDSYSTEM%" == "symbian-sbsv2" goto symbianTests
-goto windowsTests
-
-:symbianTests
-
-call :compileTest LBT lbt
-call :compileTest SNAP snap
-call :compileTest OCC occ
-call :compileTest SymbianContactSIM symbiancntsim
-call :compileTest SymbianContactModel symbiancntmodel
-call :compileTest SymbianContactModelv2 symbiancntmodelv2
-call :compileTest S60_Sensor_API sensors_s60_31
-call :compileTest Symbian_Sensor_Framework sensors_symbian
-call :compileTest Symbian_Hb hb_symbian
-call :compileTest Audiorouting_s60 audiorouting_s60
-call :compileTest Tunerlibrary_for_3.1 tunerlib_s60
-call :compileTest RadioUtility_for_post_3.1 radioutility_s60
-call :compileTest OpenMaxAl_support openmaxal_symbian
-call :compileTest Surfaces_s60 surfaces_s60
-call :compileTest Symbian_Messaging_Freestyle messaging_freestyle
-call :compileTest IMMERSION immersion
-
-goto noTests
-
-:windowsTests
-
-call :compileTest DirectShow directshow
-call :compileTest WindowsMediaSDK wmsdk
-call :compileTest WindowMediaPlayer wmp
-call :compileTest EnhancedVideoRenderer evr
-
-:noTests
-
-echo End of compile tests
-echo.
-echo.
-
-REM we could skip generating headers if a module is not enabled
-if not exist "%BUILD_PATH%\features" mkdir %BUILD_PATH%\features
-copy %SOURCE_PATH%\features\strict_flags.prf %BUILD_PATH%\features
-echo Generating Mobility Headers...
-rd /s /q %BUILD_PATH%\include
-mkdir %BUILD_PATH%\include
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\global
-
-set MODULES_TEMP=%MOBILITY_MODULES%
-
-:generateHeaders
-
-for /f "tokens=1,*" %%a in ("%MODULES_TEMP%") do (
-    set FIRST=%%a
-    set REMAINING=%%b
-)
-
-if %FIRST% == bearer (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtBearer %SOURCE_PATH%\src\bearer
-) else if %FIRST% == contacts (
-    REM contacts implies service framework
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts\requests
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts\filters
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts\details
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtServiceFramework %SOURCE_PATH%\src\serviceframework
-) else if %FIRST% == location (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtLocation %SOURCE_PATH%\src\location
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtLocation %SOURCE_PATH%\src\location\landmarks
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtLocation %SOURCE_PATH%\src\location\maps
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtLocation %SOURCE_PATH%\src\location\maps\tiled
-) else if %FIRST% == messaging (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtMessaging %SOURCE_PATH%\src\messaging
-) else if %FIRST% == multimedia (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtMultimediaKit %SOURCE_PATH%\src\multimedia
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtMultimediaKit %SOURCE_PATH%\src\multimedia\audio
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtMultimediaKit %SOURCE_PATH%\src\multimedia\video
-) else if %FIRST% == publishsubscribe (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtPublishSubscribe %SOURCE_PATH%\src\publishsubscribe
-) else if %FIRST% == systeminfo (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtSystemInfo %SOURCE_PATH%\src\systeminfo
-) else if %FIRST% == serviceframework (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtServiceFramework %SOURCE_PATH%\src\serviceframework
-) else if %FIRST% == telephony (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtTelephony %SOURCE_PATH%\src\telephony
-) else if %FIRST% == versit (
-    REM versit implies contacts and organizer, which implies SFW
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtVersit %SOURCE_PATH%\src\versit
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts\requests
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts\filters
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts\details
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer\items
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer\requests
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer\filters
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer\details
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtmServiceFramework %SOURCE_PATH%\src\serviceframework
-) else if %FIRST% == sensors (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtSensors %SOURCE_PATH%\src\sensors
-) else if %FIRST% == gallery (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtGallery %SOURCE_PATH%\src\gallery
-) else if %FIRST% == organizer (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer\items
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer\requests
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer\filters
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer\details
-) else if %FIRST% == feedback (
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtFeedback %SOURCE_PATH%\src\feedback
-)
-
-if "%REMAINING%" == "" (
-    shift
-) else (
-    set MODULES_TEMP=%REMAINING%
-    goto generateHeaders
-)
-
-SET REMAINING=
-SET FIRST=
-SET MODULES_TEMP=
-
-if exist config.pri del config.pri
-ren %PROJECT_CONFIG% config.pri
-
-echo.
-echo Running qmake...
-call %QT_PATH%qmake -recursive %VC_TEMPLATE_OPTION% %SOURCE_PATH%\qtmobility.pro
-if errorlevel 1 goto qmakeRecError
-echo.
-echo configure has finished. You may run %MOBILITY_MAKE% to build the project now.
-goto exitTag
-
-:qmakeRecError
-echo.
-echo configure failed.
-goto errorTag
-
-:errorTag
-set BUILD_PATH=
-set CURRENTDIR=
-set MOBILITY_MAKE=
-set MOBILITY_BUILDSYSTEM=
-set PROJECT_CONFIG=
-set PROJECT_LOG=
-set QT_MOBILITY_PREFIX=
-set QT_PATH=
-set SOURCE_PATH=
-set MOBILITY_MODULES=
-set MOBILITY_MODULES_UNPARSED=
-set REMAINING=
-set FIRST=
-set MODULES_TEMP=
-set QT_MOBILITY_EXAMPLES=
-set QT_MOBILITY_DEMOS=
-exit /b 1
-
-:exitTag
-set BUILD_PATH=
-set CURRENTDIR=
-set MOBILITY_MAKE=
-set MOBILITY_BUILDSYSTEM=
-set PROJECT_CONFIG=
-set PROJECT_LOG=
-set QT_MOBILITY_PREFIX=
-set QT_PATH=
-set SOURCE_PATH=
-set MOBILITY_MODULES=
-set MOBILITY_MODULES_UNPARSED=
-set REMAINING=
-set FIRST=
-set MODULES_TEMP=
-set QT_MOBILITY_EXAMPLES=
-set QT_MOBILITY_DEMOS=
-exit /b 0
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::
+:: Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+:: All rights reserved.
+:: Contact: Nokia Corporation (qt-info@nokia.com)
+::
+:: This file is part of the Qt Mobility Components.
+::
+:: $QT_BEGIN_LICENSE:LGPL$
+:: No Commercial Usage
+:: This file contains pre-release code and may not be distributed.
+:: You may use this file in accordance with the terms and conditions
+:: contained in the Technology Preview License Agreement accompanying
+:: this package.
+::
+:: GNU Lesser General Public License Usage
+:: Alternatively, this file may be used under the terms of the GNU Lesser
+:: General Public License version 2.1 as published by the Free Software
+:: Foundation and appearing in the file LICENSE.LGPL included in the
+:: packaging of this file.  Please review the following information to
+:: ensure the GNU Lesser General Public License version 2.1 requirements
+:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+::
+:: In addition, as a special exception, Nokia gives you certain additional
+:: rights.  These rights are described in the Nokia Qt LGPL Exception
+:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+::
+:: If you have questions regarding the use of this file, please contact
+:: Nokia at qt-info@nokia.com.
+::
+::
+::
+::
+::
+::
+::
+::
+:: $QT_END_LICENSE$
+::
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+
+@echo off
+
+set QT_MOBILITY_PREFIX= C:\QtMobility
+set BUILD_PATH=%CD%
+set SOURCE_PATH= %~dp0
+cd /D %SOURCE_PATH%
+set SOURCE_PATH=%CD%
+cd /D %BUILD_PATH%
+
+set PROJECT_CONFIG=%BUILD_PATH%\config.in
+set PROJECT_LOG=%BUILD_PATH%\config.log
+set RELEASEMODE=release
+set WIN32_RELEASEMODE=debug_and_release build_all
+set QT_MOBILITY_LIB=
+set BUILD_UNITTESTS=no
+set BUILD_EXAMPLES=no
+set BUILD_DEMOS=no
+set BUILD_DOCS=yes
+set BUILD_TOOLS=yes
+set MOBILITY_MODULES=bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors gallery telephony organizer feedback
+set MOBILITY_MODULES_UNPARSED=
+set VC_TEMPLATE_OPTION=
+set QT_PATH=
+set QMAKE_CACHE=%BUILD_PATH%\.qmake.cache
+
+if exist "%QMAKE_CACHE%" del /Q %QMAKE_CACHE%
+if exist "%PROJECT_LOG%" del /Q %PROJECT_LOG%
+if exist "%PROJECT_CONFIG%" del /Q %PROJECT_CONFIG%
+
+echo QT_MOBILITY_SOURCE_TREE = %SOURCE_PATH:\=/% > %QMAKE_CACHE%
+echo QT_MOBILITY_BUILD_TREE = %BUILD_PATH:\=/% >> %QMAKE_CACHE%
+set QMAKE_CACHE=
+
+:cmdline_parsing
+if "%1" == ""                   goto startProcessing
+if "%1" == "-debug"             goto debugTag
+if "%1" == "-release"           goto releaseTag
+if "%1" == "-silent"            goto silentTag
+if "%1" == "-prefix"            goto prefixTag
+if "%1" == "-libdir"            goto libTag
+if "%1" == "-bindir"            goto binTag
+if "%1" == "-headerdir"         goto headerTag
+if "%1" == "-plugindir"         goto pluginTag
+if "%1" == "-examplesdir"       goto examplesDirTag
+if "%1" == "-demosdir"          goto demosDirTag
+if "%1" == "-tests"             goto testTag
+if "%1" == "-examples"          goto exampleTag
+if "%1" == "-demos"             goto demosTag
+if "%1" == "-qt"                goto qtTag
+if "%1" == "-vc"                goto vcTag
+if "%1" == "-no-docs"           goto nodocsTag
+if "%1" == "-no-tools"          goto noToolsTag
+if "%1" == "-modules"           goto modulesTag
+if "%1" == "/?"                 goto usage
+if "%1" == "-h"                 goto usage
+if "%1" == "-help"              goto usage
+if "%1" == "--help"             goto usage
+if "%1" == "-symbian-unfrozen"  goto unfrozenTag
+
+
+echo Unknown option: "%1"
+goto usage
+
+:usage
+echo Usage: configure.bat [-prefix (dir)] [headerdir (dir)] [libdir (dir)]
+    echo                  [-bindir (dir)] [-tests] [-examples]
+    echo                  [-debug] [-release] [-silent]
+    echo.
+    echo Options:
+    echo.
+    echo -prefix (dir) ..... This will install everything relative to dir
+    echo                     (default prefix: C:\QtMobility)
+    echo -headerdir (dir) .. Header files will be installed to dir
+    echo                     (default prefix: PREFIX/include)
+    echo -libdir (dir) ..... Libraries will be installed to dir
+    echo                     (default PREFIX/lib)
+    echo -bindir (dir) ..... Executables will be installed to dir
+    echo                     (default PREFIX/bin)
+    echo -plugindir (dir) .. Plug-ins will be installed to dir
+    echo                     (default PREFIX/plugins)
+    echo -examplesdir (dir)  Examples will be installed to dir
+    echo                     (default PREFIX/bin)
+    echo -demosdir (dir) ... Demos will be installed to dir
+    echo                     (default PREFIX/bin)
+    echo -debug ............ Build with debugging symbols
+    echo -release .......... Build without debugging symbols
+    echo -silent ........... Reduces build output
+    echo -tests ............ Build unit tests (not build by default)
+    echo                     Note, this adds test symbols to all libraries
+    echo                     and should not be used for release builds.
+    echo -examples ......... Build example applications
+    echo -demos ............ Build demo applications
+    echo -no-docs .......... Do not build documentation (build by default)
+    echo -modules ^<list^> ... Build only the specified modules (default all)
+    echo                     Choose from: bearer contacts gallery location publishsubscribe
+    echo                     messaging multimedia systeminfo serviceframework telephony
+    echo                     sensors versit organizer feedback
+    echo                     Modules should be separated by a space and surrounded
+    echo                     by double quotation. If a selected module depends on other modules
+    echo                     those modules (and their dependencies) will automatically be enabled.
+    echo -vc ............... Generate Visual Studio make files
+
+
+if exist "%PROJECT_CONFIG%" del %PROJECT_CONFIG%
+goto exitTag
+
+:qtTag
+shift
+set QT_PATH=%1\
+shift
+goto cmdline_parsing
+
+:debugTag
+if "%RELEASEMODE%" == "release" set RELEASEMODE=debug
+set WIN32_RELEASEMODE=
+shift
+goto cmdline_parsing
+
+:releaseTag
+if "%RELEASEMODE%" == "debug"   set RELEASEMODE=release
+set WIN32_RELEASEMODE=
+shift
+goto cmdline_parsing
+
+:silentTag
+echo CONFIG += silent > %PROJECT_CONFIG%
+shift
+goto cmdline_parsing
+
+:prefixTag
+shift
+set QT_MOBILITY_PREFIX=%1
+shift
+goto cmdline_parsing
+
+:libTag
+shift
+echo QT_MOBILITY_LIB = %1 >> %PROJECT_CONFIG%
+shift
+goto cmdline_parsing
+
+:binTag
+shift
+echo QT_MOBILITY_BIN = %1 >> %PROJECT_CONFIG%
+shift
+goto cmdline_parsing
+
+:headerTag
+shift
+echo QT_MOBILITY_INCLUDE = %1 >> %PROJECT_CONFIG%
+shift
+goto cmdline_parsing
+
+:pluginTag
+shift
+echo QT_MOBILITY_PLUGINS = %1 >> %PROJECT_CONFIG%
+shift
+echo
+goto cmdline_parsing
+
+:examplesDirTag
+shift
+echo QT_MOBILITY_EXAMPLES = %1 >> %PROJECT_CONFIG%
+shift
+echo
+goto cmdline_parsing
+
+:demosDirTag
+shift
+echo QT_MOBILITY_DEMOS =%1 >> %PROJECT_CONFIG%
+shift
+echo
+goto cmdline_parsing
+
+:unfrozenTag
+REM Should never be used in release builds
+REM Some SDK's seem to exclude Q_AUTOTEST_EXPORT symbols if the
+REM libraries are frozen. This breaks unit tests relying on the auto test exports
+REM This flag unfreezes the SYMBIAN libraries for the purpose of unit test building.
+REM Ideally this should be connected to '-tests' option but that would prevent
+REM integration testing for frozen symbols as the CI system should test unit tests
+REM and frozen symbol compliance.
+echo symbian_symbols_unfrozen = 1 >> %PROJECT_CONFIG%
+shift
+goto cmdline_parsing
+
+:testTag
+set BUILD_UNITTESTS=yes
+shift
+goto cmdline_parsing
+
+:exampleTag
+set BUILD_EXAMPLES=yes
+shift
+goto cmdline_parsing
+
+:demosTag
+set BUILD_DEMOS=yes
+shift
+goto cmdline_parsing
+
+:vcTag
+shift
+set VC_TEMPLATE_OPTION=-tp vc
+goto cmdline_parsing
+
+:nodocsTag
+set BUILD_DOCS=no
+shift
+goto cmdline_parsing
+
+:noToolsTag
+set BUILD_TOOLS=no
+shift
+goto cmdline_parsing
+
+:modulesTag
+shift
+:: %1 can have leading/trailing quotes, so we can't use if "%1" == ""
+if xx%1xx == xxxx (
+    echo. >&2
+    echo >&2The -modules option requires a list of modules.
+    echo. >&2
+    goto usage
+)
+
+:: Remove leading/trailing quotes, if we have them
+set MOBILITY_MODULES_UNPARSED=xxx%1xxx
+set MOBILITY_MODULES_UNPARSED=%MOBILITY_MODULES_UNPARSED:"xxx=%
+set MOBILITY_MODULES_UNPARSED=%MOBILITY_MODULES_UNPARSED:xxx"=%
+set MOBILITY_MODULES_UNPARSED=%MOBILITY_MODULES_UNPARSED:xxx=%
+
+REM reset default modules as we expect a modules list
+set MOBILITY_MODULES=
+
+echo Checking selected modules:
+:modulesTag2
+
+for /f "tokens=1,*" %%a in ("%MOBILITY_MODULES_UNPARSED%") do (
+    set FIRST=%%a
+    set REMAINING=%%b
+)
+
+: What we want is a switch as we need to check module name and only want to
+: distinguish between false and correct module names being passed
+if %FIRST% == bearer (
+    echo     Bearer Management selected
+) else if %FIRST% == contacts (
+    echo     Contacts selected ^(implies ServiceFramework^)
+) else if %FIRST% == location (
+    echo     Location selected
+) else if %FIRST% == messaging (
+    echo     Messaging selected
+) else if %FIRST% == multimedia (
+    echo     Multimedia selected
+) else if %FIRST% == publishsubscribe (
+    echo     PublishSubscribe selected
+) else if %FIRST% == systeminfo (
+    echo     Systeminfo selected
+) else if %FIRST% == serviceframework (
+    echo     ServiceFramework selected
+) else if %FIRST% == telephony (
+    echo     Telephony selected
+) else if %FIRST% == versit (
+    echo     Versit selected ^(implies Contacts and Organizer^)
+) else if %FIRST% == organizer (
+    echo     Organizer selected
+) else if %FIRST% == feedback (
+    echo     Feedback selected
+) else if %FIRST% == sensors (
+    echo     Sensors selected
+) else if %FIRST% == gallery (
+    echo     Gallery selected
+) else (
+    echo     Unknown module %FIRST%
+    goto errorTag
+)
+
+set MOBILITY_MODULES=%MOBILITY_MODULES% %FIRST%
+
+if "%REMAINING%" == "" (
+    shift
+) else (
+    set MOBILITY_MODULES_UNPARSED=%REMAINING%
+    goto modulesTag2
+)
+
+SET REMAINING=
+SET FIRST=
+goto cmdline_parsing
+
+:startProcessing
+
+echo CONFIG += %RELEASEMODE% >> %PROJECT_CONFIG%
+echo CONFIG_WIN32 += %WIN32_RELEASEMODE% %RELEASEMODE% >> %PROJECT_CONFIG%
+set RELEASEMODE=
+set WIN32_RELEASEMODE=
+
+set CURRENTDIR=%CD%
+echo %CURRENTDIR%
+if exist %QT_MOBILITY_PREFIX% goto prefixExists
+mkdir %QT_MOBILITY_PREFIX%
+if errorlevel 1 goto invalidPrefix
+cd /D %QT_MOBILITY_PREFIX%
+set QT_MOBILITY_PREFIX=%CD%
+cd /D %CURRENTDIR%
+rd /S /Q %QT_MOBILITY_PREFIX%
+goto endprefixProcessing
+
+:invalidPrefix
+echo "%QT_MOBILITY_PREFIX%" is not a valid directory path.
+goto :exitTag
+
+:prefixExists
+cd /D %QT_MOBILITY_PREFIX%
+set QT_MOBILITY_PREFIX=%CD%
+cd /D %CURRENTDIR%
+
+:endprefixProcessing
+echo QT_MOBILITY_PREFIX = %QT_MOBILITY_PREFIX:\=/% >> %PROJECT_CONFIG%
+
+echo build_unit_tests = %BUILD_UNITTESTS% >> %PROJECT_CONFIG%
+set BUILD_UNITTESTS=
+
+echo build_examples = %BUILD_EXAMPLES% >> %PROJECT_CONFIG%
+set BUILD_EXAMPLES=
+
+echo build_demos = %BUILD_DEMOS% >> %PROJECT_CONFIG%
+set BUILD_DEMOS=
+
+echo build_docs = %BUILD_DOCS% >> %PROJECT_CONFIG%
+set BUILD_DOCS=
+
+echo build_tools = %BUILD_TOOLS% >> %PROJECT_CONFIG%
+set BUILD_TOOLS=
+
+echo qmf_enabled = no >> %PROJECT_CONFIG%
+
+echo !symbian:isEmpty($$QT_MOBILITY_INCLUDE):QT_MOBILITY_INCLUDE=$$QT_MOBILITY_PREFIX/include >> %PROJECT_CONFIG%
+echo isEmpty($$QT_MOBILITY_LIB):QT_MOBILITY_LIB=$$QT_MOBILITY_PREFIX/lib >> %PROJECT_CONFIG%
+echo isEmpty($$QT_MOBILITY_BIN):QT_MOBILITY_BIN=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
+echo isEmpty($$QT_MOBILITY_PLUGINS):QT_MOBILITY_PLUGINS=$$QT_MOBILITY_PREFIX/plugins >> %PROJECT_CONFIG%
+echo isEmpty($$QT_MOBILITY_EXAMPLES):QT_MOBILITY_EXAMPLES=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
+echo isEmpty($$QT_MOBILITY_DEMOS):QT_MOBILITY_DEMOS=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
+
+echo mobility_modules = %MOBILITY_MODULES%  >> %PROJECT_CONFIG%
+echo contains(mobility_modules,versit): mobility_modules *= contacts organizer  >> %PROJECT_CONFIG%
+echo contains(mobility_modules,contacts): mobility_modules *= serviceframework  >> %PROJECT_CONFIG%
+
+echo Checking available Qt
+call %QT_PATH%qmake -v >> %PROJECT_LOG% 2>&1
+if errorlevel 1 goto qmakeNotFound
+goto qmakeFound
+:qmakeNotFound
+echo ... Not found  >> %PROJECT_LOG% 2>&1
+if "%QT_PATH%" == "" (
+    echo >&2Cannot find 'qmake' in your PATH.
+    echo >&2Your PATH is: %PATH%
+) else (
+    echo >&2Cannot find 'qmake' in %QT_PATH%.
+)
+echo >&2Aborting.
+goto errorTag
+
+:qmakeFound
+call %QT_PATH%qmake -query QT_VERSION
+
+goto checkMake
+
+:makeTest
+setlocal
+    set CURRENT_PWD=%CD%
+
+    if %BUILD_PATH% == %SOURCE_PATH% (
+        cd %SOURCE_PATH%\config.tests\make
+        if exist make del make
+    ) else (
+        rmdir /S /Q config.tests\make
+        mkdir config.tests\make
+        cd config.tests\make
+    )
+
+    for /f "tokens=2,3" %%a in ('call %QT_PATH%qmake %SOURCE_PATH%\config.tests\make\make.pro 2^>^&1 1^>NUL') do (
+        if "%%a" == "MESSAGE:" (
+            set BUILDSYSTEM=%%b)
+    )
+
+    if "%BUILDSYSTEM%" == "symbian-abld" (
+        call make -h >> %PROJECT_LOG% 2>&1
+        if not errorlevel 1 (
+            echo ... Symbian abld make found.
+            set MAKE=make
+        )
+    ) else if "%BUILDSYSTEM%" == "symbian-sbsv2" (
+        call make -h >> %PROJECT_LOG% 2>&1
+        if not errorlevel 1 (
+            echo ... Symbian sbsv2 make found.
+            set MAKE=make
+        )
+    ) else if "%BUILDSYSTEM%" == "win32-nmake" (
+        call nmake /? >> %PROJECT_LOG% 2>&1
+        if not errorlevel 1 (
+            echo ... nmake found.
+            set MAKE=nmake
+        )
+    ) else if "%BUILDSYSTEM%" == "win32-mingw" (
+        call mingw32-make -v >> %PROJECT_LOG% 2>&1
+        if not errorlevel 1 (
+            echo ... mingw32-make found.
+            set MAKE=mingw32-make
+        )
+    ) else (
+        echo ... Unknown target environment %BUILDSYSTEM%.
+    )
+    call cd %CURRENT_PWD%
+call endlocal&set %1=%MAKE%&set %2=%BUILDSYSTEM%&goto :EOF
+
+:checkMake
+echo Checking make
+call :makeTest MOBILITY_MAKE MOBILITY_BUILDSYSTEM
+if not "%MOBILITY_MAKE%" == "" goto compileTests
+
+echo >&2Cannot find 'nmake', 'mingw32-make' or 'make' in your PATH
+echo >&2Aborting.
+goto errorTag
+
+:compileTest
+setlocal
+    @echo off
+    echo Checking %1
+    set CURRENT_PWD=%CD%
+
+    if %BUILD_PATH% == %SOURCE_PATH% (
+        cd %SOURCE_PATH%\config.tests\%2
+        if exist %2 del %2
+    ) else (
+        rmdir /S /Q config.tests\%2
+        mkdir config.tests\%2
+        cd config.tests\%2
+    )
+
+    call %QT_PATH%qmake %SOURCE_PATH%\config.tests\%2\%2.pro >> %PROJECT_LOG% 2>&1
+
+    set FAILED=0
+    if "%MOBILITY_BUILDSYSTEM%" == "symbian-sbsv2" (
+        call %MOBILITY_MAKE% release-armv5 >> %PROJECT_LOG% 2>&1
+        for /f "tokens=2" %%i in ('%MOBILITY_MAKE% release-armv5 SBS^="@sbs --check"') do set FAILED=1
+    ) else if "%MOBILITY_BUILDSYSTEM%" == "symbian-abld" (
+        call %MOBILITY_MAKE% release-gcce >> %PROJECT_LOG% 2>&1
+        for /f "tokens=2" %%i in ('%MOBILITY_MAKE% release-gcce ABLD^="@ABLD.BAT -c" 2^>^&1') do if not %%i == bldfiles set FAILED=1
+    ) else (
+        REM Make for other builds
+        call %MOBILITY_MAKE% >> %PROJECT_LOG% 2>&1
+        REM have to check error level for windows / other builds to be sure.
+        if errorlevel 1 (
+           set FAILED=1
+        )
+    )
+
+    if %FAILED% == 0 (
+        echo ... OK
+        echo %2_enabled = yes >> %PROJECT_CONFIG%
+    ) else (
+        echo ... Not Found
+        echo %2_enabled = no >> %PROJECT_CONFIG%
+    )
+
+    cd %CURRENT_PWD%
+endlocal&goto :EOF
+
+:compileTests
+REM We shouldn't enable some of these if the corresponding modules are not enabled
+echo.
+echo Start of compile tests
+REM compile tests go here.
+for /f "tokens=3" %%i in ('call %QT_PATH%qmake %SOURCE_PATH%\config.tests\make\make.pro 2^>^&1 1^>NUL') do set BUILDSYSTEM=%%i
+if "%BUILDSYSTEM%" == "symbian-abld" goto symbianTests
+if "%BUILDSYSTEM%" == "symbian-sbsv2" goto symbianTests
+goto windowsTests
+
+:symbianTests
+
+call :compileTest LBT lbt
+call :compileTest SNAP snap
+call :compileTest OCC occ
+call :compileTest SymbianContactSIM symbiancntsim
+call :compileTest SymbianContactModel symbiancntmodel
+call :compileTest SymbianContactModelv2 symbiancntmodelv2
+call :compileTest S60_Sensor_API sensors_s60_31
+call :compileTest Symbian_Sensor_Framework sensors_symbian
+call :compileTest Symbian_Hb hb_symbian
+call :compileTest Audiorouting_s60 audiorouting_s60
+call :compileTest Tunerlibrary_for_3.1 tunerlib_s60
+call :compileTest RadioUtility_for_post_3.1 radioutility_s60
+call :compileTest OpenMaxAl_support openmaxal_symbian
+call :compileTest Surfaces_s60 surfaces_s60
+call :compileTest Symbian_Messaging_Freestyle messaging_freestyle
+call :compileTest IMMERSION immersion
+
+goto noTests
+
+:windowsTests
+
+call :compileTest DirectShow directshow
+call :compileTest WindowsMediaSDK wmsdk
+call :compileTest WindowMediaPlayer wmp
+call :compileTest EnhancedVideoRenderer evr
+
+:noTests
+
+echo End of compile tests
+echo.
+echo.
+
+REM we could skip generating headers if a module is not enabled
+if not exist "%BUILD_PATH%\features" mkdir %BUILD_PATH%\features
+copy %SOURCE_PATH%\features\strict_flags.prf %BUILD_PATH%\features
+echo Generating Mobility Headers...
+rd /s /q %BUILD_PATH%\include
+mkdir %BUILD_PATH%\include
+perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\global
+
+set MODULES_TEMP=%MOBILITY_MODULES%
+
+:generateHeaders
+
+for /f "tokens=1,*" %%a in ("%MODULES_TEMP%") do (
+    set FIRST=%%a
+    set REMAINING=%%b
+)
+
+if %FIRST% == bearer (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtBearer %SOURCE_PATH%\src\bearer
+) else if %FIRST% == contacts (
+    REM contacts implies service framework
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts\requests
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts\filters
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts\details
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtServiceFramework %SOURCE_PATH%\src\serviceframework
+) else if %FIRST% == location (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtLocation %SOURCE_PATH%\src\location
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtLocation %SOURCE_PATH%\src\location\landmarks
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtLocation %SOURCE_PATH%\src\location\maps
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtLocation %SOURCE_PATH%\src\location\maps\tiled
+) else if %FIRST% == messaging (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtMessaging %SOURCE_PATH%\src\messaging
+) else if %FIRST% == multimedia (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtMultimediaKit %SOURCE_PATH%\src\multimedia
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtMultimediaKit %SOURCE_PATH%\src\multimedia\audio
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtMultimediaKit %SOURCE_PATH%\src\multimedia\video
+) else if %FIRST% == publishsubscribe (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtPublishSubscribe %SOURCE_PATH%\src\publishsubscribe
+) else if %FIRST% == systeminfo (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtSystemInfo %SOURCE_PATH%\src\systeminfo
+) else if %FIRST% == serviceframework (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtServiceFramework %SOURCE_PATH%\src\serviceframework
+) else if %FIRST% == telephony (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtTelephony %SOURCE_PATH%\src\telephony
+) else if %FIRST% == versit (
+    REM versit implies contacts and organizer, which implies SFW
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtVersit %SOURCE_PATH%\src\versit
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts\requests
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts\filters
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtContacts %SOURCE_PATH%\src\contacts\details
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer\items
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer\requests
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer\filters
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer\details
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtmServiceFramework %SOURCE_PATH%\src\serviceframework
+) else if %FIRST% == sensors (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtSensors %SOURCE_PATH%\src\sensors
+) else if %FIRST% == gallery (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtGallery %SOURCE_PATH%\src\gallery
+) else if %FIRST% == organizer (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer\items
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer\requests
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer\filters
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtOrganizer %SOURCE_PATH%\src\organizer\details
+) else if %FIRST% == feedback (
+    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include\QtFeedback %SOURCE_PATH%\src\feedback
+)
+
+if "%REMAINING%" == "" (
+    shift
+) else (
+    set MODULES_TEMP=%REMAINING%
+    goto generateHeaders
+)
+
+SET REMAINING=
+SET FIRST=
+SET MODULES_TEMP=
+
+if exist config.pri del config.pri
+ren %PROJECT_CONFIG% config.pri
+
+echo.
+echo Running qmake...
+call %QT_PATH%qmake -recursive %VC_TEMPLATE_OPTION% %SOURCE_PATH%\qtmobility.pro
+if errorlevel 1 goto qmakeRecError
+echo.
+echo configure has finished. You may run %MOBILITY_MAKE% to build the project now.
+goto exitTag
+
+:qmakeRecError
+echo.
+echo configure failed.
+goto errorTag
+
+:errorTag
+set BUILD_PATH=
+set CURRENTDIR=
+set MOBILITY_MAKE=
+set MOBILITY_BUILDSYSTEM=
+set PROJECT_CONFIG=
+set PROJECT_LOG=
+set QT_MOBILITY_PREFIX=
+set QT_PATH=
+set SOURCE_PATH=
+set MOBILITY_MODULES=
+set MOBILITY_MODULES_UNPARSED=
+set REMAINING=
+set FIRST=
+set MODULES_TEMP=
+set QT_MOBILITY_EXAMPLES=
+set QT_MOBILITY_DEMOS=
+exit /b 1
+
+:exitTag
+set BUILD_PATH=
+set CURRENTDIR=
+set MOBILITY_MAKE=
+set MOBILITY_BUILDSYSTEM=
+set PROJECT_CONFIG=
+set PROJECT_LOG=
+set QT_MOBILITY_PREFIX=
+set QT_PATH=
+set SOURCE_PATH=
+set MOBILITY_MODULES=
+set MOBILITY_MODULES_UNPARSED=
+set REMAINING=
+set FIRST=
+set MODULES_TEMP=
+set QT_MOBILITY_EXAMPLES=
+set QT_MOBILITY_DEMOS=
+exit /b 0


take in typo fix in kuduscript

take in typo fix in kuduscript

--- Kudu.Services.Web/updateNodeModules.cmd
+++ Kudu.Services.Web/updateNodeModules.cmd
@@ -10,7 +10,7 @@
 set /a counter+=1
 echo Attempt %counter% out of %attempts%

-cmd /c npm install https://github.com/projectkudu/KuduScript/tarball/7afc3cf3c63c2f4e9f55c30c397280064932d16c
+cmd /c npm install https://github.com/projectkudu/KuduScript/tarball/aadbe2bd33543483dd9659d35fc591a992e7aa6f
 IF %ERRORLEVEL% NEQ 0 goto error

 goto end


Added error handling to updateNodeModules.cmd script.

--- Kudu.Services.Web/updateNodeModules.cmd
+++ Kudu.Services.Web/updateNodeModules.cmd
@@ -16,4 +16,15 @@
   cmd /c npm install kudusync
 )

+IF %ERRORLEVEL% NEQ 0 goto error
+
 popd
+
+goto end
+
+:error
+echo An error has occured during npm install.
+exit /b 1
+
+:end
+echo Finished successfully.


genie batch file

genie batch file

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

--- projects/genie.bat
+++ projects/genie.bat
@@ -0,0 +1 @@
+genie.exe vs2013


Fix wrong vimrc filenames.

Fix wrong vimrc filenames.

--- bootstrap.bat
+++ bootstrap.bat
@@ -6,11 +6,11 @@

 if exist %USERPROFILE%\_vimrc goto GVIMRC
 echo let ^&runtimepath = printf('%%s,%%s', '%CD%\vim\vimfiles', ^&runtimepath) > %USERPROFILE%\_vimrc
-echo source %CD%\dotfiles\vim\_vimrc >> %USERPROFILE%\_vimrc
+echo source %CD%\dotfiles\vim\vimrc >> %USERPROFILE%\_vimrc

 :GVIMRC
 if exist %USERPROFILE%\_gvimrc goto END
-echo source %CD%\dotfiles\vim\_gvimrc > %USERPROFILE%\_gvimrc
+echo source %CD%\dotfiles\vim\gvimrc > %USERPROFILE%\_gvimrc

 :END
 popd


Added a build script for Windows for CLI tools

Added a build script for Windows for CLI tools, that uses rdmd to
compile bconv and ddis tools

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

--- build_cli.bat
+++ build_cli.bat
@@ -0,0 +1,6 @@
+@echo off
+echo Compiling bconv
+rdmd --build-only -Jsrc src\bconv.d
+
+echo Compiling ddis
+rdmd --build-only -Jsrc src\ddis.d


make sure we have no windows line endings

--- recipes/r-gbj/bld.bat
+++ recipes/r-gbj/bld.bat
@@ -1,2 +1,2 @@
-"%R%" CMD INSTALL --build . %R_ARGS%
-IF %ERRORLEVEL% NEQ 0 exit /B 1
+"%R%" CMD INSTALL --build . %R_ARGS%
+IF %ERRORLEVEL% NEQ 0 exit /B 1


Restore original example project.

Restore original example project.

--- mb-env.bat
+++ mb-env.bat
@@ -9,8 +9,8 @@
 set PYBLISH_LITE=%~dp0git\pyblish-lite
 set AVALON_CORE=%~dp0git\avalon-core
 set AVALON_LAUNCHER=%~dp0git\avalon-launcher
-set AVALON_EXAMPLE=%~dp0git\avalon-example\projects
 set AVALON_CONFIG=polly
+set MINDBENDER_EXAMPLE=%~dp0git\mindbender-example\projects

 set PATH=%~dp0bin\windows\python36;%PATH%
 set PATH=%~dp0bin\windows;%PATH%
@@ -22,4 +22,4 @@

 set PYBLISHGUI=pyblish_qml

-if "%AVALON_PROJECTS%"=="" set AVALON_PROJECTS=%AVALON_EXAMPLE%
+if "%AVALON_PROJECTS%"=="" set AVALON_PROJECTS=%MINDBENDER_EXAMPLE%


Try to fix Appveyor problem windows

Try to fix Appveyor problem windows

--- ci/appveyor/install.cmd
+++ ci/appveyor/install.cmd
@@ -9,11 +9,9 @@

 :: Activate test environment anaconda
-IF %PLATFORM%=="x86" (
-    set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%
-) ELSE (
-	set PATH=%MINICONDA%-%PLATFORM%;%MINICONDA%-%PLATFORM%\\Scripts;%PATH%
-)
+
+:: N.B. If you split it over multiple lines it does not work (why!??!!?)
+IF %PLATFORM%=="x86" (set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%) ELSE (set PATH=%MINICONDA%-%PLATFORM%;%MINICONDA%-%PLATFORM%\\Scripts;%PATH%)

 conda config --set always_yes yes --set changeps1 no
 conda update -q conda


v4.0b

v4.0b

Fixes:
	- Merge function:
		*no longer has the potential to truncate super long lines.
		*no more issues with exclamation marks in user_pref lines.

Improvements:
	- Overall better performance due to ECHO syntax changes.
	- Merge function on steroids! Faster than ever, and no longer generates temporary files at all. As it always should have been.

Changes, Additions, Substractions:
	- Leading spaces are no longer ignored by the merge function. Lines to be merged must begin with user_pref.
	- Added header with name, author, version.
	- Added help sub-menu.
	- Added special message when no override files are found when using -multiOverrides.
	- Formatting changes.

--- updater.bat
+++ updater.bat
@@ -1,40 +1,23 @@
-@ECHO OFF
+@ECHO OFF & SETLOCAL EnableDelayedExpansion
 TITLE ghacks user.js updater

 REM ### ghacks-user.js updater for Windows
 REM ## author: @claustromaniac
-REM ## version: 3.2
+REM ## version: 4.0b1

 SET _myname=%~n0
 SET _myparams=%*
-SETLOCAL EnableDelayedExpansion
 :parse
-IF "%~1"=="" (
-	GOTO endparse
-)
-IF /I "%~1"=="-unattended" (
-	SET _ua=1
-)
-IF /I "%~1"=="-log" (
-	SET _log=1
-)
-IF /I "%~1"=="-logp" (
-	SET _log=1
-	SET _logp=1
-)
-IF /I "%~1"=="-multioverrides" (
-	SET _multi=1
-)
-IF /I "%~1"=="-merge" (
-	SET _merge=1
-)
-IF /I "%~1"=="-updatebatch" (
-	SET _updateb=1
-)
+IF "%~1"=="" ( GOTO endparse )
+IF /I "%~1"=="-unattended" ( SET _ua=1 )
+IF /I "%~1"=="-log" ( SET _log=1 )
+IF /I "%~1"=="-logp" ( SET _log=1 & SET _logp=1 )
+IF /I "%~1"=="-multioverrides" ( SET _multi=1 )
+IF /I "%~1"=="-merge" (	SET _merge=1 )
+IF /I "%~1"=="-updatebatch" ( SET _updateb=1 )
 SHIFT
 GOTO parse
 :endparse
-ECHO.
 IF DEFINED _updateb (
 	REM The normal flow here goes from phase 1 to phase 2 and then phase 3.
 	IF NOT "!_myname:~0,9!"=="[updated]" (
@@ -44,19 +27,16 @@
 			REM 	* Begin the normal routine
 			REN "[updated]!_myname!.bat" "[updated]!_myname!.bat.old"
 			DEL /F "[updated]!_myname!.bat.old"
-			ECHO Script updated^^!
-			ECHO.
+			CALL :message "Script updated^^!
 			TIMEOUT 3 >nul
 			CLS
-			ECHO.
 			GOTO begin
 		)
 		REM ## Phase 1 ##
 		REM 	* Download new batch and name it [updated]*.bat
 		REM 	* Start that script in a new CMD window
 		REM 	* Exit
-		ECHO Updating script...
-		ECHO.
+		CALL :message "Updating script..."
 		REM Uncomment the next line and comment the powershell call for testing.
 		REM COPY /B /V /Y "!_myname!.bat" "[updated]!_myname!.bat"
 		(
@@ -66,15 +46,13 @@
 			START /min CMD /C "[updated]!_myname!.bat" !_myparams!
 			EXIT /B
 		) ELSE (
-			ECHO Failed. Make sure PowerShell is allowed internet access.
-			ECHO.
+			CALL :message "Failed. Make sure PowerShell is allowed internet access."
 			TIMEOUT 120 >nul
 			EXIT /B
 		)
 	) ELSE (
 		IF "!_myname!"=="[updated]" (
-			ECHO The [updated] label is reserved. Rename this script and try again.
-			ECHO.
+			CALL :message "The [updated] label is reserved. Rename this script and try again."
 			TIMEOUT 300 >nul
 		) ELSE (
 			REM ## Phase 2 ##: The [updated]*.bat script will:
@@ -92,180 +70,187 @@
 	)
 )
 :begin
+ECHO:
+ECHO:
+ECHO:                ########################################
+ECHO:                ####  user.js Updater for Windows   ####
+ECHO:                ####       by claustromaniac        ####
+ECHO:                ####             v4.0               ####
+ECHO:                ########################################
+ECHO:
 SET /A "_line=0"
 IF NOT EXIST user.js (
-	ECHO user.js not detected in the current directory.
+	CALL :message "user.js not detected in the current directory."
 ) ELSE (
 	FOR /F "skip=1 tokens=1,2 delims=:" %%G IN (user.js) DO (
 		SET /A "_line+=1"
-		IF !_line! GEQ 4 (
-			GOTO exitloop
-		)
-		IF !_line! EQU 1 (
-			SET _name=%%H
-		)
-		IF !_line! EQU 2 (
-			SET _date=%%H
-		)
-		IF !_line! EQU 3 (
-			SET _version=%%G
-		)
+		IF !_line! GEQ 4 ( GOTO exitloop )
+		IF !_line! EQU 1 ( SET _name=%%H )
+		IF !_line! EQU 2 ( SET _date=%%H )
+		IF !_line! EQU 3 ( SET _version=%%G )
 	)
 	:exitloop
 	IF !_line! GEQ 4 (
-		IF /I NOT "!_name!"=="!_name:ghacks=X!" (
-			ECHO ghacks user.js !_version:~2!,!_date!
-		) ELSE (
-			ECHO Current user.js version not recognised.
-		)
-	) ELSE (
-		ECHO Current user.js version not recognised.
-	)
-)
-ECHO.
+		IF /I NOT "!_name!"=="!_name:ghacks=!" (
+			CALL :message "ghacks user.js !_version:~2!,!_date!"
+		) ELSE (
+			CALL :message "Current user.js version not recognised."
+		)
+	) ELSE (
+		CALL :message "Current user.js version not recognised."
+	)
+)
+ECHO:
 IF NOT DEFINED _ua (
-	ECHO.
-	ECHO This batch should be run from your Firefox profile directory. It will download the latest version of ghacks user.js from github and then append any of your own changes from user-overrides.js to it.
-	ECHO.
-	ECHO Visit the wiki for more detailed information.
-	ECHO.
-	CHOICE /M "Continue"
-	IF ERRORLEVEL 2 ( EXIT /B )
-)
-CLS
-ECHO.
+	CALL :message "This batch should be run from your Firefox profile directory."
+	ECHO:  It will download the latest version of ghacks user.js from github and then
+	CALL :message "append any of your own changes from user-overrides.js to it."
+	CALL :message "Visit the wiki for more detailed information."
+	ECHO:
+	TIMEOUT 1 /nobreak >nul
+	CHOICE /C SHE /N /M "Start [S] Help [H] Exit [E]"
+	CLS
+	IF ERRORLEVEL 3 ( EXIT /B )
+	IF ERRORLEVEL 2 ( GOTO :showhelp )
+)
 IF DEFINED _log (
 	CALL :log >>user.js-update-log.txt 2>&1
-	IF DEFINED _logp (
-		START user.js-update-log.txt
-	)
+	IF DEFINED _logp ( START user.js-update-log.txt	)
 	EXIT /B
 	:log
-	ECHO ##################################################################
-	ECHO.
-	ECHO %date%, %time%
-	ECHO.
+	ECHO:##################################################################
+	CALL :message "%date%, %time%"
 )
 IF EXIST user.js.old.bak ( DEL /F user.js.old.bak )
 IF EXIST user.js (
 	IF EXIST user.js.bak ( REN user.js.bak user.js.old.bak )
 	REN user.js user.js.bak
-	ECHO Current user.js file backed up.
-	ECHO.
-)
-ECHO Retrieving latest user.js file from github repository...
+	CALL :message "Current user.js file backed up.
+)
+CALL :message "Retrieving latest user.js file from github repository..."
 (
 	powershell -Command "(New-Object Net.WebClient).DownloadFile('https://github.com/ghacksuserjs/ghacks-user.js/raw/master/user.js', 'user.js')"
 ) >nul 2>&1
-ECHO.
 IF EXIST user.js (
 	IF DEFINED _multi (
-		ECHO Multiple overrides enabled. List of files found:
-		FORFILES /P user.js-overrides /M *.js
-		IF %ERRORLEVEL% EQU 0 (
+		FORFILES /P user.js-overrides /M *.js >nul
+		IF NOT ERRORLEVEL 1 (
 			IF DEFINED _merge (
-				ECHO.
-				ECHO Merging...
-				ECHO.
-				COPY /B /V /Y user.js-overrides\*.js user-overrides
-				CALL :merge user-overrides user-overrides-merged.js
-				COPY /B /V /Y user.js+user-overrides-merged.js updatertempfile
-				CALL :merge updatertempfile user.js
+				CALL :message "Merging..."
+				COPY /B /V /Y user.js-overrides\*.js user-overrides-merged.js
+				CALL :merge user-overrides-merged.js
+				COPY /B /V /Y user.js+user-overrides-merged.js user.js
+				CALL :merge user.js
 			) ELSE (
-				ECHO.
-				ECHO Appending...
-				ECHO.
+				CALL :message "Appending..."
 				COPY /B /V /Y user.js+"user.js-overrides\*.js" user.js
 			)
-		)
-		ECHO.
+		) ELSE ( CALL :message "No override files found." )
+		ECHO:
 	) ELSE (
 		IF EXIST "user-overrides.js" (
+			COPY /B /V /Y user.js+"user-overrides.js" "user.js"
 			IF DEFINED _merge (
-				ECHO Merging user-overrides.js...
-				COPY /B /V /Y user.js+user-overrides.js updatertempfile
-				CALL :merge updatertempfile user.js
+				CALL :message "Merging user-overrides.js..."
+				CALL :merge user.js
 			) ELSE (
-				ECHO Appending user-overrides.js...
-				ECHO.
-				COPY /B /V /Y user.js+"user-overrides.js" "user.js"
-			)
-		) ELSE (
-			ECHO user-overrides.js not found.
-		)
-		ECHO.
-	)
-	ECHO Handling backups...
+				CALL :message "user-overrides.js appended."
+			)
+		) ELSE ( CALL :message "user-overrides.js not found." )
+		ECHO:
+	)
+	CALL :message "Handling backups..."
 	SET "changed="
 	IF EXIST user.js.bak (
 		FC user.js.bak user.js >nul && SET "changed=false" || SET "changed=true"
 	)
-	ECHO.
-	ECHO.
+	ECHO:
 	IF "!changed!"=="true" (
 		IF EXIST user.js.old.bak DEL /F user.js.old.bak
-		ECHO Update complete.
+		CALL :message "Update complete."
 	) ELSE (
 		IF "!changed!"=="false" (
 			DEL /F user.js.bak
 			IF EXIST user.js.old.bak REN user.js.old.bak user.js.bak
-			ECHO Update completed without changes.
-		) ELSE (
-			ECHO Update complete.
-		)
-	)
-	ECHO.
+			CALL :message "Update completed without changes."
+		) ELSE ( CALL :message "Update complete." )
+	)
+	ECHO:
 ) ELSE (
 	IF EXIST user.js.bak ( REN user.js.bak user.js )
 	IF EXIST user.js.old.bak ( REN user.js.old.bak user.js.bak )
-	ECHO.
-	ECHO Update failed. Make sure PowerShell is allowed internet access.
-	ECHO.
-	ECHO No changes were made.
-	ECHO.
+	CALL :message "Update failed. Make sure PowerShell is allowed internet access."
+	CALL :message "No changes were made."
 )
 IF NOT DEFINED _log (
-	IF NOT DEFINED _ua PAUSE
+	IF NOT DEFINED _ua ( PAUSE )
 )
 EXIT /B

-REM ###### Merge function ######
+REM ########### Message Function ###########
+:message
+ECHO:
+ECHO:  %~1
+ECHO:
+GOTO :EOF
+REM ############ Merge function ############
 :merge
-IF EXIST updatertempfile1 ( DEL /F updatertempfile1 )
-SETLOCAL disabledelayedexpansion
+SETLOCAL DisableDelayedExpansion
 (
-	FOR /F "tokens=1,* delims=]" %%G IN ('FIND /n /v "" ^< "%~1"') DO (
-		SET "_pref=%%H"
-		SETLOCAL enabledelayedexpansion
-		SET "_temp=!_pref: =!"
-		IF /I "user_pref"=="!_temp:~0,9!" (
-			IF /I NOT "user.js.parrot"=="!_temp:~12,14!" (
-				FOR /F "delims=," %%S IN ("!_pref!") DO (
-					SET "_pref=%%S"
-				)
-				SET _pref=!_pref:"=""!
-				FIND /I "!_pref!" updatertempfile1 >nul 2>&1
-				IF ERRORLEVEL 1 (
-					FOR /F "tokens=* delims=" %%X IN ('FIND /I "!_pref!" %~1') DO (
-						SET "_temp=%%X"
-						SET "_temp=!_temp: =!"
-						IF /I "user_pref"=="!_temp:~0,9!" (
-							SET "_pref=%%X"
-						)
+	FOR /F "tokens=1,* delims=," %%G IN ('FINDSTR /B /I /C:"user_pref" "%~1"') DO (SET "%%G=%%H")
+	FOR /F "tokens=2,* delims=:," %%I IN ('FINDSTR /N "^" "%~1"') DO (
+		IF NOT [user_pref("_user.js.parrot"]==[%%I] (
+			IF DEFINED %%I (
+				SETLOCAL EnableDelayedExpansion
+				FOR /F "delims=" %%K IN ("!%%I!") DO (
+					ENDLOCAL
+					IF NOT "%%K"=="ALREADY MERGED" (
+						ECHO:%%I,%%K
+						SET "%%I=ALREADY MERGED"
 					)
-					ECHO(!_pref!
-					ECHO(!_pref!>>updatertempfile1
 				)
 			) ELSE (
-				ECHO(!_pref!
-			)
-		) ELSE (
-			ECHO(!_pref!
-		)
-		ENDLOCAL
-	)
-)>%~2
+				IF "%%J"=="" (
+					ECHO:%%I
+				) ELSE (
+					ECHO:%%I,%%J
+				)
+			)
+		) ELSE (
+			ECHO:%%I,%%J
+		)
+	)
+)>updatertempfile
+MOVE /Y updatertempfile "%~1" >nul
 ENDLOCAL
-DEL /F %1 updatertempfile1 >nul
 GOTO :EOF
-REM ############################
+REM ############### Help ##################
+:showhelp
+MODE 80,38
+CLS
+CALL :message "Available switches (case-insensitive):"
+CALL :message "  -log"
+ECHO:     Writes the console output to a logfile (user.js-update-log.txt)
+CALL :message "  -logP"
+ECHO:     Like log, but also opens the logfile after updating.
+CALL :message "  -merge"
+ECHO:     Merges overrides instead of appending them. Comments and _user.js.parrot
+ECHO:     lines are appended normally. Overrides for inactive (commented out)
+ECHO:     user.js prefs will be appended. When -Merge and -MultiOverrides are used
+ECHO:     together, a user-overrides-merged.js file is also generated in the root
+ECHO:     directory for quick reference. It contains only the merged data from
+ECHO:     override files and can be safely discarded after updating, or used as the
+ECHO:     new user-overrides.js. When there are conflicting records for the same
+ECHO:     pref, the value of the last one declared will be used.
+CALL :message "  -multiOverrides"
+ECHO:     uses any and all .js files in a user.js-overrides sub-folder as overrides
+ECHO:     instead of the default user-overrides.js file. Files are appended in
+ECHO:     alphabetical order.
+CALL :message "  -updatebatch"
+ECHO:     The script will update itself on execution.
+CALL :message ""
+PAUSE
+CLS
+MODE 80,25
+GOTO :begin
+REM #####################################


Remove unnecessary build-core.bat

Remove unnecessary build-core.bat

--- Source/build-core.bat
+++ Source/build-core.bat
@@ -1,36 +0,0 @@
-dotnet restore
-gitversion /output buildserver /updateassemblyinfo
-set basePath=%~dp0
-set outputPath=..\..\artifacts
-
-cd %basePath%EasyNetQ
-dotnet gitversion
-dotnet pack -c Release -o %outputPath%
-
-cd %basePath%EasyNetQ.DI.Autofac
-dotnet gitversion
-dotnet pack -c Release -o %outputPath%
-
-cd %basePath%EasyNetQ.DI.LightInject
-dotnet gitversion
-dotnet pack -c Release -o %outputPath%
-
-cd %basePath%EasyNetQ.DI.Ninject
-dotnet gitversion
-dotnet pack -c Release -o %outputPath%
-
-cd %basePath%EasyNetQ.DI.SimpleInjector
-dotnet gitversion
-dotnet pack -c Release -o %outputPath%
-
-cd %basePath%EasyNetQ.DI.StructureMap
-dotnet gitversion
-dotnet pack -c Release -o %outputPath%
-
-cd %basePath%EasyNetQ.DI.Windsor
-dotnet gitversion
-dotnet pack -c Release -o %outputPath%
-
-cd %basePath%EasyNetQ.Serilog
-dotnet gitversion
-dotnet pack -c Release -o %outputPath%


enable to use vc2015

enable to use vc2015

--- vcbuild.bat
+++ vcbuild.bat
@@ -44,6 +44,14 @@
 if defined WindowsSDKDir goto project-gen
 if defined VCINSTALLDIR goto project-gen

+@rem Look for Visual Studio 2015
+if not defined VS140COMNTOOLS goto vc-set-2013
+if not exist "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat" goto vc-set-2013
+call "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat" %vs_toolset%
+set GYP_MSVS_VERSION=2015
+goto project-gen
+
+:vc-set-2013
 @rem Look for Visual Studio 2013
 if not defined VS120COMNTOOLS goto vc-set-2012
 if not exist "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" goto vc-set-2012


Add pause to the end.

Add pause to the end.

--- nuget-push.bat
+++ nuget-push.bat
@@ -1,2 +1,3 @@
 @echo off
-for %%i in (*.nupkg) do nuget push %%i+for %%i in (*.nupkg) do nuget push %%i
+pause


Fix explicitly create lib folder before creating nuget package.

--- Src/pack.cmd
+++ Src/pack.cmd
@@ -1,6 +1,7 @@
 rem msbuild NEbml.sln /p:Configuration=Release /t:Clean,Build

 del /Q /F nupackage\lib\*.*
+mkdir nupackage\lib
 copy Core\bin\Release\NEbml.Core.* nupackage\lib

 cd nupackage


fix luajit 86 -> 64

fix luajit 86 -> 64

Signed-off-by: Jean Jonethal <eaac1947116ebed7525d7738c6570a7d95ec22e4@gigaset.com>

--- make_win_x64.cmd
+++ make_win_x64.cmd
@@ -1,11 +1,11 @@
-mkdir buildx64
 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x64 /release
 ::set INCLUDE=D:\work\luars232\librs232.git\include;E:\luajit\x64;%INCLUDE%
 set INCLUDE=D:\work\luars232\librs232.git\include;E:\luajit\x64;%INCLUDE%
+mkdir buildx64
 cd buildx64
 cl /O2 /homeparams /DUNICODE /D_UNICODE /DWIN32 /DRS232_EXPORT ..\bindings\lua\luars232.c ..\src\rs232.c ..\src\rs232_windows.c E:\luajit\x64\lua51.lib /O2 /LD /link /dll
 pause
 copy ..\bindings\lua\test.lua .
-E:\luajit\x86\luajit test.lua
+E:\luajit\x64\luajit test.lua
 pause


configure.bat: fixed typo

configure.bat: fixed typo

--- configure.bat
+++ configure.bat
@@ -23,7 +23,7 @@
 cd "%0\..\"
 SET QXT_SOURCE_TREE=%CD%
 cd %QXT_BUILD_TREE%
-if not exits %QXT_BUILD_TREE%\features mkdir %QXT_BUILD_TREE%\features >NUL 2>&1
+if not exist %QXT_BUILD_TREE%\features mkdir %QXT_BUILD_TREE%\features >NUL 2>&1
 if not exist %QXT_BUILD_TREE%\examples mkdir %QXT_BUILD_TREE%\examples >NUL 2>&1
 if not exist %QXT_BUILD_TREE%\tests mkdir %QXT_BUILD_TREE%\tests >NUL 2>&1


smartsockets windows script

smartsockets windows script

git-svn-id: 5273550914f0087548030fb29e37461be35c08da@10581 aaf88347-d911-0410-b711-e54d386773bb

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

--- bin/smartsockets-viz.bat
+++ bin/smartsockets-viz.bat
@@ -0,0 +1,27 @@
+@echo off
+
+if "%OS%"=="Windows_NT" @setlocal
+
+rem %~dp0 is expanded pathname of the current script under NT
+
+if "%IPL_HOME%X"=="X" set IPL_HOME=%~dp0..
+
+set SERVER_ARGS=
+
+:setupArgs
+
+if ""%1""=="""" goto doneArgs
+
+set SERVER_ARGS=%SERVER_ARGS% "%1"
+
+shift
+goto setupArgs
+
+rem This label provides a place for the argument list loop to break out
+rem and for NT handling to skip to.
+
+:doneArgs
+
+java -classpath "%CLASSPATH%;%IPL_HOME%\lib\*" -Dlog4j.configuration=file:"%IPL_HOME%"\log4j.properties ibis.smartsockets.viz.SmartsocketsViz %SERVER_ARGS%
+
+if "%OS%"=="Windows_NT" @endlocal


removeing this

removeing this

--- Win32/makerelease.bat
+++ Win32/makerelease.bat
@@ -1,6 +0,0 @@
-copy binary\*.* release
-copy bin\SBML_odeSolver.dll release
-copy bin\Sense.exe release
-copy bin\WinCVODE.dll release
-copy bin\SBML_odeSolverApp.exe release
-copy bin\ParameterScanner.exe release


fix vc detection

fix vc detection

--- far/build.bat
+++ far/build.bat
@@ -109,10 +109,10 @@

 :set_vc
 :set_vcvars
-  if "" == "%vcver%" if not "" == "%VS120COMNTOOLS%" if exist "%VS120COMNTOOLS%\..\..vc\vcvarsall.bat" set "vcver=12"
-  if "" == "%vcver%" if not "" == "%VS100COMNTOOLS%" if exist "%VS100COMNTOOLS%\..\..vc\vcvarsall.bat" set "vcver=10"
-  if "" == "%vcver%" if not "" == "%VS140COMNTOOLS%" if exist "%VS140COMNTOOLS%\..\..vc\vcvarsall.bat" set "vcver=14"
-  if "" == "%vcver%" if not "" == "%VS110COMNTOOLS%" if exist "%VS110COMNTOOLS%\..\..vc\vcvarsall.bat" set "vcver=11"
+  if "" == "%vcver%" if not "" == "%VS120COMNTOOLS%" if exist "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" set "vcver=12"
+  if "" == "%vcver%" if not "" == "%VS100COMNTOOLS%" if exist "%VS100COMNTOOLS%\..\..\vc\vcvarsall.bat" set "vcver=10"
+  if "" == "%vcver%" if not "" == "%VS140COMNTOOLS%" if exist "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat" set "vcver=14"
+  if "" == "%vcver%" if not "" == "%VS110COMNTOOLS%" if exist "%VS110COMNTOOLS%\..\..\vc\vcvarsall.bat" set "vcver=11"
   if "" == "%vcver%" set "vcver=12"
   set "VisualStudioVersion=%vcver%.0"
   if "" == "%~1" goto :EOF


Moved $WORKSPACE/BaseTools to $WORKSPACE/Tools/BaseTools.

git-svn-id: 5648d1bec6962b0a6d1d1b40eba8cf5cdb62da3d@4140 6f19259b-4bc3-4df7-8a09-765794883524

--- edksetup.bat
+++ edksetup.bat
@@ -287,9 +287,9 @@
 @goto end

 :NewBuild
-@IF NOT EXIST "BaseTools\toolsetup.bat" goto AntBuild
-if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
-@call BaseTools\toolsetup.bat
+@IF NOT EXIST "Tools\BaseTools\toolsetup.bat" goto AntBuild
+if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\Tools\BaseTools
+@call Tools\BaseTools\toolsetup.bat
 @goto end

 :end


AS7-3459 fix for broken domain.bat script

--- build/src/main/resources/bin/domain.bat
+++ build/src/main/resources/bin/domain.bat
@@ -63,8 +63,8 @@
 rem Add -server to the JVM options, if supported
 "%JAVA%" -server -version 2>&1 | findstr /I hotspot > nul
 if not errorlevel == 1 (
-  set "PROCESS_CONTROLLER_JAVA_OPTS=%PROCESS_CONTROLLER_JAVA_OPTS -server"
-  set "HOST_CONTROLLER_JAVA_OPTS=%HOST_CONTROLLER_JAVA_OPTS -server"
+  set "PROCESS_CONTROLLER_JAVA_OPTS=%PROCESS_CONTROLLER_JAVA_OPTS% -server"
+  set "HOST_CONTROLLER_JAVA_OPTS=%HOST_CONTROLLER_JAVA_OPTS% -server"
 )

 rem Find run.jar, or we can't continue


Fix for paths with spaces.
Submitted by: Carl Hoffman/Glenn Adams

git-svn-id: 102839466c3b40dd9c7e25c0a1a6d26afc40150a@1061652 13f79535-47bb-0310-9956-ffa450edef68

--- fop.cmd
+++ fop.cmd
@@ -19,7 +19,7 @@

 rem %~dp0 is the expanded pathname of the current script under NT
 set LOCAL_FOP_HOME=
-if "%OS%"=="Windows_NT" set LOCAL_FOP_HOME=%~dp0
+if "%OS%"=="Windows_NT" set LOCAL_FOP_HOME="%~dp0"

 rem Code from Apache Ant project
 rem Slurp the command line arguments. This loop allows for an unlimited number