fix indentation
This commit is contained in:
parent
24ca667537
commit
681e76737e
2 changed files with 30 additions and 2 deletions
28
.gitlab/wininstall_build.sh
Normal file
28
.gitlab/wininstall_build.sh
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
apt-get update -qq && \
|
||||||
|
apt-get install -qq lua nsis && \
|
||||||
|
|
||||||
|
export PACKAGE_CODE=GitLab && \
|
||||||
|
|
||||||
|
if [ `git name-rev --tags --name-only $(git rev-parse HEAD)` == "undefined" ]; then export APPLICATION_VERSION=`lua -e 'for line in io.lines("config.h") do local m = string.match(line, "#define GTA5SYNC_APPVER \"(.+)\"$"); if m then print(m); os.exit(0) end end'`; else export APPLICATION_VERSION=`git name-rev --tags --name-only $(git rev-parse HEAD)`; fi
|
||||||
|
export PACKAGE_VERSION=$(grep -oE '^[^\-]*' <<< $APPLICATION_VERSION) && \
|
||||||
|
export PACKAGE_BUILD=$(grep -oP '\-\K.+' <<< $APPLICATION_VERSION) && \
|
||||||
|
export EXECUTABLE_VERSION=${PACKAGE_VERSION}${PACKAGE_BUILD}${EXECUTABLE_TAG} && \
|
||||||
|
if [[ ! ${PACKAGE_BUILD} ]]; then export PACKAGE_BUILD=1; fi
|
||||||
|
|
||||||
|
export PROJECT_DIR=$(pwd) && \
|
||||||
|
|
||||||
|
# Creating folders
|
||||||
|
cd ${PROJECT_DIR} && \
|
||||||
|
echo "gta5view build version is ${APPLICATION_VERSION}" && \
|
||||||
|
mkdir -p build && \
|
||||||
|
mkdir -p assets && \
|
||||||
|
|
||||||
|
# Starting build
|
||||||
|
cd build && \
|
||||||
|
qmake ${QMAKE_FLAGS} DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_QCONF DEFINES+=GTA5SYNC_INLANG='\\\"RUNDIR:SEPARATOR:lang\\\"' DEFINES+=GTA5SYNC_LANG='\\\"RUNDIR:SEPARATOR:lang\\\"' DEFINES+=GTA5SYNC_PLUG='\\\"RUNDIR:SEPARATOR:plugins\\\"' ../gta5view.pro && \
|
||||||
|
make -j 4 && \
|
||||||
|
cd ${PROJECT_DIR}/assets && \
|
||||||
|
makensis -NOCD ${PROJECT_DIR}/.travis/gta5view.nsi && \
|
||||||
|
mv -f gta5view_setup.exe gta5view-${EXECUTABLE_VERSION}_setup.exe
|
4
configure
vendored
4
configure
vendored
|
@ -45,7 +45,7 @@ else
|
||||||
QMAKE_PATH=$(find /usr/ -executable -name qmake -type f 2> /dev/null | sed -n 1p)
|
QMAKE_PATH=$(find /usr/ -executable -name qmake -type f 2> /dev/null | sed -n 1p)
|
||||||
if [ "${QMAKE_PATH}" == "" ]; then
|
if [ "${QMAKE_PATH}" == "" ]; then
|
||||||
echo "Qt qmake not found"
|
echo "Qt qmake not found"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
QT_VERSION=$(${QMAKE_PATH} -query "QT_VERSION")
|
QT_VERSION=$(${QMAKE_PATH} -query "QT_VERSION")
|
||||||
fi
|
fi
|
||||||
|
@ -60,7 +60,7 @@ else
|
||||||
MAKE_PATH=$(find /usr/ -executable -name make -type f 2> /dev/null | sed -n 1p)
|
MAKE_PATH=$(find /usr/ -executable -name make -type f 2> /dev/null | sed -n 1p)
|
||||||
if [ "${MAKE_PATH}" == "" ]; then
|
if [ "${MAKE_PATH}" == "" ]; then
|
||||||
echo "Make not found"
|
echo "Make not found"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue