Skip to content

Commit

Permalink
fixup! Restructure repository
Browse files Browse the repository at this point in the history
  • Loading branch information
RussKie committed May 22, 2024
1 parent 23aa736 commit 2e254b4
Show file tree
Hide file tree
Showing 2,622 changed files with 361 additions and 357 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ obj/
bin/

#ignore output mild compiler
native/**/Generated/
src/native/**/Generated/

#ignore some unwanted files
*.ncb
Expand Down
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"type": "process",
"args": [
"build",
".\\native\\native.proj"
".\\src\\native\\build.proj"
],
"problemMatcher": "$msCompile",
"group": {
Expand Down
159 changes: 84 additions & 75 deletions GitExtensions.sln

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion appveyor.experimental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ build_script:
}
# it would be nice to run '.\cibuild.cmd -loc -logFileName localise.binlog /p:NoBuild=true' but it doesn't work without `-build` switch :\
Push-Location .\src\GitExtensions
Push-Location .\src\app\GitExtensions
msbuild /p:Configuration=Release /t:_UpdateEnglishTranslations /p:RunTranslationApp=true /p:ContinuousIntegrationBuild=true /v:m /bl:..\artifacts\log\localise.binlog
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
Pop-Location
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ build_script:
}
- ps: |
# build VC++
dotnet build .\native\native.proj -c Release --verbosity q --nologo /bl:.\artifacts\log\native.binlog
dotnet build .\src\native\build.proj -c Release --verbosity q --nologo /bl:.\artifacts\log\native.binlog
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
- ps: |
# build .NET
Expand All @@ -83,7 +83,7 @@ build_script:
git reset --hard HEAD
- ps: |
# Verify that new strings (if any) have been processed and ready for localisation
Push-Location .\src\GitExtensions
Push-Location .\src\app\GitExtensions
dotnet msbuild /p:Configuration=Release /t:_UpdateEnglishTranslations /p:RunTranslationApp=true /p:ContinuousIntegrationBuild=true /v:m /bl:..\artifacts\log\localise.binlog
Pop-Location
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
Expand Down
2 changes: 1 addition & 1 deletion eng/Bisect-Test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function Build() {
& $buildScript -rebuild -bn -b -restore
}
else {
$native = Join-Path -Path $scriptsPath -ChildPath native.proj
$native = Join-Path -Path $scriptsPath -ChildPath build.proj
$native = Resolve-Path -Relative -Path $native
Write-Verbose $native
if (Test-Path -Path $native) {
Expand Down
4 changes: 2 additions & 2 deletions eng/set_version_to.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
outfile = open(filename, "w", newline='\n')
outfile.writelines(o)

filename = "../native/GitExtensionsShellEx/GitExtensionsShellEx.rc"
filename = "../src/native/GitExtensionsShellEx/GitExtensionsShellEx.rc"
gitExtensionsShellEx = open(filename, "r").readlines()
o = ""
for i in gitExtensionsShellEx:
Expand All @@ -82,7 +82,7 @@
outfile = open(filename, "w", newline='\n')
outfile.writelines(o)

filename = "../native/GitExtSshAskPass/SshAskPass.rc2"
filename = "../src/native/GitExtSshAskPass/SshAskPass.rc2"
gitExtSshAskPass = open(filename, "r").readlines()
o = ""
for i in gitExtSshAskPass:
Expand Down
10 changes: 5 additions & 5 deletions setup/TranslationApp/TranslationApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

<ItemGroup>
<ProjectReference Include="..\..\externals\NetSpell.SpellChecker\SpellChecker.csproj" />
<ProjectReference Include="..\..\src\BugReporter\BugReporter.csproj" />
<ProjectReference Include="..\..\src\GitCommands\GitCommands.csproj" />
<ProjectReference Include="..\..\src\GitExtUtils\GitExtUtils.csproj" />
<ProjectReference Include="..\..\src\GitUI\GitUI.csproj" />
<ProjectReference Include="..\..\src\ResourceManager\ResourceManager.csproj" />
<ProjectReference Include="..\..\src\app\BugReporter\BugReporter.csproj" />
<ProjectReference Include="..\..\src\app\GitCommands\GitCommands.csproj" />
<ProjectReference Include="..\..\src\app\GitExtUtils\GitExtUtils.csproj" />
<ProjectReference Include="..\..\src\app\GitUI\GitUI.csproj" />
<ProjectReference Include="..\..\src\app\ResourceManager\ResourceManager.csproj" />
</ItemGroup>

</Project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<ItemGroup>
<ProjectReference Include="..\GitExtensions.Extensibility\GitExtensions.Extensibility.csproj" />
<ProjectReference Include="..\GitExtUtils\GitExtUtils.csproj" />
<ProjectReference Include="..\Plugins\GitUIPluginInterfaces\GitUIPluginInterfaces.csproj" />
<ProjectReference Include="..\..\plugins\GitUIPluginInterfaces\GitUIPluginInterfaces.csproj" />
</ItemGroup>

</Project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 2e254b4

Please sign in to comment.