diff options
| author | root | 2016-05-25 10:35:26 +0200 |
|---|---|---|
| committer | root | 2016-05-25 10:35:26 +0200 |
| commit | 111adbfe6603cf7122b57d092abe9553e2815913 (patch) | |
| tree | decdd0e7b241ce0f37033a468f5e54a649f5f7da /remote/modules/pvs2/module.build | |
| parent | [rfs-stage32] Use proper variable in conf (diff) | |
| parent | [pvs-fr] Konfig -114 (diff) | |
| download | tm-scripts-111adbfe6603cf7122b57d092abe9553e2815913.tar.gz tm-scripts-111adbfe6603cf7122b57d092abe9553e2815913.tar.xz tm-scripts-111adbfe6603cf7122b57d092abe9553e2815913.zip | |
Merge branch 'master' of git://git.openslx.org/openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/pvs2/module.build')
| -rw-r--r-- | remote/modules/pvs2/module.build | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/remote/modules/pvs2/module.build b/remote/modules/pvs2/module.build index 8277aa1c..70b88350 100644 --- a/remote/modules/pvs2/module.build +++ b/remote/modules/pvs2/module.build @@ -5,25 +5,33 @@ fetch_source() { } build() { - local SRCDIR="${MODULE_DIR}/src/" - local BUILDDIR="$SRCDIR/build/" - local DESTDIR="$MODULE_BUILD_DIR/opt/openslx/bin" + local BUILDDIR="${SRCDIR}/build/" + local DESTDIR="${MODULE_BUILD_DIR}/opt/openslx/bin" # first activate qt 4 activate_qt 4 - mkdir -p "$DESTDIR" || perror "Could not mkdir $DESTDIR!" - mkdir -p "$BUILDDIR" || perror "Could not mkdir $BUILDDIR!" - cd "$BUILDDIR" || perror "Could not cd to $BUILDDIR!" + mkdir -p "${DESTDIR}" || perror "Could not mkdir ${DESTDIR}!" + mkdir -p "${BUILDDIR}" || perror "Could not mkdir ${BUILDDIR}!" + cd "${BUILDDIR}" || perror "Could not cd to ${BUILDDIR}!" pinfo "Running cmake" cmake .. || perror "'cmake ..' failed." pinfo "Running make" make || perror "'make' failed." - mv pvsmgr pvsclient $DESTDIR + mv pvsmgr pvsclient "${DESTDIR}" cd - > /dev/null + # copy external scripts under 'sample_configuration' + mkdir -p "${MODULE_BUILD_DIR}/opt/openslx/pvs2/" + if [ -d "${SRCDIR}/sample_configuration" ]; then + cp ${SRCDIR}/sample_configuration/*.sh "${MODULE_BUILD_DIR}/opt/openslx/pvs2/" \ + || perror "Could not copy external scripts to '${MODULE_BUILD_DIR}/opt/openslx/pvs2/'!" + chmod +x ${MODULE_BUILD_DIR}/opt/openslx/pvs2/*.sh \ + || perror "Could not set executable bit for external scripts." + fi + # needed for copying REQUIRED_CONTENT_PACKAGES to build/ COPYLIST="list_dpkg_output" [ -e "$COPYLIST" ] && rm "$COPYLIST" |