Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge devel to master #49

Merged
merged 22 commits into from
Jun 19, 2015
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2ce1565
Checks for existence of /opt, and creates it if it doesn't exist.
scarygliders Mar 26, 2014
9df03cc
Removed a ")" which was added by accident.
scarygliders Mar 26, 2014
a9e99da
Why do I always forget these "fi" statements? (╯°□°)╯︵ ┻━┻
scarygliders Mar 26, 2014
a49a662
Download compile and install libjpeg-turbo if branch v0.8 chosen and …
scarygliders Mar 27, 2014
02836d4
Further work to improve libturbo-jpeg handling...
scarygliders Mar 28, 2014
b93e240
Changed some small-case variable names to upper-case.
scarygliders Apr 1, 2014
b47b81f
Added installation of the lsb_release package if not installed,
scarygliders Jun 10, 2014
7965763
Added dh-make to list of packages required.
scarygliders Jun 16, 2014
834ff45
Added gettext to package requirements.
scarygliders Jun 17, 2014
fb32a8d
Removed the --yes switch to the dh_make command to make it backwards-…
scarygliders Jun 17, 2014
1b425f0
Added xfce4-session to xfce4 required packages.
scarygliders Jun 17, 2014
8c2a0b0
Fixed incorrect lsb-release package name.
scarygliders Jun 19, 2014
5518770
Added a patch to buildx.sh if we're building v0.7 as the Mesa file do…
scarygliders Jun 19, 2014
88fb789
Added missing echo to interactive xrdp compile to match the non-inter…
scarygliders Jul 29, 2014
cbb4b3c
Compilation now takes place in a target which is inside the xrdp source,
scarygliders Aug 19, 2014
6c9a6bc
Added --no-check-certificate option to wget command in calculate_vers…
scarygliders Sep 27, 2014
abf76e2
Change option --enable-nopam -> --disable-pam
metalefty Oct 28, 2014
bab6e81
Merge pull request #43 from metalefty/devel
scarygliders Oct 28, 2014
b77ce70
Reverted to original behaviour of compiling X11rdp in /opt,
scarygliders Nov 22, 2014
88038d4
Merge branch 'devel' of github.com:scarygliders/X11RDP-o-Matic into d…
scarygliders Nov 22, 2014
ad1f96f
Added "libtool-bin" to list of Required Packages (needed on recent Ub…
davidedg Mar 31, 2015
f12fe4f
Merge pull request #47 from davidedg/devel
scarygliders Jun 19, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Checks for existence of /opt, and creates it if it doesn't exist.
Added "--withturbojpeg" switch.
Added "--withpulse" switch.
Changed the "--withsound" switch to "--withsimplesound", to avoid potential confusion.
Added further explanations for the jpeg and turbojpeg modules/libraries.
Ensures relevant -dev libraries are installed for the various switches.
Tidied up some indenting in the switch-parser and removed some redundant commenting.
  • Loading branch information
scarygliders committed Mar 26, 2014
commit 2ce1565e9c661743c3a851d082e3cdec8ad43ba5
59 changes: 42 additions & 17 deletions X11rdp-o-matic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# Automatic Xrdp/X11rdp Compiler/Installer
# a.k.a. ScaryGliders X11rdp-O-Matic
#
# Version 3.10
# Version 3.11
#
# Version release date : 20140319
# Version release date : 20140326
########################(yyyyMMDD)
#
# Will run on Debian-based systems only at the moment. RPM based distros perhaps some time in the future...
Expand Down Expand Up @@ -65,8 +65,12 @@ OPTIONS
--cleanup : remove X11rdp / xrdp source code after installation. (Default is to keep it).
--noinstall : do not install anything, just build the packages
--nox11rdp : only build xrdp, do not build the x11rdp backend
--withjpeg : include jpeg module
--withsound : include building of the simple pulseaudio interface
--withjpeg : build jpeg module
(uses Independent JPEG Group's JPEG runtime library)
--withturbojpeg : build turbo jpeg module
(As used by TigerVNC and other users of the past TurboJPEG library)
--withsimplesound : build the simple pulseaudio interface
--withpulse : build code to load pulse audio modules
--withdebug : build with debug enabled
--withneutrino : build the neutrinordp module
--withkerberos : build support for kerberos
Expand Down Expand Up @@ -173,33 +177,41 @@ case "$1" in
shift
;;
--nocpuoptimize)
PARALLELMAKE=0 # Don't utilize additional CPU cores for compilation.
echo "Will not utilize additional CPU's for compilation..."
echo $LINE
PARALLELMAKE=0
echo "Will not utilize additional CPU's for compilation..."
echo $LINE
;;
--cleanup)
CLEANUP=1 # Remove the xrdp and x11rdp sources from the working directory after compilation/installation
echo "Will remove the xrdp and x11rdp sources in the working directory after compilation/installation..."
echo $LINE
CLEANUP=1
echo "Will remove the xrdp and x11rdp sources in the working directory after compilation/installation..."
echo $LINE
;;
--noinstall)
INSTFLAG=0 # do not install anything, just build the packages
echo "Will not install anything on the system but will build the packages"
echo $LINE
INSTFLAG=0
echo "Will not install anything on the system but will build the packages"
echo $LINE
;;
--nox11rdp)
X11RDP=0 # do not build and package x11rdp
echo "Will not build and package x11rdp"
echo $LINE
X11RDP=0
echo "Will not build and package x11rdp"
echo $LINE
;;
--withjpeg)
CONFIGUREFLAGS=$CONFIGUREFLAGS" --enable-jpeg"
RequiredPackages=("${RequiredPackages[@]}" "libjpeg-dev")
;;
--withsound)
--withturbojpeg)
CONFIGUREFLAGS=$CONFIGUREFLAGS" --enable-tjpeg"
RequiredPackages=("${RequiredPackages[@]}" "libturbojpeg1 libturbojpeg1-dev")
;;
--withsimplesound)
CONFIGUREFLAGS=$CONFIGUREFLAGS" --enable-simplesound"
RequiredPackages=("${RequiredPackages[@]}" "libpulse-dev")
;;
--withpulse)
CONFIGUREFLAGS=$CONFIGUREFLAGS" --enable-loadpulsemodules")
RequiredPackages=("${RequiredPackages[@]}" "libpulse-dev")
;;
--withdebug)
CONFIGUREFLAGS=$CONFIGUREFLAGS" --enable-xrdpdebug"
;;
Expand All @@ -208,6 +220,7 @@ case "$1" in
;;
--withkerberos)
CONFIGUREFLAGS=$CONFIGUREFLAGS" --enable-kerberos"
RequiredPackages=("${RequiredPackages[@]}" "libpam0g-dev")
;;
--withxrdpvr)
CONFIGUREFLAGS=$CONFIGUREFLAGS" --enable-xrdpvr"
Expand Down Expand Up @@ -721,6 +734,15 @@ remove_currently_installed_X11rdp()
fi
}

check_for_opt_directory()
{
if [[ ! -e /opt ]]
then
echo "Did not find a /opt directory... creating it."
echo $LINE
mkdir /opt
}

cleanup()
{
rm -rf $WORKINGDIR/xrdp
Expand All @@ -730,6 +752,9 @@ cleanup()
# Main stuff starts here #
##########################

# Check for existence of a /opt directory, and create it if it doesn't exist.
check_for_opt_directory

# Figure out what version number to use for the debian packages
calculate_version_num

Expand Down