[Libreoffice-commits] online.git: loolwsd/configure.ac loolwsd/.gitignore loolwsd/loolwsd-systemplate-setup loolwsd/loolwsd-systemplate-setup.in loolwsd/README

[Henry Castro]

 loolwsd/.gitignore                   |    1 
 loolwsd/README                       |    1 
 loolwsd/configure.ac                 |    1 
 loolwsd/loolwsd-systemplate-setup    |  123 +++++++++++++++++++++++
 loolwsd/loolwsd-systemplate-setup.in |  186 -----------------------------------
 5 files changed, 123 insertions(+), 189 deletions(-)

New commits:
commit 32745e181b4aa904a65984e1506f65e20df70b65
Author: Henry Castro <hcastro at collabora.com>
Date:   Tue Jan 5 11:33:00 2016 -0400

    loolwsd: remove g++ from loolwsd-sytemplate-setup

diff --git a/loolwsd/.gitignore b/loolwsd/.gitignore
index 2da8030..a50e3e6 100644
--- a/loolwsd/.gitignore
+++ b/loolwsd/.gitignore
@@ -22,7 +22,6 @@
 /test-driver
 /jails
 /loolwsd.spec
-/loolwsd-systemplate-setup
 
 *.o
 *.exe
diff --git a/loolwsd/README b/loolwsd/README
index 4586db0..39550cc 100644
--- a/loolwsd/README
+++ b/loolwsd/README
@@ -71,7 +71,6 @@ Now you need to set up a minimal chroot system, and directory for the jails:
     ROOTFORJAILS=`pwd`/jails       # or tweak for your system
 
     rm -Rf ${SYSTEMPLATE} # clean
-    chmod +x loolwsd-systemplate-setup
     ./loolwsd-systemplate-setup ${SYSTEMPLATE} ${MASTER}/instdir # build template
     mkdir -p ${ROOTFORJAILS} # create location for transient jails.
 
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index c60d958..ed31af7 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -151,7 +151,6 @@ AC_DEFINE_UNQUOTED([LOOLWSD_CACHEDIR],["$LOOLWSD_CACHEDIR"],[Cache folder])
 AC_SUBST(LOOLWSD_CACHEDIR)
 
 AC_CONFIG_FILES([Makefile
-                 loolwsd-systemplate-setup
                  test/Makefile
                  loolwsd.spec])
 AC_OUTPUT
diff --git a/loolwsd/loolwsd-systemplate-setup.in b/loolwsd/loolwsd-systemplate-setup
similarity index 76%
rename from loolwsd/loolwsd-systemplate-setup.in
rename to loolwsd/loolwsd-systemplate-setup
index 6eef947..51dbc36 100755
--- a/loolwsd/loolwsd-systemplate-setup.in
+++ b/loolwsd/loolwsd-systemplate-setup
@@ -105,66 +105,6 @@ cpio -p -d -L $CHROOT
 
 mkdir -p $CHROOT/tmp
 mkdir -p $CHROOT/usr/bin/
-dummy=$CHROOT/usr/bin/dummy
-
-# checking for library containing Poco::Application
-cat <<_ACEOF >$dummy.cpp
-#include <iostream>
-#include <Poco/Util/Application.h>
-
-using Poco::Util::Application;
-
-int main ()
-{
-  std::cout << "Poco functionality OK!" << std::endl;
-  return Application::EXIT_OK;
-}
-_ACEOF
-
-gcc_compile='g++ -o $dummy.o -c $dummy.cpp'
-(eval "$gcc_compile") 2>$dummy.err
-
-if ! test $? = 0; then
-  cat $dummy.err;
-  exit 1;
-fi
-
-gcc_link='g++ -o $dummy @LIBS@ $dummy.o'
-(eval "$gcc_link") 2>$dummy.err
-
-if ! test $? = 0; then
-  cat $dummy.err;
-  exit 1;
-fi
-
-lib_poco=$( echo "$dummy" |
-  while read file; do
-    ldd $file 2>/dev/null
-  done |
-  grep -v dynamic | cut -d " " -f 3 | grep -E '^(/lib|/usr)')
-
-for lib in $lib_poco
-do
-  cp --parent -n $lib $CHROOT
-
-  libs=$( echo $lib |
-  while read file; do
-    ldd $file 2>/dev/null
-  done |
-  grep -v dynamic | cut -d " " -f 3 | grep -E '^(/lib|/usr)')
-
-  for sofile in $libs
-  do
-    cp --parent -n $sofile $CHROOT
-  done
-done
-
-loaders="$(find /lib/ld-* -type l) $(find /lib32/ld-* -type l) $(find /lib64/ld-* -type l)"
-
-for loader in $loaders
-do
-  cp --parent -n $loader $CHROOT
-done
 
 # /usr/share/fonts needs to be taken care of separately because the
 # directory time stamps must be preserved are for fontconfig to trust
@@ -181,6 +121,3 @@ if [ `uname -s` = Linux ]; then
 	cp -r -p /usr/share/ghostscript/fonts usr/share/ghostscript
     fi
 fi
-
-echo "testing if Poco libraries were installed properly"
-sudo chroot $CHROOT /usr/bin/dummy