Skip to content

Commit

Permalink
Change of folder structure based on csproj files
Browse files Browse the repository at this point in the history
Followed here Gigas002 approach:
- AntiDupl
- AntiDupl.NET.Core
- AntiDupl.NET.WinForms
- AntiDupl.NET.WPF
  • Loading branch information
Edi61 committed Feb 25, 2023
1 parent 0beac94 commit 46bd45f
Show file tree
Hide file tree
Showing 485 changed files with 32,356 additions and 32,351 deletions.
11 changes: 6 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ bld/
[Bb]in/
[Oo]bj/
[Ll]og/
out/

# Visual Studio 2015/2017 cache/options directory
.vs/
Expand Down Expand Up @@ -329,8 +330,8 @@ ASALocalRun/
# MFractors (Xamarin productivity tool) working folder
.mfractor/
/.svn
/src/AntiDupl/AntiDupl/adExternal.h
/src/AntiDupl/AntiDupl.NET/External.cs
/src/AntiDupl/AntiDupl.NET/Form/MainForm.resx
/src/AntiDupl/AntiDupl.NET/Form/SearchExecuterForm.resx
/src/AntiDupl/vcpkg_installed
/src/AntiDupl/adExternal.h
/src/AntiDupl.NET.Core/External.cs
/src/AntiDupl.NET.WinForms/Form/MainForm.resx
/src/AntiDupl.NET.WinForms/Form/SearchExecuterForm.resx
/src/vcpkg_installed
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ e.g. by using git:
```
5. Open Visual solution file
```
src\AntiDupl\AntiDupl.sln
src\AntiDupl.sln
```
6. Start building AntiDupl.NET in Visual Studio.
Depended libraries will be automatically loaded and build by vcpkg
2 changes: 1 addition & 1 deletion cmd/MakeBin.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exit 1

set ROOT_DIR=..
set RELEASE_DIR=%ROOT_DIR%\bin\Release
set VERSION_FILE=%ROOT_DIR%\src\AntiDupl\version.txt
set VERSION_FILE=%ROOT_DIR%\src\version.txt

if not exist %RELEASE_DIR% (
echo Can't find "%RELEASE_DIR%" directory!
Expand Down
14 changes: 8 additions & 6 deletions cmd/MakeSrc.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ exit 1
)

set ROOT_DIR=..
set VERSION_FILE=%ROOT_DIR%\src\AntiDupl\version.txt
set VERSION_FILE=%ROOT_DIR%\src\version.txt

if not exist %VERSION_FILE% (
echo Can't find "%VERSION_FILE%" file!
Expand All @@ -32,11 +32,13 @@ if not exist %TMP_DIR% mkdir %TMP_DIR%

xcopy %ROOT_DIR%\src\* %TMP_DIR%\src\* /y /i
xcopy %ROOT_DIR%\src\AntiDupl\* %TMP_DIR%\src\AntiDupl\* /y /i
xcopy %ROOT_DIR%\src\AntiDupl\AntiDupl\* %TMP_DIR%\src\AntiDupl\AntiDupl\* /y /i
xcopy %ROOT_DIR%\src\AntiDupl\AntiDupl.NET\* %TMP_DIR%\src\AntiDupl\AntiDupl.NET\* /y /i
xcopy %ROOT_DIR%\src\AntiDupl\AntiDupl.NET\Form\* %TMP_DIR%\src\AntiDupl\AntiDupl.NET\Form\* /y /i
xcopy %ROOT_DIR%\src\AntiDupl\AntiDupl.NET\GUIControl\* %TMP_DIR%\src\AntiDupl\AntiDupl.NET\GUIControl\* /y /i
xcopy %ROOT_DIR%\src\AntiDupl\AntiDupl.NET\Properties\* %TMP_DIR%\src\AntiDupl\AntiDupl.NET\Properties\* /y /i
xcopy %ROOT_DIR%\src\AntiDupl.NET.WinForms\* %TMP_DIR%\src\AntiDupl.NET.WinForms\* /y /i
xcopy %ROOT_DIR%\src\AntiDupl.NET.Core\* %TMP_DIR%\src\AntiDupl.NET.Core\* /y /i
xcopy %ROOT_DIR%\src\AntiDupl.NET.Core\Enums\* %TMP_DIR%\src\AntiDupl.NET.Core\Enums\* /y /i
xcopy %ROOT_DIR%\src\AntiDupl.NET.Core\Original\* %TMP_DIR%\src\AntiDupl.NET.Core\Original\* /y /i
xcopy %ROOT_DIR%\src\AntiDupl.NET.WinForms\Form\* %TMP_DIR%\src\AntiDupl.NET.WinForms\Form\* /y /i
xcopy %ROOT_DIR%\src\AntiDupl.NET.WinForms\GUIControl\* %TMP_DIR%\src\AntiDupl.NET.WinForms\GUIControl\* /y /i
xcopy %ROOT_DIR%\src\AntiDupl.NET.WinForms\Properties\* %TMP_DIR%\src\AntiDupl.NET.WinForms\Properties\* /y /i
xcopy %ROOT_DIR%\docs\* %TMP_DIR%\docs\* /y /i /s
xcopy %ROOT_DIR%\cmd\* %TMP_DIR%\cmd\* /y /i /s

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<PlatformTarget>x64</PlatformTarget>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseOutputPath>..\..\..\bin\Debug\</BaseOutputPath>
<OutputPath>..\..\..\bin\Debug\</OutputPath>
<BaseOutputPath>..\..\bin\Debug\</BaseOutputPath>
<OutputPath>..\..\bin\Debug\</OutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseOutputPath>..\..\..\bin\Release\</BaseOutputPath>
<OutputPath>..\..\..\bin\Release\</OutputPath>
<BaseOutputPath>..\..\bin\Release\</BaseOutputPath>
<OutputPath>..\..\bin\Release\</OutputPath>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -47,7 +47,7 @@
</PropertyGroup>

<ItemGroup>
<None Include="..\..\..\LICENSE">
<None Include="..\..\LICENSE">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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,22 +33,22 @@ public class CoreImageInfo
public ulong id;
public string path;
public ulong size;
public ulong time;
public ulong time;
public uint hash;
public CoreDll.ImageType type;
public uint width;
public uint height;
public double blockiness;
public double blurring;
public CoreDll.adImageExifW exifInfo;
//TODO: jpegPeaks -> New feature for Net.Core from WPF branch, not jet fully implemented
//TODO: jpegPeaks -> New feature for Net.Core from WPF branch, not jet fully implemented
public uint jpegPeaks;
public CoreImageInfo(ref CoreDll.adImageInfoW imageInfo)
{
id = (ulong)imageInfo.id;
path = imageInfo.path;
size = imageInfo.size;
time = imageInfo.time;
time = imageInfo.time;
hash = imageInfo.hash;
type = imageInfo.type;
width = imageInfo.width;
Expand Down
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 @@ -4,8 +4,8 @@ echo Generate External.cs file:

set PROJECT_DIR=%1

set ROOT_DIR=%PROJECT_DIR%\..\..\..
set SOLUTION_DIR=%ROOT_DIR%\src\AntiDupl
set ROOT_DIR=%PROJECT_DIR%\..\..
set SOLUTION_DIR=%ROOT_DIR%\src
set EXTERNAL_FILE=%PROJECT_DIR%\External.cs
set VERSION_FILE=%SOLUTION_DIR%\version.txt

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -389,14 +389,14 @@ public struct adImageInfoW
[MarshalAs(UnmanagedType.ByValTStr, SizeConst = MAX_PATH_EX)]
public string path;
public ulong size;
public ulong time;
public ulong time;
public uint hash;
public ImageType type;
public uint width;
public uint height;
public double blockiness;
public double blurring;
public adImageExifW exifInfo;
public adImageExifW exifInfo;
public uint jpegPeaks;
}

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<OutputPath>..\..\..\bin\Debug\</OutputPath>
<BaseOutputPath>..\..\..\bin\Debug\</BaseOutputPath>
<OutputPath>..\..\bin\Debug\</OutputPath>
<BaseOutputPath>..\..\bin\Debug\</BaseOutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<BaseOutputPath>..\..\..\bin\Release\</BaseOutputPath>
<OutputPath>..\..\..\bin\Release\</OutputPath>
<BaseOutputPath>..\..\bin\Release\</BaseOutputPath>
<OutputPath>..\..\bin\Release\</OutputPath>
</PropertyGroup>
<ItemGroup>
<AppDesigner Include="Properties\" />
Expand Down Expand Up @@ -211,6 +211,6 @@
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\AntiDupl\AntiDupl.NET.Core\AntiDupl.NET.Core.csproj" />
<ProjectReference Include="..\AntiDupl.NET.Core\AntiDupl.NET.Core.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.
Loading

0 comments on commit 46bd45f

Please sign in to comment.