Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Lighthouse 453: Fix play startup script to allow for complex multi-project builds #323

Closed
wants to merge 1 commit into from

2 participants

@benmccann
Collaborator

Today it is totally impossible to have a sub-project that is shared by two Play projects. This change will fix that. See the bug report for more details and an example project which is broken without this fix and works with it. https://play.lighthouseapp.com/projects/82401-play-20/tickets/453-need-to-be-able-to-share-a-sub-project-with-two-play-projects#ticket-453-9

@benmccann
Collaborator

See pull request 324 as a possibly better alternative to this one (though either are far better than the status quo).

@pk11 pk11 was assigned
@pk11 pk11 referenced this pull request from a commit
@pk11 pk11 [#324 #323] add a check against `project` folder in play scripts
This will allow the play scripts to be used with ad-hoc project layouts where the root PlayProject (and therefore `conf/application.conf`) is missing. Defining a root project is still recommended though.
f8e95ce
@pk11 pk11 closed this
@ornicar ornicar referenced this pull request from a commit
@ornicar ornicar Merge branch 'master' of git://github.com/playframework/Play20 into m…
…aster-tcp

* 'master' of git://github.com/playframework/Play20:
  [#324 #323] add a check against `project` folder in play scripts
  Fix for #472
  Ticket #476
9f8116f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 2 additions and 3 deletions.
  1. +1 −1  play
  2. +1 −2  play.bat
View
2  play
@@ -13,7 +13,7 @@ else
JAVA=$JAVA_HOME/bin/java
fi
-if [ -f conf/application.conf -o -f conf/reference.conf ]; then
+if [ -f project/Build.scala ]; then
if test "$1" = "clean-all"; then
rm -rf target
rm -rf tmp
View
3  play.bat
@@ -9,8 +9,7 @@ set fp=file:///!p: =%%20!
set buildScript="%~dp0framework\build.bat"
set additionalArgs=%*
-if exist "conf\application.conf" goto existingApplication
-if exist "conf\reference.conf" goto existingApplication
+if exist "project\Build.scala" goto existingApplication
:noApplication
java -Dsbt.ivy.home="%~dp0repository" -Dplay.home="%~dp0framework" -Dsbt.boot.properties="%fp%framework/sbt/play.boot.properties" -jar "%~dp0framework\sbt\sbt-launch.jar" %*
Something went wrong with that request. Please try again.