New solution is in branches/new-layout (not 95% finished but must be tested first).
https://repos.deltares.nl/repos/delft-tools/branches/new-layout
Please avoid renaming / moving files or folders if you will work in the trunk/ until it is replaced by new-layout (Monday evening). Any changes will need to be merged manually.
NOTES:
1. Changed directory layout to:
build/ ........................ build scripts and build tools
tools/
...
doc/ .......................... documentation
lib/ .......................... shared libraries (binaries)
src/ .......................... source code only (!)
test/ ......................... test projects, groupped in the same way as src
test-data/ .................... data used in tests
Files in the lib, src, test, test-data directories are groupped using the following rules:
- All directories always use the same structure as an src
- lib/ additionally contains some libraries at the top-level used by many products
2. Created temporary branch: new-layout
3. Moved folders and projects around ... a lot!!!
4. Renamed all folders and projects from DelftShell ... to DeltaShell (DelftTools.* remain the same)
5. Trying to fix solution,
TODO:
Found how to detect parent directory in DOS (awkward): "for %%a in (%PROJECT_DIR%\..) do set PLUGIN_TYPE_DIR=%%~nxa" plugin native resources should be copied fine now
Fixed many projects using ExternalDependencies (DeltaShell.proj):
<ExternalDependencies>lib\DeltaShell\DeltaShell.Plugins.SharpMapGis</ExternalDependencies>
Fixed resource files (DeltaShell / DeltaShell - made consistent)
probably some projects should be moved from Common to default plugin level (avoid re-use by others) ...
Isolate Habitat1 dlls including Demis.MapControl (remove them, replace by dlls in lib compiled in Habitat1 branch)
Move Habitat 1 projects to branch\ and leave only required dlls in lib\Plugins\Habitat (old version)
Setup projects must be organized in accordance to plugins - IT'S A MESS NOW!!
Clean-up FitNesse tests (clean up unused tests)
REVIEW ALL TESTS DATA (too big)
1. Move data to test-data/ folder
2. Check if large data files used in integration tests can be compressed
MOVE src\Plugins\DelftModels\Externals\ds\common\packages\delft_model_data to test\ folder (not sources)
make it checkout only required C# projects on a higher level
Habitat proj file in build\ is not a good idea!!! move it to build/Plugins/Habitat.proj
Habitat inside DeltaShell\Product.wxs?!?! WTF!?!??
CommonToolsPlugin.wxs should be in DeltaShell/
DelftModels\Product.wxs is referencing ico from Habitat project!?!?!? WTF ?!@?
HabitatLogo.png in IJselmeerVerkenner ?!?? WTF?
Move OpenMI to standard DeltaShell plugins (after migration to 2.0)?
Why there is a "copy "$(SolutionDir)lib\DeltaShell\DeltaShell.Gui\license.lic" .\" in DeltaShell.Loader.csproj ?!? Sobek?
Make SharpMapTestUtils and DelftTools.TestUtils consistent (chose one convention)
INTRODUCE RULE: if you include project on a file system - it must be available in the solution, otherwise remove it from the file system as well!
ONE MORE RULE - NO HIDDEN FILES in projects!
NetTopologySuite.Extensions referencing NHibernate.dll WTF?!?
move lib\DeltaShell\DeltaShell.Plugins.SharpMapGis\ to lib\Common\SharpMap.Extensions?
The following projects need to be included into the solution (migrated) or deleted:
src\Plugins\Examples\DeltaShell.AutomationDemo
src\Plugins\Examples\DeltaShell.Plugins.TriangulatorPlugin
test\Plugins\Examples\DeltaShell.Plugins.DemoImportPlugin.Test
test\Plugins\Examples\DeltaShell.Plugins.TriangulatorPlugin.Tests
test\Plugins\Habitat\TransformOldCases
test\Plugins\Habitat\Habitat.Tests
DeltaShell.Plugins.SharpMapGis.csproj references NHibernate.dll - remove it!?
DeltaShell.Plugins.Series.csproj references NHibernate.dll
write test checking number of csproj in solution and on file system (should match 
)
walk through ALL projects and remove PLUGIN -> PLUGIN dependencies!
WTF, why SharpMapGis plugin references DeltaShell.Core???
FIX ALL NAMESPACES
Loader is referencing Common projects so that they will be copied to Loader/bin/ - discuss!
FIX images, some are DeltaShell.* and also not used
REMOVE / MOVE TO OLD CODE DeltaShell.Plugins.Demis.MapControl ??? (not used in the current solution)
I had to comment some code to make everything work, check diff on revision when new-layout branch was created
Strange that it was necessary to re-reference NetTopologySuite, do we have it as DLL somewhere??
REMOVE reference to DeltaShell.Plugins.SharpMapGis in SharpMap.UI.Tests!
make SharpMap.Extensions.Xml work (current excluded), migrate from plugin (pull-up)
search all project for DelftShell and fix it (some dirs, files need to be renamed)
check ALL hidded files not included into project and clean-up!
Rename DeltaShell.Plugins.KRWVerkenner in source code tree to something more intuitive for all users (including non-Dutch), e.g.: DeltaShell.Plugins.BasinModels (basin management), move it into DelftModels
DON'T just blindly merge all tests - look at dependencies! DelftTools.Tests contains tests of Functions, Hydro, Controle.Swf - too many dependencies in test projects
RENAME all DelftShell namespaces to DeltaShell where required (all except Common/DelftTools.*)
FunctionPoint.cs - Huh?
Ask Arno if we can remove DeltaVerkenner plugin (leaving only GIS functionality he uses)
Do we need to support MWell in DeltaShell.sln (is it used??) Ask Bary/Tom
NetworkEditor is a HydroNetworkEditor, right? Maybe we need Hydro plugin containing various edtors (Basin, HydroNetwork, etc.)
Strange properties in DeltaShell.Loader resources, e.g.: "DelftShellFolderFileFilter: Delta Shell Folder File (.folder)|*.folder" - check where they are used and remove