Commit 64b6ac8c authored by IOhannes m zmölnig's avatar IOhannes m zmölnig
Browse files

renamed IEM_CI_PKGLIBDIR variable to IEM_CI_TMPDIR

parent fe686501
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
variables: variables:
PDVERSION: 0.50-2 PDVERSION: 0.50-2
SRCDIR: . SRCDIR: .
IEM_CI_PKGLIBDIR: .git-ci/_build/ IEM_CI_TMPDIR: .git-ci/_build/
####################################################################### #######################################################################
### script snippets ### script snippets
...@@ -35,10 +36,10 @@ variables: ...@@ -35,10 +36,10 @@ variables:
# the 'make --version' invocation is used to detect cross-compilation # the 'make --version' invocation is used to detect cross-compilation
- if make --version | egrep $(echo ${TARGETARCH:-$(${CC:-cc} -dumpmachine)} | sed -e 's|-.*-|-.*-|') && make -C "${SRCDIR}" check -n ${pd_extension:+extension=}${pd_extension} ${TARGETARCH:+PLATFORM=}${TARGETARCH} >/dev/null 2>&1 ; then make -C "${SRCDIR}" check ${pd_extension:+extension=}${pd_extension} ${TARGETARCH:+PLATFORM=}${TARGETARCH}; else echo "no 'check' target or cross-compiling...skipping"; fi - if make --version | egrep $(echo ${TARGETARCH:-$(${CC:-cc} -dumpmachine)} | sed -e 's|-.*-|-.*-|') && make -C "${SRCDIR}" check -n ${pd_extension:+extension=}${pd_extension} ${TARGETARCH:+PLATFORM=}${TARGETARCH} >/dev/null 2>&1 ; then make -C "${SRCDIR}" check ${pd_extension:+extension=}${pd_extension} ${TARGETARCH:+PLATFORM=}${TARGETARCH}; else echo "no 'check' target or cross-compiling...skipping"; fi
.script:make_install: &script_make_install .script:make_install: &script_make_install
- rm -rf "${IEM_CI_PKGLIBDIR}" - rm -rf "${IEM_CI_TMPDIR}"
- make -C "${SRCDIR}" install ${pd_extension:+extension=}${pd_extension} ${TARGETARCH:+PLATFORM=}${TARGETARCH} DESTDIR="$(pwd)" pkglibdir="/${IEM_CI_PKGLIBDIR}/" - make -C "${SRCDIR}" install ${pd_extension:+extension=}${pd_extension} ${TARGETARCH:+PLATFORM=}${TARGETARCH} DESTDIR="$(pwd)" pkglibdir="/${IEM_CI_TMPDIR}/"
- rm -rf "${CI_PROJECT_NAME}" - rm -rf "${CI_PROJECT_NAME}"
- mv "${IEM_CI_PKGLIBDIR}/${CI_PROJECT_NAME}" . - mv "${IEM_CI_TMPDIR}"/* .
####################################################################### #######################################################################
...@@ -72,10 +73,10 @@ variables: ...@@ -72,10 +73,10 @@ variables:
image: registry.git.iem.at/devtools/docker/debiancross:amd64 image: registry.git.iem.at/devtools/docker/debiancross:amd64
before_script: before_script:
- apt-get update - apt-get update
- rm -rf "${IEM_CI_PKGLIBDIR}" - rm -rf "${IEM_CI_TMPDIR}"
- mkdir -p "${IEM_CI_PKGLIBDIR}" - mkdir -p "${IEM_CI_TMPDIR}"
- if [ -e .git-ci/requirements.apt ]; then apt-get install -y --no-install-recommends equivs; equivs-control "${IEM_CI_PKGLIBDIR}"/builddeps; sed -e "s|^\(Package:\) .*|\1 builddeps-${CI_PROJECT_NAME}|" -e '/^Depends/d' -i "${IEM_CI_PKGLIBDIR}"/builddeps; (echo "Depends:"" puredata-dev, puredata-core,"; cat .git-ci/requirements.apt | sed -e 's|#.*||' -e 's|[[:space:],]*$||' -e '/^$/d' -e 's|$|,|' -e 's|^[[:space:]]*| |') >> "${IEM_CI_PKGLIBDIR}"/builddeps; (cd ${IEM_CI_PKGLIBDIR}/; equivs-build ${TARGETDEBARCH:+-a} ${TARGETDEBARCH} builddeps; find . -name "*.deb" -exec dpkg -i {} + || apt-get -f install -y --no-install-recommends); else apt-get install -y --no-install-recommends build-essential puredata-dev puredata-core; fi - if [ -e .git-ci/requirements.apt ]; then apt-get install -y --no-install-recommends equivs; equivs-control "${IEM_CI_TMPDIR}"/builddeps; sed -e "s|^\(Package:\) .*|\1 builddeps-${CI_PROJECT_NAME}|" -e '/^Depends/d' -i "${IEM_CI_TMPDIR}"/builddeps; (echo "Depends:"" puredata-dev, puredata-core,"; cat .git-ci/requirements.apt | sed -e 's|#.*||' -e 's|[[:space:],]*$||' -e '/^$/d' -e 's|$|,|' -e 's|^[[:space:]]*| |') >> "${IEM_CI_TMPDIR}"/builddeps; (cd ${IEM_CI_TMPDIR}/; equivs-build ${TARGETDEBARCH:+-a} ${TARGETDEBARCH} builddeps; find . -name "*.deb" -exec dpkg -i {} + || apt-get -f install -y --no-install-recommends); else apt-get install -y --no-install-recommends build-essential puredata-dev puredata-core; fi
- rm -rf "${IEM_CI_PKGLIBDIR}" - rm -rf "${IEM_CI_TMPDIR}"
- export PD=/usr/bin/pd - export PD=/usr/bin/pd
.build:linux_i386: &build_linux_i386 .build:linux_i386: &build_linux_i386
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment