Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable directory structure reorganization #1015

Merged
merged 64 commits into from
Aug 15, 2014

Conversation

hamiltont
Copy link
Contributor

This allows us to move all framework directories from the root of this project to the folder frameworks/<language>. It still runs as expected on any framework directories still in
the project root.

As an example, I've moved mojolicious into frameworks/perl/mojolicious. I will move
others, such as moving all the php tests into frameworks/php once I'm confident I'm
not causing pain for any open pull requests. The end result of moving everything will
be a root directory organized more like this:

  • /frameworks
    • perl
      • mojolicious
    • php
    • java
    • c++
  • /config
  • /results
  • /toolset

This should close #448

@msmith-techempower
Copy link
Member

❤️

Install all extensions with php
…-fix-448

Conflicts:
	frameworks/Java/play-java/.gitignore
	frameworks/Java/play-java/README.md
	frameworks/Java/play-java/app/controllers/Application.java
	frameworks/Java/play-java/app/models/World.java
	frameworks/Java/play-java/app/utils/Predicate.java
	frameworks/Java/play-java/app/utils/Predicated.java
	frameworks/Java/play-java/app/utils/PredicatedAction.java
	frameworks/Java/play-java/benchmark_config
	frameworks/Java/play-java/build.sbt
	frameworks/Java/play-java/conf/application.conf
	frameworks/Java/play-java/conf/routes
	frameworks/Java/play-java/install.sh
	frameworks/Java/play-java/setup.py
	frameworks/Java/play-java/source_code
	frameworks/Scala/play-activate-mysql/project/build.properties
	frameworks/Scala/play-activate-mysql/project/plugins.sbt
	frameworks/Scala/play-scala/.gitignore
	frameworks/Scala/play-scala/README.md
	frameworks/Scala/play-scala/app/controllers/Application.scala
	frameworks/Scala/play-scala/app/models/Fortune.scala
	frameworks/Scala/play-scala/app/models/World.scala
	frameworks/Scala/play-scala/app/utils/PredicatedAction.scala
	frameworks/Scala/play-scala/app/views/fortune.scala.html
	frameworks/Scala/play-scala/app/views/main.scala.html
	frameworks/Scala/play-scala/benchmark_config
	frameworks/Scala/play-scala/build.sbt
	frameworks/Scala/play-scala/conf/application.conf
	frameworks/Scala/play-scala/conf/routes
	frameworks/Scala/play-scala/install.sh
	frameworks/Scala/play-scala/project/build.properties
	frameworks/Scala/play-scala/project/plugins.sbt
	frameworks/Scala/play-scala/setup.py
	frameworks/Scala/play-scala/source_code
	play-java/.gitignore
	play-java/README.md
	play-java/app/models/World.java
	play-java/app/utils/Predicate.java
	play-java/app/utils/Predicated.java
	play-java/app/utils/PredicatedAction.java
	play-java/build.sbt
	play-java/conf/application.conf
	play-java/conf/routes
	play-java/project/build.properties
	play-java/project/plugins.sbt
	play-java/source_code
	play-scala/.gitignore
	play-scala/README.md
	play-scala/app/models/Fortune.scala
	play-scala/app/models/World.scala
	play-scala/app/utils/PredicatedAction.scala
	play-scala/app/views/fortune.scala.html
	play-scala/app/views/main.scala.html
	play-scala/build.sbt
	play-scala/conf/application.conf
	play-scala/conf/routes
	play-scala/project/build.properties
	play-scala/project/plugins.sbt
	play-scala/source_code
	play2/play2-java-ebean/.gitignore
	play2/play2-java-ebean/README.md
	play2/play2-java-ebean/app/models/World.java
	play2/play2-java-ebean/app/utils/Predicate.java
	play2/play2-java-ebean/app/utils/Predicated.java
	play2/play2-java-ebean/app/utils/PredicatedAction.java
	play2/play2-java-ebean/build.sbt
	play2/play2-java-ebean/conf/application.conf
	play2/play2-java-ebean/project/build.properties
	play2/play2-java-ebean/project/plugins.sbt
	play2/play2-java-ebean/source_code
	play2/play2-java/conf/routes
	play2/play2-scala-anorm/.gitignore
	play2/play2-scala-anorm/README.md
	play2/play2-scala-anorm/app/models/Fortune.scala
	play2/play2-scala-anorm/app/models/World.scala
	play2/play2-scala-anorm/app/utils/PredicatedAction.scala
	play2/play2-scala-anorm/app/views/fortune.scala.html
	play2/play2-scala-anorm/app/views/main.scala.html
	play2/play2-scala-anorm/build.sbt
	play2/play2-scala-anorm/conf/application.conf
	play2/play2-scala-anorm/conf/routes
	play2/play2-scala-anorm/project/build.properties
	play2/play2-scala-anorm/project/plugins.sbt
	play2/play2-scala-anorm/source_code
@hamiltont
Copy link
Contributor Author

Ok. Ungodly number of commits, but this is now proven to work!

I used the most recent full travis build as my starting point of "what currently works", and then verified that against this pull request.

I also:

  • added a few minor commits to fix issues with hard-coded paths
  • re-wrote the php installation to install into a prefix folder
  • removed installers for the PHP modules yaf and phalcon, and installed these inside the php.sh. They are referenced by our php config file, so you couldn't start php or php-fpm without installing all of the modules anyway
  • fixed some more toolset bugs. For example, web-simple should have been failing, and now it is

@hamiltont hamiltont reopened this Aug 15, 2014
hamiltont added a commit that referenced this pull request Aug 15, 2014
Reorganize project directory structure
@hamiltont hamiltont merged commit a919d89 into TechEmpower:master Aug 15, 2014
@hamiltont hamiltont deleted the toolset-fix-448 branch August 15, 2014 20:48
@jberger
Copy link
Contributor

jberger commented Aug 16, 2014

Spectacular!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Directory structure re-organization
3 participants