Browse Source

Merge pull request #1015 from hamiltont/toolset-fix-448

Reorganize project directory structure
Hamilton Turner 11 years ago
parent
commit
a919d8945a
100 changed files with 6 additions and 5 deletions
  1. 2 1
      .travis.yml
  2. 2 2
      README.md
  3. 0 0
      frameworks/C#/HttpListener/.gitignore
  4. 0 0
      frameworks/C#/HttpListener/.nuget/NuGet.Config
  5. 0 0
      frameworks/C#/HttpListener/.nuget/NuGet.targets
  6. 0 0
      frameworks/C#/HttpListener/HttpListener.sln
  7. 0 0
      frameworks/C#/HttpListener/HttpListener/App.config
  8. 0 0
      frameworks/C#/HttpListener/HttpListener/Fortunes.cshtml
  9. 0 0
      frameworks/C#/HttpListener/HttpListener/Fortunes.generated.cs
  10. 0 0
      frameworks/C#/HttpListener/HttpListener/HttpListener.csproj
  11. 0 0
      frameworks/C#/HttpListener/HttpListener/Models/Fortune.cs
  12. 0 0
      frameworks/C#/HttpListener/HttpListener/Models/MongoDB.cs
  13. 0 0
      frameworks/C#/HttpListener/HttpListener/Models/World.cs
  14. 0 0
      frameworks/C#/HttpListener/HttpListener/Program.cs
  15. 0 0
      frameworks/C#/HttpListener/HttpListener/Properties/AssemblyInfo.cs
  16. 0 0
      frameworks/C#/HttpListener/HttpListener/packages.config
  17. 0 0
      frameworks/C#/HttpListener/README.md
  18. 0 0
      frameworks/C#/HttpListener/__init__.py
  19. 0 0
      frameworks/C#/HttpListener/benchmark_config
  20. 0 0
      frameworks/C#/HttpListener/install.sh
  21. 0 0
      frameworks/C#/HttpListener/setup.ps1
  22. 0 0
      frameworks/C#/HttpListener/setup.py
  23. 0 0
      frameworks/C#/HttpListener/source_code
  24. 0 0
      frameworks/C#/aspnet-stripped/.gitignore
  25. 0 0
      frameworks/C#/aspnet-stripped/NuGet.exe
  26. 0 0
      frameworks/C#/aspnet-stripped/README.md
  27. 0 0
      frameworks/C#/aspnet-stripped/__init__.py
  28. 0 0
      frameworks/C#/aspnet-stripped/benchmark_config
  29. 0 0
      frameworks/C#/aspnet-stripped/install.sh
  30. 0 0
      frameworks/C#/aspnet-stripped/setup_iis.ps1
  31. 0 0
      frameworks/C#/aspnet-stripped/setup_iis.py
  32. 0 0
      frameworks/C#/aspnet-stripped/source_code
  33. 0 0
      frameworks/C#/aspnet-stripped/src/App_Code/Common.cs
  34. 0 0
      frameworks/C#/aspnet-stripped/src/App_Code/DbHandler.cs
  35. 0 0
      frameworks/C#/aspnet-stripped/src/App_Code/FortunesPage.cs
  36. 0 0
      frameworks/C#/aspnet-stripped/src/App_Code/JsonHandler.cs
  37. 0 0
      frameworks/C#/aspnet-stripped/src/App_Code/Models/Fortune.cs
  38. 0 0
      frameworks/C#/aspnet-stripped/src/App_Code/Models/MongoDB.cs
  39. 0 0
      frameworks/C#/aspnet-stripped/src/App_Code/Models/World.cs
  40. 0 0
      frameworks/C#/aspnet-stripped/src/App_Code/MongoDBHandlers.cs
  41. 0 0
      frameworks/C#/aspnet-stripped/src/App_Code/MyModule.cs
  42. 0 0
      frameworks/C#/aspnet-stripped/src/App_Code/NoAspxHandlerFactory.cs
  43. 0 0
      frameworks/C#/aspnet-stripped/src/App_Code/PlaintextHandler.cs
  44. 0 0
      frameworks/C#/aspnet-stripped/src/App_Code/UpdatesHandler.cs
  45. 0 0
      frameworks/C#/aspnet-stripped/src/Web.config
  46. 0 0
      frameworks/C#/aspnet-stripped/src/fortunes.aspx
  47. 0 0
      frameworks/C#/aspnet-stripped/src/mongodbfortunes.aspx
  48. 0 0
      frameworks/C#/aspnet-stripped/src/packages.config
  49. 0 0
      frameworks/C#/aspnet/.gitignore
  50. 0 0
      frameworks/C#/aspnet/README.md
  51. 0 0
      frameworks/C#/aspnet/__init__.py
  52. 0 0
      frameworks/C#/aspnet/benchmark_config
  53. 0 0
      frameworks/C#/aspnet/install.sh
  54. 0 0
      frameworks/C#/aspnet/lib/.nuget/NuGet.exe
  55. 0 0
      frameworks/C#/aspnet/lib/.nuget/NuGet.targets
  56. 0 0
      frameworks/C#/aspnet/lib/packages.config
  57. 0 0
      frameworks/C#/aspnet/nginx.conf
  58. 0 0
      frameworks/C#/aspnet/setup_iis.ps1
  59. 0 0
      frameworks/C#/aspnet/setup_iis.py
  60. 0 0
      frameworks/C#/aspnet/setup_nginx.py
  61. 0 0
      frameworks/C#/aspnet/setup_xsp.py
  62. 0 0
      frameworks/C#/aspnet/source_code
  63. 0 0
      frameworks/C#/aspnet/src/Application.cs
  64. 0 0
      frameworks/C#/aspnet/src/Benchmarks.AspNet.csproj
  65. 0 0
      frameworks/C#/aspnet/src/Benchmarks.sln
  66. 0 0
      frameworks/C#/aspnet/src/Controllers/AdoController.cs
  67. 0 0
      frameworks/C#/aspnet/src/Controllers/EntityFrameworkController.cs
  68. 0 0
      frameworks/C#/aspnet/src/Controllers/HomeController.cs
  69. 0 0
      frameworks/C#/aspnet/src/Controllers/JsonController.cs
  70. 0 0
      frameworks/C#/aspnet/src/Controllers/MongoDBController.cs
  71. 0 0
      frameworks/C#/aspnet/src/Controllers/PlaintextController.cs
  72. 0 0
      frameworks/C#/aspnet/src/Models/EntityFramework.cs
  73. 0 0
      frameworks/C#/aspnet/src/Models/Fortune.cs
  74. 0 0
      frameworks/C#/aspnet/src/Models/MongoDB.cs
  75. 0 0
      frameworks/C#/aspnet/src/Models/World.cs
  76. 0 0
      frameworks/C#/aspnet/src/Properties/PublishProfiles/IIS.pubxml
  77. 0 0
      frameworks/C#/aspnet/src/Views/Fortunes.cshtml
  78. 0 0
      frameworks/C#/aspnet/src/Views/Index.cshtml
  79. 0 0
      frameworks/C#/aspnet/src/Views/Web.config
  80. 0 0
      frameworks/C#/aspnet/src/Web.config
  81. 0 0
      frameworks/C#/evhttp-sharp/.gitignore
  82. 0 0
      frameworks/C#/evhttp-sharp/__init__.py
  83. 0 0
      frameworks/C#/evhttp-sharp/benchmark_config
  84. 0 0
      frameworks/C#/evhttp-sharp/install.sh
  85. 2 2
      frameworks/C#/evhttp-sharp/setup.py
  86. 0 0
      frameworks/C#/evhttp-sharp/src/EvHttpSharpBenchmark.csproj
  87. 0 0
      frameworks/C#/evhttp-sharp/src/EvHttpSharpBenchmark.sln
  88. 0 0
      frameworks/C#/evhttp-sharp/src/Program.cs
  89. 0 0
      frameworks/C#/evhttp-sharp/src/Properties/AssemblyInfo.cs
  90. 0 0
      frameworks/C#/evhttp-sharp/src/lib/EvHttpSharp.dll
  91. 0 0
      frameworks/C#/evhttp-sharp/src/lib/Newtonsoft.Json.dll
  92. 0 0
      frameworks/C#/evhttp-sharp/src/lib/libevent_core-2-0-5.dll
  93. 0 0
      frameworks/C#/evhttp-sharp/src/lib/libevent_extra-2-0-5.dll
  94. 0 0
      frameworks/C#/evhttp-sharp/src/libevent_core-2-0-5.dll
  95. 0 0
      frameworks/C#/evhttp-sharp/src/libevent_extra-2-0-5.dll
  96. 0 0
      frameworks/C#/nancy/.gitignore
  97. 0 0
      frameworks/C#/nancy/NancyModules/DbModule.cs
  98. 0 0
      frameworks/C#/nancy/NancyModules/JsonModule.cs
  99. 0 0
      frameworks/C#/nancy/NancyModules/NancyModules.csproj
  100. 0 0
      frameworks/C#/nancy/NancyModules/Properties/AssemblyInfo.cs

+ 2 - 1
.travis.yml

@@ -97,7 +97,8 @@ env:
     - TESTDIR=plain
     - TESTDIR=play1
     - TESTDIR=play1siena
-    - TESTDIR=play2
+    - TESTDIR=play2-java
+    - TESTDIR=play2-scala
     - TESTDIR=play-activate-mysql
     - TESTDIR=play-java-jpa
     - TESTDIR=play-scala-mongodb

+ 2 - 2
README.md

@@ -412,8 +412,8 @@ grails.sh  nawak.sh  play1.sh  siena.sh     vertx.sh  yesod.sh
 jester.sh  onion.sh  play2.sh  treefrog.sh  wt.sh
 $ ls languages
 composer.sh  erlang.sh   hhvm.sh   mono.sh    perl.sh     pypy.sh     racket.sh   urweb.sh
-dart.sh      go.sh       java.sh   nimrod.sh  phalcon.sh  python2.sh  ringojs.sh  xsp.sh
-elixir.sh    haskell.sh  jruby.sh  nodejs.sh  php.sh      python3.sh  ruby.sh     yaf.sh
+dart.sh      go.sh       java.sh   nimrod.sh  python2.sh  ringojs.sh  xsp.sh
+elixir.sh    haskell.sh  jruby.sh  nodejs.sh  php.sh      python3.sh  ruby.sh 
 $ ls systools
 leiningen.sh  maven.sh
 $ ls webservers

+ 0 - 0
HttpListener/.gitignore → frameworks/C#/HttpListener/.gitignore


+ 0 - 0
HttpListener/.nuget/NuGet.Config → frameworks/C#/HttpListener/.nuget/NuGet.Config


+ 0 - 0
HttpListener/.nuget/NuGet.targets → frameworks/C#/HttpListener/.nuget/NuGet.targets


+ 0 - 0
HttpListener/HttpListener.sln → frameworks/C#/HttpListener/HttpListener.sln


+ 0 - 0
HttpListener/HttpListener/App.config → frameworks/C#/HttpListener/HttpListener/App.config


+ 0 - 0
HttpListener/HttpListener/Fortunes.cshtml → frameworks/C#/HttpListener/HttpListener/Fortunes.cshtml


+ 0 - 0
HttpListener/HttpListener/Fortunes.generated.cs → frameworks/C#/HttpListener/HttpListener/Fortunes.generated.cs


+ 0 - 0
HttpListener/HttpListener/HttpListener.csproj → frameworks/C#/HttpListener/HttpListener/HttpListener.csproj


+ 0 - 0
HttpListener/HttpListener/Models/Fortune.cs → frameworks/C#/HttpListener/HttpListener/Models/Fortune.cs


+ 0 - 0
HttpListener/HttpListener/Models/MongoDB.cs → frameworks/C#/HttpListener/HttpListener/Models/MongoDB.cs


+ 0 - 0
HttpListener/HttpListener/Models/World.cs → frameworks/C#/HttpListener/HttpListener/Models/World.cs


+ 0 - 0
HttpListener/HttpListener/Program.cs → frameworks/C#/HttpListener/HttpListener/Program.cs


+ 0 - 0
HttpListener/HttpListener/Properties/AssemblyInfo.cs → frameworks/C#/HttpListener/HttpListener/Properties/AssemblyInfo.cs


+ 0 - 0
HttpListener/HttpListener/packages.config → frameworks/C#/HttpListener/HttpListener/packages.config


+ 0 - 0
HttpListener/README.md → frameworks/C#/HttpListener/README.md


+ 0 - 0
HttpListener/__init__.py → frameworks/C#/HttpListener/__init__.py


+ 0 - 0
HttpListener/benchmark_config → frameworks/C#/HttpListener/benchmark_config


+ 0 - 0
HttpListener/install.sh → frameworks/C#/HttpListener/install.sh


+ 0 - 0
HttpListener/setup.ps1 → frameworks/C#/HttpListener/setup.ps1


+ 0 - 0
HttpListener/setup.py → frameworks/C#/HttpListener/setup.py


+ 0 - 0
HttpListener/source_code → frameworks/C#/HttpListener/source_code


+ 0 - 0
aspnet-stripped/.gitignore → frameworks/C#/aspnet-stripped/.gitignore


+ 0 - 0
aspnet-stripped/NuGet.exe → frameworks/C#/aspnet-stripped/NuGet.exe


+ 0 - 0
aspnet-stripped/README.md → frameworks/C#/aspnet-stripped/README.md


+ 0 - 0
ULib/__init__.py → frameworks/C#/aspnet-stripped/__init__.py


+ 0 - 0
aspnet-stripped/benchmark_config → frameworks/C#/aspnet-stripped/benchmark_config


+ 0 - 0
aspnet-stripped/install.sh → frameworks/C#/aspnet-stripped/install.sh


+ 0 - 0
aspnet-stripped/setup_iis.ps1 → frameworks/C#/aspnet-stripped/setup_iis.ps1


+ 0 - 0
aspnet-stripped/setup_iis.py → frameworks/C#/aspnet-stripped/setup_iis.py


+ 0 - 0
aspnet-stripped/source_code → frameworks/C#/aspnet-stripped/source_code


+ 0 - 0
aspnet-stripped/src/App_Code/Common.cs → frameworks/C#/aspnet-stripped/src/App_Code/Common.cs


+ 0 - 0
aspnet-stripped/src/App_Code/DbHandler.cs → frameworks/C#/aspnet-stripped/src/App_Code/DbHandler.cs


+ 0 - 0
aspnet-stripped/src/App_Code/FortunesPage.cs → frameworks/C#/aspnet-stripped/src/App_Code/FortunesPage.cs


+ 0 - 0
aspnet-stripped/src/App_Code/JsonHandler.cs → frameworks/C#/aspnet-stripped/src/App_Code/JsonHandler.cs


+ 0 - 0
aspnet-stripped/src/App_Code/Models/Fortune.cs → frameworks/C#/aspnet-stripped/src/App_Code/Models/Fortune.cs


+ 0 - 0
aspnet-stripped/src/App_Code/Models/MongoDB.cs → frameworks/C#/aspnet-stripped/src/App_Code/Models/MongoDB.cs


+ 0 - 0
aspnet-stripped/src/App_Code/Models/World.cs → frameworks/C#/aspnet-stripped/src/App_Code/Models/World.cs


+ 0 - 0
aspnet-stripped/src/App_Code/MongoDBHandlers.cs → frameworks/C#/aspnet-stripped/src/App_Code/MongoDBHandlers.cs


+ 0 - 0
aspnet-stripped/src/App_Code/MyModule.cs → frameworks/C#/aspnet-stripped/src/App_Code/MyModule.cs


+ 0 - 0
aspnet-stripped/src/App_Code/NoAspxHandlerFactory.cs → frameworks/C#/aspnet-stripped/src/App_Code/NoAspxHandlerFactory.cs


+ 0 - 0
aspnet-stripped/src/App_Code/PlaintextHandler.cs → frameworks/C#/aspnet-stripped/src/App_Code/PlaintextHandler.cs


+ 0 - 0
aspnet-stripped/src/App_Code/UpdatesHandler.cs → frameworks/C#/aspnet-stripped/src/App_Code/UpdatesHandler.cs


+ 0 - 0
aspnet-stripped/src/Web.config → frameworks/C#/aspnet-stripped/src/Web.config


+ 0 - 0
aspnet-stripped/src/fortunes.aspx → frameworks/C#/aspnet-stripped/src/fortunes.aspx


+ 0 - 0
aspnet-stripped/src/mongodbfortunes.aspx → frameworks/C#/aspnet-stripped/src/mongodbfortunes.aspx


+ 0 - 0
aspnet-stripped/src/packages.config → frameworks/C#/aspnet-stripped/src/packages.config


+ 0 - 0
aspnet/.gitignore → frameworks/C#/aspnet/.gitignore


+ 0 - 0
aspnet/README.md → frameworks/C#/aspnet/README.md


+ 0 - 0
activeweb/__init__.py → frameworks/C#/aspnet/__init__.py


+ 0 - 0
aspnet/benchmark_config → frameworks/C#/aspnet/benchmark_config


+ 0 - 0
aspnet/install.sh → frameworks/C#/aspnet/install.sh


+ 0 - 0
aspnet/lib/.nuget/NuGet.exe → frameworks/C#/aspnet/lib/.nuget/NuGet.exe


+ 0 - 0
aspnet/lib/.nuget/NuGet.targets → frameworks/C#/aspnet/lib/.nuget/NuGet.targets


+ 0 - 0
aspnet/lib/packages.config → frameworks/C#/aspnet/lib/packages.config


+ 0 - 0
aspnet/nginx.conf → frameworks/C#/aspnet/nginx.conf


+ 0 - 0
aspnet/setup_iis.ps1 → frameworks/C#/aspnet/setup_iis.ps1


+ 0 - 0
aspnet/setup_iis.py → frameworks/C#/aspnet/setup_iis.py


+ 0 - 0
aspnet/setup_nginx.py → frameworks/C#/aspnet/setup_nginx.py


+ 0 - 0
aspnet/setup_xsp.py → frameworks/C#/aspnet/setup_xsp.py


+ 0 - 0
aspnet/source_code → frameworks/C#/aspnet/source_code


+ 0 - 0
aspnet/src/Application.cs → frameworks/C#/aspnet/src/Application.cs


+ 0 - 0
aspnet/src/Benchmarks.AspNet.csproj → frameworks/C#/aspnet/src/Benchmarks.AspNet.csproj


+ 0 - 0
aspnet/src/Benchmarks.sln → frameworks/C#/aspnet/src/Benchmarks.sln


+ 0 - 0
aspnet/src/Controllers/AdoController.cs → frameworks/C#/aspnet/src/Controllers/AdoController.cs


+ 0 - 0
aspnet/src/Controllers/EntityFrameworkController.cs → frameworks/C#/aspnet/src/Controllers/EntityFrameworkController.cs


+ 0 - 0
aspnet/src/Controllers/HomeController.cs → frameworks/C#/aspnet/src/Controllers/HomeController.cs


+ 0 - 0
aspnet/src/Controllers/JsonController.cs → frameworks/C#/aspnet/src/Controllers/JsonController.cs


+ 0 - 0
aspnet/src/Controllers/MongoDBController.cs → frameworks/C#/aspnet/src/Controllers/MongoDBController.cs


+ 0 - 0
aspnet/src/Controllers/PlaintextController.cs → frameworks/C#/aspnet/src/Controllers/PlaintextController.cs


+ 0 - 0
aspnet/src/Models/EntityFramework.cs → frameworks/C#/aspnet/src/Models/EntityFramework.cs


+ 0 - 0
aspnet/src/Models/Fortune.cs → frameworks/C#/aspnet/src/Models/Fortune.cs


+ 0 - 0
aspnet/src/Models/MongoDB.cs → frameworks/C#/aspnet/src/Models/MongoDB.cs


+ 0 - 0
aspnet/src/Models/World.cs → frameworks/C#/aspnet/src/Models/World.cs


+ 0 - 0
aspnet/src/Properties/PublishProfiles/IIS.pubxml → frameworks/C#/aspnet/src/Properties/PublishProfiles/IIS.pubxml


+ 0 - 0
aspnet/src/Views/Fortunes.cshtml → frameworks/C#/aspnet/src/Views/Fortunes.cshtml


+ 0 - 0
aspnet/src/Views/Index.cshtml → frameworks/C#/aspnet/src/Views/Index.cshtml


+ 0 - 0
aspnet/src/Views/Web.config → frameworks/C#/aspnet/src/Views/Web.config


+ 0 - 0
aspnet/src/Web.config → frameworks/C#/aspnet/src/Web.config


+ 0 - 0
evhttp-sharp/.gitignore → frameworks/C#/evhttp-sharp/.gitignore


+ 0 - 0
aspnet-stripped/__init__.py → frameworks/C#/evhttp-sharp/__init__.py


+ 0 - 0
evhttp-sharp/benchmark_config → frameworks/C#/evhttp-sharp/benchmark_config


+ 0 - 0
evhttp-sharp/install.sh → frameworks/C#/evhttp-sharp/install.sh


+ 2 - 2
evhttp-sharp/setup.py → frameworks/C#/evhttp-sharp/setup.py

@@ -3,12 +3,12 @@ import sys
 import setup_util
 import os
 
-root = os.getcwd() + "/evhttp-sharp"
-app = root + "/src"
 
 def start(args, logfile, errfile):
   if os.name == 'nt':
     return 1
+  
+  app = args.troot + "/src"
 
   try:
     # build

+ 0 - 0
evhttp-sharp/src/EvHttpSharpBenchmark.csproj → frameworks/C#/evhttp-sharp/src/EvHttpSharpBenchmark.csproj


+ 0 - 0
evhttp-sharp/src/EvHttpSharpBenchmark.sln → frameworks/C#/evhttp-sharp/src/EvHttpSharpBenchmark.sln


+ 0 - 0
evhttp-sharp/src/Program.cs → frameworks/C#/evhttp-sharp/src/Program.cs


+ 0 - 0
evhttp-sharp/src/Properties/AssemblyInfo.cs → frameworks/C#/evhttp-sharp/src/Properties/AssemblyInfo.cs


+ 0 - 0
evhttp-sharp/src/lib/EvHttpSharp.dll → frameworks/C#/evhttp-sharp/src/lib/EvHttpSharp.dll


+ 0 - 0
evhttp-sharp/src/lib/Newtonsoft.Json.dll → frameworks/C#/evhttp-sharp/src/lib/Newtonsoft.Json.dll


+ 0 - 0
evhttp-sharp/src/lib/libevent_core-2-0-5.dll → frameworks/C#/evhttp-sharp/src/lib/libevent_core-2-0-5.dll


+ 0 - 0
evhttp-sharp/src/lib/libevent_extra-2-0-5.dll → frameworks/C#/evhttp-sharp/src/lib/libevent_extra-2-0-5.dll


+ 0 - 0
evhttp-sharp/src/libevent_core-2-0-5.dll → frameworks/C#/evhttp-sharp/src/libevent_core-2-0-5.dll


+ 0 - 0
evhttp-sharp/src/libevent_extra-2-0-5.dll → frameworks/C#/evhttp-sharp/src/libevent_extra-2-0-5.dll


+ 0 - 0
nancy/.gitignore → frameworks/C#/nancy/.gitignore


+ 0 - 0
nancy/NancyModules/DbModule.cs → frameworks/C#/nancy/NancyModules/DbModule.cs


+ 0 - 0
nancy/NancyModules/JsonModule.cs → frameworks/C#/nancy/NancyModules/JsonModule.cs


+ 0 - 0
nancy/NancyModules/NancyModules.csproj → frameworks/C#/nancy/NancyModules/NancyModules.csproj


+ 0 - 0
nancy/NancyModules/Properties/AssemblyInfo.cs → frameworks/C#/nancy/NancyModules/Properties/AssemblyInfo.cs


Some files were not shown because too many files changed in this diff