developing...

This commit is contained in:
Oleg Korshul
2019-06-03 13:26:41 +03:00
parent b6b74f29a0
commit 63975bbfb6
9 changed files with 51 additions and 41 deletions

View File

@ -1,8 +1,8 @@
@echo off
if exist config.json del /F config.json
setlocal enabledelayedexpansion
echo {>> config.json
if exist config del /F config
:loop
@ -13,35 +13,33 @@ if "%local1%"=="" (
GOTO :end
)
set local1=%~1TEST
if not "%local1:~0,2%"=="--" (
SHIFT
GOTO :loop
)
if "%local2:~0,2%"=="--" (
echo ^"%local1%^" : ^"1^",>> config.json
echo %local1:~2,-4%=^"1^">> config
SHIFT
GOTO :loop
)
if "%local2%"=="" (
echo ^"%local1%^" : ^"1^">> config.json
echo %local1:~2,-4%=^"1^">> config
GOTO :end
)
SHIFT
SHIFT
if "%~2"=="" (
echo ^"%local1%^" : ^"%local2%^">> config.json
) else (
echo ^"%local1%^" : ^"%local2%^",>> config.json
)
echo %local1:~2,-4%=^"%local2%^">> config
GOTO :loop
:end
echo }>> config.json
endlocal
@echo on

View File

@ -1,22 +1,20 @@
setlocal enabledelayedexpansion
SET "OO_VS_DIR_DEF=%ProgramFiles%\Microsoft Visual Studio 14.0\VC"
SET "OO_VS_DIR=%ProgramFiles%\Microsoft Visual Studio 14.0\VC"
if defined ProgramFiles(x86) (
SET "OO_VS_DIR_DEF=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC"
SET "OO_VS_DIR=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC"
)
if not defined OO_VS_DIR (
SET "OO_VS_DIR=%OO_VS_DIR_DEF%"
)
call %~dp0scripts\json_value.bat module OO_MODULE "desktop builder"
call %~dp0scripts\json_value.bat update OO_UPDATE 1
call %~dp0scripts\json_value.bat clean OO_CLEAN 0
call %~dp0scripts\json_value.bat platform OO_PLATFORM native
call %~dp0scripts\json_value.bat config OO_CONFIG no_vlc
call %~dp0scripts\json_value.bat deploy OO_DEPLOY 1
call %~dp0scripts\json_value.bat install OO_INSTALL 1
call %~dp0scripts\config_value.bat module OO_MODULE "desktop builder"
call %~dp0scripts\config_value.bat update OO_UPDATE 1
call %~dp0scripts\config_value.bat clean OO_CLEAN 0
call %~dp0scripts\config_value.bat platform OO_PLATFORM native
call %~dp0scripts\config_value.bat config OO_CONFIG no_vlc
call %~dp0scripts\config_value.bat deploy OO_DEPLOY 1
call %~dp0scripts\config_value.bat install OO_INSTALL 1
call %~dp0scripts\config_value.bat qt-dir OO_QT_DIR "set qt path"
call %~dp0scripts\config_value.bat qt-dir-xp OO_QT_XP_DIR "set qt path (windows xp version)"
if "%OO_UPDATE%"=="1" (
call scripts\git-fetch.bat core

20
scripts/config_value.bat Normal file
View File

@ -0,0 +1,20 @@
@echo off
setlocal enabledelayedexpansion
set key=%~1
set "returnvalue=%~3"
for /f "tokens=1,2 delims==" %%i in (config) do (
set keyL=%%i
set valueL=%%j
if "%key%"=="!keyL!" (
set "returnvalue=!valueL:~1,-1!"
goto :end
)
)
:end
endlocal & set "%~2=%returnvalue%"
@echo on

View File

@ -1,7 +1,9 @@
setlocal enabledelayedexpansion
call %~dp0json_value.bat module OO_MODULE "desktop builder"
call %~dp0json_value.bat platform OO_PLATFORM "native"
call %~dp0config_value.bat module OO_MODULE "desktop builder"
call %~dp0config_value.bat platform OO_PLATFORM "native"
call %~dp0config_value.bat qt-dir OO_QT_DIR "set qt path"
call %~dp0config_value.bat qt-dir-xp OO_QT_XP_DIR "set qt path (windows xp version)"
cd %~dp0..

View File

@ -3,7 +3,7 @@ setlocal
set REPO_NAME=%1
set REPO_LOCAL_DIR=%~dp0..\..
call %~dp0json_value.bat branch OO_BRANCH master
call %~dp0config_value.bat branch OO_BRANCH master
SET LOCAL_CD=%cd%
cd %REPO_LOCAL_DIR%

View File

@ -1,7 +1,9 @@
set OO_QT_DIR=C:\Qt5.10.1\5.10.1
setlocal
call %~dp0scripts\config_value.bat qt-dir OO_QT_DIR "set qt path"
call %~dp0..\scripts\json_value.bat module OO_MODULE "desktop builder"
call "%OO_QT_DIR%\msvc2015_64\bin\qmake" -nocache %~dp0..\scripts\build_js.pro "CONFIG+=%OO_MODULE%"
endlocal

View File

@ -7,4 +7,6 @@ call %~dp0..\configure.bat ^
--clean 1^
--config no_vlc^
--deploy^
--install
--install^
--qt-dir "C:\Qt5.10.1\5.10.1"^
--qt-dir-xp "C:\Qt5.6.3\5.6.3"

View File

@ -1,6 +0,0 @@
set OO_QT_DIR=C:\Qt5.10.1\5.10.1
set OO_QT_XP_DIR=C:\Qt5.6.3\5.6.3
call "%~dp0..\scripts\deploy.bat"

View File

@ -1,6 +0,0 @@
set OO_QT_DIR=C:\Qt5.10.1\5.10.1
set OO_QT_XP_DIR=C:\Qt5.6.3\5.6.3
call "%~dp0..\make.bat"