From e08dfb408c163cc09ba1fd28f4590da52284f3c9 Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Tue, 5 Mar 2019 19:54:38 +0100 Subject: [PATCH] Reorganized dev scripts and tools --- .devtools/create_release_package.bat | 16 +++++++++++++ .devtools/install_dependencies.bat | 4 ++++ {build_tools => .devtools/tools}/7za.exe | Bin {build_tools => .devtools/tools}/jq.exe | Bin .devtools/update_dependencies.bat | 4 ++++ build.bat | 13 ----------- composer.lock | 28 +++++++++++------------ 7 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 .devtools/create_release_package.bat create mode 100644 .devtools/install_dependencies.bat rename {build_tools => .devtools/tools}/7za.exe (100%) rename {build_tools => .devtools/tools}/jq.exe (100%) create mode 100644 .devtools/update_dependencies.bat delete mode 100644 build.bat diff --git a/.devtools/create_release_package.bat b/.devtools/create_release_package.bat new file mode 100644 index 00000000..b6b7723c --- /dev/null +++ b/.devtools/create_release_package.bat @@ -0,0 +1,16 @@ +set projectPath=%~dp0 +if %projectPath:~-1%==\ set projectPath=%projectPath:~0,-1% +set projectPath=%projectPath%\.. + +set releasePath=%projectPath%\.release +mkdir "%releasePath%" + +copy "%projectPath%\version.json" versiontemp.json +for /f "tokens=*" %%a in ('tools\jq.exe .Version versiontemp.json --raw-output') do set version=%%a +del versiontemp.json + +del "%releasePath%\grocy_%version%.zip" +"tools\7za.exe" a -r "%releasePath%\grocy_%version%.zip" "%projectPath%\*" -xr!.* -xr!build.bat -xr!composer.json -xr!composer.lock -xr!package.json -xr!yarn.lock -xr!publication_assets +"tools\7za.exe" a "%releasePath%\grocy_%version%.zip" "%projectPath%\public\.htaccess" +"tools\7za.exe" rn "%releasePath%\grocy_%version%.zip" .htaccess public\.htaccess +"tools\7za.exe" d "%releasePath%\grocy_%version%.zip" data\*.* data\storage data\viewcache\* diff --git a/.devtools/install_dependencies.bat b/.devtools/install_dependencies.bat new file mode 100644 index 00000000..4116f837 --- /dev/null +++ b/.devtools/install_dependencies.bat @@ -0,0 +1,4 @@ +pushd .. +composer install +yarn install +popd diff --git a/build_tools/7za.exe b/.devtools/tools/7za.exe similarity index 100% rename from build_tools/7za.exe rename to .devtools/tools/7za.exe diff --git a/build_tools/jq.exe b/.devtools/tools/jq.exe similarity index 100% rename from build_tools/jq.exe rename to .devtools/tools/jq.exe diff --git a/.devtools/update_dependencies.bat b/.devtools/update_dependencies.bat new file mode 100644 index 00000000..9236e12a --- /dev/null +++ b/.devtools/update_dependencies.bat @@ -0,0 +1,4 @@ +pushd .. +composer update +yarn upgrade +popd diff --git a/build.bat b/build.bat deleted file mode 100644 index 98d55639..00000000 --- a/build.bat +++ /dev/null @@ -1,13 +0,0 @@ -set projectPath=%~dp0 -if %projectPath:~-1%==\ set projectPath=%projectPath:~0,-1% - -set releasePath=%projectPath%\.release -mkdir "%releasePath%" - -for /f "tokens=*" %%a in ('build_tools\jq.exe .Version version.json --raw-output') do set version=%%a - -del "%releasePath%\grocy_%version%.zip" -"build_tools\7za.exe" a -r "%releasePath%\grocy_%version%.zip" "%projectPath%\*" -xr!.* -xr!build_tools -xr!build.bat -xr!composer.json -xr!composer.lock -xr!package.json -xr!yarn.lock -xr!publication_assets -"build_tools\7za.exe" a "%releasePath%\grocy_%version%.zip" "%projectPath%\public\.htaccess" -"build_tools\7za.exe" rn "%releasePath%\grocy_%version%.zip" .htaccess public\.htaccess -"build_tools\7za.exe" d "%releasePath%\grocy_%version%.zip" data\*.* data\storage data\viewcache\* diff --git a/composer.lock b/composer.lock index b06121b6..ce8a164b 100644 --- a/composer.lock +++ b/composer.lock @@ -210,16 +210,16 @@ }, { "name": "illuminate/container", - "version": "v5.8.2", + "version": "v5.8.3", "source": { "type": "git", "url": "https://github.com/illuminate/container.git", - "reference": "2b390ea16656162a7c1a5f2ad547b4de917324bf" + "reference": "b984960d2634c6be97b0dd368a8953e8c4e06ec7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/container/zipball/2b390ea16656162a7c1a5f2ad547b4de917324bf", - "reference": "2b390ea16656162a7c1a5f2ad547b4de917324bf", + "url": "https://api.github.com/repos/illuminate/container/zipball/b984960d2634c6be97b0dd368a8953e8c4e06ec7", + "reference": "b984960d2634c6be97b0dd368a8953e8c4e06ec7", "shasum": "" }, "require": { @@ -251,11 +251,11 @@ ], "description": "The Illuminate Container package.", "homepage": "https://laravel.com", - "time": "2019-02-23T13:57:12+00:00" + "time": "2019-03-03T15:13:35+00:00" }, { "name": "illuminate/contracts", - "version": "v5.8.2", + "version": "v5.8.3", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", @@ -299,7 +299,7 @@ }, { "name": "illuminate/events", - "version": "v5.8.2", + "version": "v5.8.3", "source": { "type": "git", "url": "https://github.com/illuminate/events.git", @@ -344,7 +344,7 @@ }, { "name": "illuminate/filesystem", - "version": "v5.8.2", + "version": "v5.8.3", "source": { "type": "git", "url": "https://github.com/illuminate/filesystem.git", @@ -396,16 +396,16 @@ }, { "name": "illuminate/support", - "version": "v5.8.2", + "version": "v5.8.3", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "013cfab5d44c530b56d70cc9ccb891c8b25ebbce" + "reference": "0f0291d1bc2f036af3fceb8e46900b58812533c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/013cfab5d44c530b56d70cc9ccb891c8b25ebbce", - "reference": "013cfab5d44c530b56d70cc9ccb891c8b25ebbce", + "url": "https://api.github.com/repos/illuminate/support/zipball/0f0291d1bc2f036af3fceb8e46900b58812533c4", + "reference": "0f0291d1bc2f036af3fceb8e46900b58812533c4", "shasum": "" }, "require": { @@ -453,11 +453,11 @@ ], "description": "The Illuminate Support package.", "homepage": "https://laravel.com", - "time": "2019-02-27T14:00:44+00:00" + "time": "2019-03-05T13:38:58+00:00" }, { "name": "illuminate/view", - "version": "v5.8.2", + "version": "v5.8.3", "source": { "type": "git", "url": "https://github.com/illuminate/view.git",