diff options
| author | Manuel Schneider | 2013-10-18 11:36:55 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2013-10-18 11:36:55 +0200 |
| commit | 996d84e98b13284b641d3352fbc8549a4391c832 (patch) | |
| tree | aeb2ca88a51c46474f626127e33140f8578e8aa8 | |
| parent | [vmchooser] only use dnbd3 for vms if config says SLX_VM_DNBD3=yes (diff) | |
| download | tm-scripts-996d84e98b13284b641d3352fbc8549a4391c832.tar.gz tm-scripts-996d84e98b13284b641d3352fbc8549a4391c832.tar.xz tm-scripts-996d84e98b13284b641d3352fbc8549a4391c832.zip | |
[beamer] Changed build from prototype to qt binary
| -rw-r--r-- | remote/modules/beamer/beamer.build | 19 | ||||
| -rw-r--r-- | remote/modules/beamer/beamer.conf | 6 | ||||
| -rw-r--r-- | remote/modules/beamer/beamer.conf.debian | 5 | ||||
| -rw-r--r-- | remote/modules/beamer/beamer.conf.opensuse | 6 | ||||
| -rw-r--r-- | remote/modules/beamer/beamer.conf.scientific | 6 | ||||
| -rw-r--r-- | remote/modules/beamer/beamer.conf.ubuntu | 5 |
6 files changed, 21 insertions, 26 deletions
diff --git a/remote/modules/beamer/beamer.build b/remote/modules/beamer/beamer.build index bd189b66..49fcfe1d 100644 --- a/remote/modules/beamer/beamer.build +++ b/remote/modules/beamer/beamer.build @@ -1,17 +1,18 @@ +#!/bin/bash + fetch_source() { - : + git clone "${REQUIRED_GIT}" src } build() { - COPYLIST="list_dpkg_output" - [ -e "$COPYLIST" ] && rm "$COPYLIST" - - list_packet_files >> "$COPYLIST" - tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}" + local SRCDIR="${MODULE_DIR}/src/" - return 0 + mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin" + cd "${MODULE_BUILD_DIR}/opt/openslx/bin" || perror "Could not cd!" + pinfo "Running qmake" + qmake-qt4 "$SRCDIR/src/beamergui.pro" -r -spec linux-g++ || perror "'qmake' failed." + pinfo "Running make" + make || perror "'make' failed." } - post_copy() { - : } diff --git a/remote/modules/beamer/beamer.conf b/remote/modules/beamer/beamer.conf index 16f54fcf..4d497389 100644 --- a/remote/modules/beamer/beamer.conf +++ b/remote/modules/beamer/beamer.conf @@ -1,3 +1,7 @@ +REQUIRED_GIT="git://git.openslx.org/openslx-ng/beamergui.git" REQUIRED_BINARIES=" - zenity + beamergui " +REQUIRED_SYSTEM_FILES=" +" + diff --git a/remote/modules/beamer/beamer.conf.debian b/remote/modules/beamer/beamer.conf.debian index 459dd079..525245fb 100644 --- a/remote/modules/beamer/beamer.conf.debian +++ b/remote/modules/beamer/beamer.conf.debian @@ -1,6 +1,7 @@ REQUIRED_INSTALLED_PACKAGES=" - zenity +libqt4-dev +libxrandr-dev " REQUIRED_CONTENT_PACKAGES=" - zenity +libxrandr2 " diff --git a/remote/modules/beamer/beamer.conf.opensuse b/remote/modules/beamer/beamer.conf.opensuse deleted file mode 100644 index 459dd079..00000000 --- a/remote/modules/beamer/beamer.conf.opensuse +++ /dev/null @@ -1,6 +0,0 @@ -REQUIRED_INSTALLED_PACKAGES=" - zenity -" -REQUIRED_CONTENT_PACKAGES=" - zenity -" diff --git a/remote/modules/beamer/beamer.conf.scientific b/remote/modules/beamer/beamer.conf.scientific deleted file mode 100644 index 459dd079..00000000 --- a/remote/modules/beamer/beamer.conf.scientific +++ /dev/null @@ -1,6 +0,0 @@ -REQUIRED_INSTALLED_PACKAGES=" - zenity -" -REQUIRED_CONTENT_PACKAGES=" - zenity -" diff --git a/remote/modules/beamer/beamer.conf.ubuntu b/remote/modules/beamer/beamer.conf.ubuntu index 459dd079..525245fb 100644 --- a/remote/modules/beamer/beamer.conf.ubuntu +++ b/remote/modules/beamer/beamer.conf.ubuntu @@ -1,6 +1,7 @@ REQUIRED_INSTALLED_PACKAGES=" - zenity +libqt4-dev +libxrandr-dev " REQUIRED_CONTENT_PACKAGES=" - zenity +libxrandr2 " |