Skip to content

Commit

Permalink
Use a more reliable way to build dependent modules for site and admin
Browse files Browse the repository at this point in the history
  • Loading branch information
phillipuniverse committed Nov 15, 2016
1 parent 8241438 commit 13358ae
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions admin/startadmin.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ REM # TOMCAT_MEMORY - Defaults to -Xmx1536M -XX:MaxPermSize=512M
set cwd=%cd%

REM # Do an install of the core jar in case anything changed since the last restart and we're not using jrebel
cd ../core
call mvn install
cd ..
call mvn -pl admin -am clean install

REM # Go back to where we just were to get ready to run the Tomcat Maven plugin
cd %cwd%
Expand All @@ -34,4 +34,4 @@ SET BROADLEAF_OPTS=%TOMCAT_MEMORY% -Xdebug -Xrunjdwp:transport=dt_socket,address
SET MAVEN_OPTS=%MAVEN_OPTS% %BROADLEAF_OPTS%

call mvn tomcat7:run-war
endlocal
endlocal
4 changes: 2 additions & 2 deletions admin/startadmin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
cwd=$(pwd)

# Do an install of the core jar in case anything changed since the last restart and we're not using jrebel
cd ../core
mvn install
cd ..
mvn -pl admin -am clean install

# Go back to where we just were to get ready to run the Tomcat Maven plugin
cd $cwd
Expand Down
4 changes: 2 additions & 2 deletions site/startsite.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ REM # TOMCAT_MEMORY - Defaults to -Xmx1536M -XX:MaxPermSize=512M
set cwd=%cd%

REM # Do an install of the core jar in case anything changed since the last restart and we're not using jrebel
cd ../core
call mvn install
cd ..
call mvn -pl site -am clean install

REM # Go back to where we just were to get ready to run the Tomcat Maven plugin
cd %cwd%
Expand Down
4 changes: 2 additions & 2 deletions site/startsite.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
cwd=$(pwd)

# Do an install of the core jar in case anything changed since the last restart and we're not using jrebel
cd ../core
mvn install
cd ..
mvn -pl site -am clean install

# Go back to where we just were to get ready to run the Tomcat Maven plugin
cd $cwd
Expand Down

0 comments on commit 13358ae

Please sign in to comment.