Fix play startup script to allow for complex multi-project builds

playframework · May 18, 2012 · 900fbf7 · 900fbf7
1 parent bc0fc4b
commit 900fbf7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/play b/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

diff --git a/play.bat b/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" %*