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.

Sign up for GitHub

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

Jump to bottom

Lighthouse 453: Have the play script do a better check as to whether project is actually a play project #324

Closed
wants to merge 3 commits into from
Closed

Lighthouse 453: Have the play script do a better check as to whether project is actually a play project #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98aff0f
Have the play script do a better check as to whether project is actua…
benmccann May 18, 2012
2959060
Update play.bat to check if plugins.sbt for play project validity
benmccann May 18, 2012
36828c5
Check to see if file exists before checking its contents
benmccann May 18, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion play
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/plugins.sbt ] && grep -q "addSbtPlugin(\"play\"" project/plugins.sbt ; then
if test "$1" = "clean-all"; then
rm -rf target
rm -rf tmp
Expand Down
5 changes: 3 additions & 2 deletions play.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ 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 not exist "project\plugins.sbt" goto noApplication
findstr addSbtPlugin(\"play\" project\plugins.sbt > NUL
if %errorlevel%==0 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" %*
Expand Down