SQUASHED

component/onlyoffice-core/buildout.cfg

@@ -34,31 +34,18 @@ pre-configure =
   sed 's@qmake -r@qmake -r -spec ${qt5-qmake:location}/qtbase/mkspecs/linux-g++ "QMAKE_CXXFLAGS += -std=c++11 -I${curl:location}/include -I${libxml2:location}/include -I${zlib:location}/include" "QMAKE_LFLAGS += -L${curl:location}/lib -Wl,-rpath=${curl:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib"@g' -i Makefile
   ( cd Common/3dParty && ./make.sh )
 configure-command = true
-make-targets =
-  lib bin
-#make-options = -j1
+make-targets = lib bin
 environment =
   PATH=${gcc:location}/bin:${binutils:location}/bin:${p7zip:location}/bin:${qt5-qmake:location}/qtbase/bin:%(PATH)s
   CPPFLAGS="-I${qt5-qmake:location}/qtbase/include -I${curl:location}/include -I${libxml2:location}/include -I${zlib:location}/include"
   LD_LIBRARY_PATH=${gcc:location}/lib64:${gcc:location}/lib:${binutils:location}/lib:${qt5-qmake:location}/qtbase/lib:${curl:location}/lib:${libxml2:location}/lib:${zlib:location}/lib
   LDFLAGS="-Wl,-rpath=${gcc:location}/lib64 -Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${curl:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${zlib:location}/lib"
 post-install =
-  mv -t ${:location} *
+  mkdir -p ${:location}/bin ${:location}/lib
+  mv -t ${:location}/lib build/lib/*/*
+  mv build/bin/AllFontsGen/* ${:location}/bin/AllFontsGen
+  mv -t ${:location}/bin build/bin/*/*
 
-
-#[onlyoffice-fileconverter]
-#recipe = slapos.recipe.build
-#url = https://lab.nexedi.com/bk/DocumentServer/raw/073f135e2373e82277e71b3201bb9302da147be0/ServerComponents/Bin/x2t
-#md5sum = d91b489ef1e2836e89893abf158dd91d
-## script to install.
-#script =
-#  location = %(location)r
-#  self.failIfPathExists(location)
-#  import sys
-#  url = self.options['url']
-#  md5sum = self.options['md5sum']
-#  binary = self.download(url, md5sum)
-#  os.mkdir(location)
-#  x2t = os.path.join(location, "x2t")
-#  shutil.move(binary, x2t)
-#  os.chmod(x2t, 0755)
+# XXX how to use x2t binary :
+#     export LD_LIBRARY_PATH=${onlyoffice-core:location}/lib:${icu4c-55.1:location}/lib
+#     exec ${onlyoffice-core:location}/bin/x2t "$@"