Skip to content

Commit a2e0c79

Browse files
committed
Adding build script for lift v3.1.
1 parent a78f5f4 commit a2e0c79

File tree

4 files changed

+41
-4
lines changed

4 files changed

+41
-4
lines changed

project/autobuildscript/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ To publish use the publish.sh script, to change to a local publish replace 'publ
1010

1111
As of v2.9 builds against Lift 2.5 is no longer supported.
1212

13-
./project/autobuildscript/publish.sh -t [2.5,2.6,3.0]
13+
./project/autobuildscript/publish.sh -t [2.5,2.6,3.0,3.1]
1414

1515
The build script will make sure the correct JDK is set and execute one of the following
1616
sbt command files depending on chosen input (target) parameter.

project/autobuildscript/build-publish-Lift3.txt renamed to project/autobuildscript/build-publish-Lift30.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
alias pub=publish-signed
1+
alias pub=publish-local-signed
22

33
set version in ThisBuild:="2.11-SNAPSHOT"
44

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
alias pub=publish-signed
2+
3+
set version in ThisBuild:="2.11-SNAPSHOT"
4+
5+
set liftVersion in ThisBuild:="3.1-SNAPSHOT"
6+
7+
set scalaVersion in ThisBuild:="2.12.2"
8+
9+
project lift-jquery-module
10+
set parallelExecution in Test := false
11+
clean
12+
; compile ; test ; pub
13+
14+
set scalaVersion in ThisBuild:="2.11.11"
15+
16+
project lift-jquery-module
17+
set parallelExecution in Test := false
18+
clean
19+
; compile ; test ; pub
20+
21+
22+

project/autobuildscript/publish.sh

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ LIFT_TARGET="empty"
1717
#sbt command files targeting different Lift versions, see respective files for more information.
1818
PUBLISH_25_SBT_COMMAND_FILE=${PWD}/project/autobuildscript/build-publish-Lift25.txt
1919
PUBLISH_26_SBT_COMMAND_FILE=${PWD}/project/autobuildscript/build-publish-Lift26.txt
20-
PUBLISH_30_SBT_COMMAND_FILE=${PWD}/project/autobuildscript/build-publish-Lift3.txt
20+
PUBLISH_30_SBT_COMMAND_FILE=${PWD}/project/autobuildscript/build-publish-Lift30.txt
21+
PUBLISH_31_SBT_COMMAND_FILE=${PWD}/project/autobuildscript/build-publish-Lift31.txt
2122
#default location's for java on a ubuntu system
2223
JAVA_6_PATH=/usr/lib/jvm/java-6-oracle/jre/bin/java
2324
JAVA_7_PATH=/usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
@@ -115,14 +116,28 @@ function do30Publish {
115116
debug "\n***...done processing the sbt command file***\n"
116117
}
117118

119+
#Execute the necessary steps for publishing a Lift 3.1 module build
120+
function do31Publish {
121+
debug "\nTarget is set to Lift v3.1, require java-8";
122+
if ! requiredJavaIsSuccessfullySet $JAVA_8_PATH ; then
123+
die "java-8 dosen't seem to be present, cancelling release build!"
124+
fi
125+
debug "Current java environment is java-8\n"
126+
debug "\n***Start processing the sbt command file.***\n"
127+
sbt < $PUBLISH_31_SBT_COMMAND_FILE 2>&1|tee ${LOG_FILE}
128+
debug "\n***...done processing the sbt command file***\n"
129+
}
130+
118131
function runMain {
119132
if [ $LIFT_TARGET == "2.5" ]; then {
120133
do25Publish
121134
} elif [ $LIFT_TARGET == "2.6" ]; then {
122135
do26Publish
123136
} elif [ $LIFT_TARGET == "3.0" ]; then {
124137
do30Publish
125-
} else
138+
} elif [ $LIFT_TARGET == "3.1" ]; then {
139+
do31Publish
140+
} else
126141
echo -e "\nNo target set! You need to specify a Lift version as target.\nUsage ./project/autobuildscript/publish.sh -t [2.5,2.6,3.x]\n";
127142
fi
128143
}

0 commit comments

Comments
 (0)