Skip to content

Commit 4063604

Browse files
committed
move /SDK/Utilities/ParseJSON and jq-windows-amd64 to /utils
1 parent c8d7ac8 commit 4063604

11 files changed

Lines changed: 27 additions & 21 deletions

File tree

‎.vscode/launch.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,7 @@
991991
"console": "internalConsole",
992992
"request": "launch",
993993
"preLaunchTask": "build-parsejson",
994-
"cwd": "${workspaceFolder}/src/SDK/Utilities/ParseJSON/",
994+
"cwd": "${workspaceFolder}/utils/ParseJSON/",
995995
"env": {
996996
"ASPNETCORE_ENVIRONMENT": "Development"
997997
}
@@ -1006,12 +1006,12 @@
10061006
"type": "coreclr",
10071007
"request": "launch",
10081008
"preLaunchTask": "build-parsejson",
1009-
"program": "${workspaceFolder}/src/SDK/Utilities/ParseJSON/bin/Debug/net7.0/ParseJSON",
1009+
"program": "${workspaceFolder}/utils/ParseJSON/bin/Debug/net7.0/ParseJSON",
10101010
"linux": {
1011-
"program": "${workspaceFolder}/src/SDK/Utilities/ParseJSON/bin/Debug/net7.0/ParseJSON.dll",
1011+
"program": "${workspaceFolder}/utils/ParseJSON/bin/Debug/net7.0/ParseJSON.dll",
10121012
},
10131013
"args": [ "$.Modules.ALPR.Platforms", "test.json" ],
1014-
"cwd": "${workspaceFolder}/src/SDK/Utilities/ParseJSON/",
1014+
"cwd": "${workspaceFolder}/utils/ParseJSON/",
10151015
"stopAtEntry": false,
10161016
"requireExactSource": false,
10171017
"env": {

‎.vscode/tasks.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
"command": "dotnet",
108108
"args": [
109109
"build",
110-
"${workspaceFolder}/src/SDK/Utilities/ParseJSON",
110+
"${workspaceFolder}/utils/ParseJSON",
111111
"/property:GenerateFullPaths=true",
112112
"/consoleloggerparameters:NoSummary"
113113
],

‎CodeProject.AI.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{
195195
src\SDK\Utilities\stop_all.sh = src\SDK\Utilities\stop_all.sh
196196
EndProjectSection
197197
EndProject
198-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ParseJSON", "src\SDK\Utilities\ParseJSON\ParseJSON.csproj", "{AF84AA51-8718-40EC-B5D7-281799A7B07C}"
198+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ParseJSON", "utils\ParseJSON\ParseJSON.csproj", "{AF84AA51-8718-40EC-B5D7-281799A7B07C}"
199199
EndProject
200200
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "clients", "clients", "{5FBE5A09-30BA-4697-8069-443BE5294424}"
201201
ProjectSection(SolutionItems) = preProject

‎devops/build/create_packages.bat‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ if /i "%verbosity%" neq "quiet" (
117117
call "!sdkScriptsDirPath!\utils.bat" WriteLine
118118
call "!sdkScriptsDirPath!\utils.bat" WriteLine "rootDirPath = !rootDirPath!" !color_mute!
119119
call "!sdkScriptsDirPath!\utils.bat" WriteLine "thisScriptDirPath = !thisScriptDirPath!" !color_mute!
120-
call "!sdkScriptsDirPath!\utils.bat" WriteLine "sdkPath = !sdkPath!" !color_mute!
120+
call "!sdkScriptsDirPath!\utils.bat" WriteLine "sdkPath = !sdkPath!" !color_mute!
121121
call "!sdkScriptsDirPath!\utils.bat" WriteLine "sdkScriptsDirPath = !sdkScriptsDirPath!" !color_mute!
122122
call "!sdkScriptsDirPath!\utils.bat" WriteLine "modulesDirPath = !modulesDirPath!" !color_mute!
123123
call "!sdkScriptsDirPath!\utils.bat" WriteLine "externalModulesDirPath = !externalModulesDirPath!" !color_mute!
@@ -128,10 +128,16 @@ if /i "%verbosity%" neq "quiet" (
128128

129129
set success=true
130130

131-
pushd %sdkPath%\Utilities\ParseJSON
131+
pushd "!rootDirPath!\utils\ParseJSON"
132+
cd
132133
if not exist ParseJSON.exe (
133-
dotnet build /property:GenerateFullPaths=true /consoleloggerparameters:NoSummary -c Release >NUL
134-
if exist .\bin\Release\net7.0\ move .\bin\Release\net7.0\* . >nul
134+
if /i "%verbosity%" neq "quiet" (
135+
dotnet build /property:GenerateFullPaths=true /consoleloggerparameters:NoSummary -c Release
136+
if exist .\bin\Release\net7.0\ move .\bin\Release\net7.0\* .
137+
) else (
138+
dotnet build /property:GenerateFullPaths=true /consoleloggerparameters:NoSummary -c Release >NUL
139+
if exist .\bin\Release\net7.0\ move .\bin\Release\net7.0\* . >nul
140+
)
135141
)
136142
popd
137143

‎devops/install/clean.bat‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,13 @@ if /i "%cleanBuild%" == "true" (
127127
call :CleanSubDirs "!rootDir!\Installers\Windows\" "\obj\Debug\"
128128
call :CleanSubDirs "!rootDir!\Installers\Windows\" "\obj\Release\"
129129

130-
call :RemoveDir "!rootDir!\src\SDK\Utilities\ParseJSON\bin"
131-
call :RemoveDir "!rootDir!\src\SDK\Utilities\ParseJSON\obj"
132-
del "!rootDir!\src\SDK\Utilities\ParseJSON\ParseJSON.deps.json"
133-
del "!rootDir!\src\SDK\Utilities\ParseJSON\ParseJSON.dll"
134-
del "!rootDir!\src\SDK\Utilities\ParseJSON\ParseJSON.exe"
135-
del "!rootDir!\src\SDK\Utilities\ParseJSON\ParseJSON.runtimeconfig.json"
136-
del "!rootDir!\src\SDK\Utilities\ParseJSON\ParseJSON.xml"
130+
call :RemoveDir "!rootDir!\utils\ParseJSON\bin"
131+
call :RemoveDir "!rootDir!\utils\ParseJSON\obj"
132+
del "!rootDir!\utils\ParseJSON\ParseJSON.deps.json"
133+
del "!rootDir!\utils\ParseJSON\*.dll"
134+
del "!rootDir!\utils\ParseJSON\ParseJSON.exe"
135+
del "!rootDir!\utils\ParseJSON\ParseJSON.runtimeconfig.json"
136+
del "!rootDir!\utils\ParseJSON\ParseJSON.xml"
137137

138138
call :CleanSubDirs "!rootDir!\src\demos\clients\" "\bin\Debug\"
139139
call :CleanSubDirs "!rootDir!\src\demos\clients\" "\bin\Release\"

‎src/SDK/Scripts/utils.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1445,7 +1445,7 @@ REM it's all the same. The extraction is done purely by grep/sed, so is very nia
14451445
REM Run the ParseJSON command on jsonFilePath, and collect ALL lines of output (eg arrays)
14461446
REM into the jsonValue var. Note the quotes around ParseJSON, but not around key or jsonFileName
14471447
set "jsonValue="
1448-
for /f "usebackq tokens=*" %%i in (` "%sdkPath%\Utilities\ParseJSON\ParseJSON.exe" !key! !jsonFileName! `) do (
1448+
for /f "usebackq tokens=*" %%i in (` "%rootDirPath%\utils\ParseJSON\ParseJSON.exe" !key! !jsonFileName! `) do (
14491449
set jsonValue=!jsonValue!%%i
14501450
)
14511451

@@ -1532,7 +1532,7 @@ REM Gets the moduleID from a modulesettings.json file. See above function for c
15321532
REM into the jsonValue var. Note the quotes around ParseJSON, but not around key or jsonFileName
15331533

15341534
set "jsonValue="
1535-
for /f "usebackq tokens=*" %%i in (` "%sdkPath%\Utilities\ParseJSON\ParseJSON.exe" !key! !jsonFileName! `) do (
1535+
for /f "usebackq tokens=*" %%i in (` "%rootDirPath%\utils\ParseJSON\ParseJSON.exe" !key! !jsonFileName! `) do (
15361536
set jsonValue=!jsonValue!%%i
15371537
)
15381538

src/SDK/Utilities/ParseJSON/ParseJSON.csproj renamed to utils/ParseJSON/ParseJSON.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<!-- Set defines: Windows, Linux, macOS and/or Arm64. This is needed in some files! -->
4-
<Import Project="../../NET/Common.targets" />
4+
<Import Project="../../src/SDK/NET/Common.targets" />
55

66
<!-- Meta data -->
77
<PropertyGroup>
@@ -53,7 +53,7 @@
5353
</PropertyGroup>
5454

5555
<ItemGroup>
56-
<ProjectReference Include="..\..\NET\NET.csproj" />
56+
<ProjectReference Include="..\..\src\SDK\NET\NET.csproj" />
5757
</ItemGroup>
5858

5959
</Project>

0 commit comments

Comments
 (0)