Skip to content

Commit

Permalink
Update static build script, and version
Browse files Browse the repository at this point in the history
  • Loading branch information
antialize committed Feb 10, 2013
1 parent 49c83e0 commit e2333f5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
7 changes: 4 additions & 3 deletions scripts/static-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ GNUWIN32FILES="openssl-0.9.8h-1-lib.zip \
openssl-0.9.8h-1-bin.zip "
#freetype-2.3.5-1-bin.zip \
#freetype-2.3.5-1-lib.zip "
QTBRANCH=
QTREPO=git://gitorious.org/~antialize/qt/antializes-qt.git
QTBRANCH=4.8.4
J="$((1 + $(cat /proc/cpuinfo | grep -c processor)))"

function usage() {
Expand All @@ -52,7 +53,7 @@ function usage() {
echo "windows Compile windows binary using wine"
}
VERSION=""
QTBRANCH="staging"


while getopts hq:v: O; do
case "$O" in
Expand Down Expand Up @@ -120,7 +121,7 @@ function checkout() {

#Fetch most recent version of qt
echo "Updating qt from remote"
git_fetch_and_update qt git://gitorious.org/+wkhtml2pdf/qt/wkhtmltopdf-qt.git "$QTBRANCH" || exit 1
git_fetch_and_update qt "$QTREPO" "$QTBRANCH" || exit 1
cd qt
}

Expand Down
10 changes: 5 additions & 5 deletions version.pri
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
GIT_VERSION=$$system(git show --pretty=\"%ad-%h\" --date=short)
#GIT_VERSION=$$system(git show --pretty=\"%ad-%h\" --date=short)

MAJOR_VERSION=$$section(GIT_VERSION, "-", 0, 0)
MINOR_VERSION=$$section(GIT_VERSION, "-", 1, 1)
PATCH_VERSION=$$section(GIT_VERSION, "-", 2, 2)
BUILD=$$section(GIT_VERSION, "-", 3, 3)
MAJOR_VERSION=0
MINOR_VERSION=12
PATCH_VERSION=0
BUILD=

DEFINES += MAJOR_VERSION=$$MAJOR_VERSION MINOR_VERSION=$$MINOR_VERSION PATCH_VERSION=$$PATCH_VERSION BUILD=$$BUILD

0 comments on commit e2333f5

Please sign in to comment.