#114 deprecate install-site and friends, the install(sitehtml) is run when -DZZIP_HTM...

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 9271dd93c33be465b419c94a972abb49c64f1dc2..a60cf86c9d279b8322b810d2ccf30cb005354325 100644 (file)
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -98,6 +98,31 @@ add_custom_command(OUTPUT zzip.pdf
 add_custom_target(pdf DEPENDS zzip.pdf)
 endif()
 
+string(REPLACE ";" " " all_bins_FILES "${bins_FILES}")
+string(REPLACE ";" " " all_SDLs_FILES "${SDLs_FILES}")
+add_custom_command(OUTPUT htmlsite.tar
+    COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/site.html"
+    COMMAND ${BASH} -c "mkdir -vp site  >&2 || ls -ld site >&2"
+    COMMAND ${BASH} -c "cd ${outdir} && cp zziplib.html zzipmmapped.html zzipfseeko.html site/"
+    COMMAND ${BASH} -c "cd ${srcdir} && cp README.* COPYING.* ${outdir}/site/"
+    COMMAND ${BASH} -c "cd ${topdir} && cp ChangeLog          ${outdir}/site/"
+    COMMAND ${BASH} -c "cd ${topdir} && cp ${all_bins_FILES}  ${outdir}/site/"
+    COMMAND ${BASH} -c "cd ${topdir} && cp ${all_SDLs_FILES}  ${outdir}/site/"
+    COMMAND ${BASH} -c "cd site && cp ${outdir}/*.html ."
+    COMMAND ${BASH} -c "cd site && ln -s zzip-index.html index.html"
+    COMMAND ${BASH} -c "tar cf htmlsite.tar site/*.*"
+    COMMAND ${BASH} -c "ls -l `pwd`/htmlsite.tar || true"
+    #  DEPENDS site.html zziplib.html zzipmmapped.html zzipfseeko.html
+    DEPENDS    site.html zziplib.xml  zzipmmapped.xml  zzipfseeko.xml
+    VERBATIM)
+if(ZZIP_HTMLSITE)
+add_custom_target(htmlsite ALL DEPENDS htmlsite.tar COMMAND ${BASH} -c "ls -l htmlsite.tar")
+else()
+add_custom_target(htmlsite DEPENDS htmlsite.tar COMMAND ${BASH} -c "ls -l htmlsite.tar")
+endif()
+
+####
+
 set(docinfo --package=zziplib --version=${PROJECT_VERSION})
 file(GLOB zzip_sources "${topdir}/zzip/*.c")
 add_custom_command(OUTPUT zziplib.xml
@@ -159,8 +184,6 @@ endif()
 
 # install ########################################################
 
-string(REPLACE ";" " " all_bins_FILES "${bins_FILES}")
-string(REPLACE ";" " " all_SDLs_FILES "${SDLs_FILES}")
 add_custom_target(install-site
    COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/site.html"
    COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir}  >&2 || ls -ld $DESTDIR${docdir} >&2"
@@ -171,19 +194,31 @@ add_custom_target(install-site
    COMMAND ${BASH} -c "cd ${topdir} && cp ${all_SDLs_FILES}  $DESTDIR${docdir}/"
    COMMAND ${BASH} -c "cd $DESTDIR${docdir} && cp ${outdir}/*.html ."
    COMMAND ${BASH} -c "cd $DESTDIR${docdir} && ln -s zzip-index.html index.html"
+   COMMAND ${BASH} -c "echo running install-site is deprecated - just enable cmake -DZZIP_HTMLSITE=ON >&2"
    DEPENDS site.html zziplib.html zzipmmapped.html zzipfseeko.html
    VERBATIM)
 add_custom_target(install-htmpages
    COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir}  >&2 || ls -ld $DESTDIR${docdir} >&2"
    COMMAND ${BASH} -c "cp -r ${outdir}/html $DESTDIR${docdir}/"
    COMMAND ${BASH} -c "cd $DESTDIR${docdir} && mv html man"
+   COMMAND ${BASH} -c "echo running install-htmpages is deprecated - just enable cmake -DZZIP_HTMPAGES=ON >&2"
    DEPENDS htmpages.tar
    VERBATIM)
 add_custom_target(install-manpages
    COMMAND ${BASH} -c "mkdir -vp $DESTDIR${mandir}  >&2 || ls -ld $DESTDIR${mandir} >&2"
    COMMAND ${BASH} -c "cp -r ${outdir}/man3 $DESTDIR${mandir}/"
+   COMMAND ${BASH} -c "echo running install-manpages is deprecated - just enable cmake -DZZIP_MANPAGES=ON >&2"
    DEPENDS manpages.tar
    VERBATIM)
+add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
+add_custom_target(install-mans DEPENDS install-manpages)
+add_custom_target(install-man DEPENDS install-manpages)
+add_custom_target(install-htm DEPENDS install-htmpages)
+
+if(ZZIP_HTMLSITE)
+   install(CODE "message(STATUS \"Installing: html site to ${docdir}/man\")")
+   install(DIRECTORY ${outdir}/site/ DESTINATION ${docdir} MESSAGE_NEVER)
+endif()
 if(ZZIP_HTMPAGES)
    install(CODE "message(STATUS \"Installing: html pages to ${docdir}/man\")")
    install(DIRECTORY ${outdir}/html/ DESTINATION ${docdir}/man MESSAGE_NEVER)
@@ -192,10 +227,6 @@ if(ZZIP_MANPAGES)
    install(CODE "message(STATUS \"Installing: man3 pages to ${mandir}/man3\")")
    install(DIRECTORY ${outdir}/man3/ DESTINATION ${mandir}/man3 MESSAGE_NEVER)
 endif()
-add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
-add_custom_target(install-mans DEPENDS install-manpages)
-add_custom_target(install-man DEPENDS install-manpages)
-add_custom_target(install-htm DEPENDS install-htmpages)
 
 # messages #######################################################
 

diff --git a/testbuilds.py b/testbuilds.py
index 9938288fc83d78418fe148b7471ad28b8e0adfa7..dea2d9406259fcbe1170c3076a16ed5246584f53 100755 (executable)
--- a/testbuilds.py
+++ b/testbuilds.py
@@ -1140,6 +1140,45 @@ class ZZiplibBuildTest(unittest.TestCase):
         cmd = "docker rmi {images}:{testname}"
         sx____(cmd.format(**locals()))
         self.rm_testdir()
+    def test_440_opensuse15_cm_htmpages_dockerfile(self):
+        if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
+        self.rm_old()
+        self.rm_testdir()
+        testname=self.testname()
+        testdir = self.testdir()
+        dockerfile="testbuilds/opensuse15-cm-htmpages.dockerfile"
+        addhosts = self.local_addhosts(dockerfile)
+        savename = docname(dockerfile)
+        saveto = SAVETO
+        images = IMAGES
+        build = "build --build-arg=no_check=true --build-arg=no_parallel=true" + self.nocache()
+        cmd = "docker {build} . -f {dockerfile} {addhosts} --tag {images}:{testname}"
+        sh____(cmd.format(**locals()))
+        cmd = "docker rm --force {testname}"
+        sx____(cmd.format(**locals()))
+        cmd = "docker run -d --name {testname} {images}:{testname} sleep 60"
+        sh____(cmd.format(**locals()))
+        #:# container = self.ip_container(testname)
+        cmd = "docker exec {testname} ls -l /usr/local/bin"
+        sh____(cmd.format(**locals()))
+        cmd = "docker exec {testname} find /usr/local/include -type f"
+        sh____(cmd.format(**locals()))
+        cmd = "docker exec {testname} bash -c 'ls -l /usr/local/lib64/libzz*'"
+        sh____(cmd.format(**locals()))
+        #
+        ## cmd = "docker exec {testname} bash -c 'test -d /usr/local/include/SDL_rwops_zzip'"
+        ## sh____(cmd.format(**locals()))
+        #
+        if not KEEP:
+            cmd = "docker rm --force {testname}"
+            sx____(cmd.format(**locals()))
+        cmd = "docker rmi {saveto}/{savename}:latest"
+        sx____(cmd.format(**locals()))
+        cmd = "docker tag {images}:{testname} {saveto}/{savename}:latest"
+        sh____(cmd.format(**locals()))
+        cmd = "docker rmi {images}:{testname}"
+        sx____(cmd.format(**locals()))
+        self.rm_testdir()
     def test_441_opensuse15_cm_htmpages_dockerfile(self):
         if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
         self.rm_old()

diff --git a/testbuilds/opensuse15-cm-htmpages.dockerfile b/testbuilds/opensuse15-cm-htmpages.dockerfile
index 64978d3224e408995602cac7f35867c842719677..4f56b92d0496f2124876bc244547f8327090accd 100644 (file)
--- a/testbuilds/opensuse15-cm-htmpages.dockerfile
+++ b/testbuilds/opensuse15-cm-htmpages.dockerfile
@@ -1,6 +1,7 @@
 FROM opensuse/leap:15.2
 ARG no_check=false
 ARG no_install=false
+ARG no_parallel=false
 
 RUN zypper mr --no-gpgcheck repo-oss repo-update
 RUN zypper refresh repo-oss
@@ -19,6 +20,7 @@ COPY zzip src/zzip
 RUN mkdir src/build
 # RUN cd src/build && cmake .. -DZZIPSDL=OFF -DZZIPDOCS=ON -DZZIP_HTMLSITE=ON -DZZIP_HTMPAGES=ON -DZZIPTEST=OFF
 RUN cd src/build && cmake .. -DZZIPSDL=OFF -DZZIPDOCS=ON -DZZIP_HTMLSITE=ON -DZZIP_HTMPAGES=ON -DZZIP_TESTCVE=OFF
-RUN cd src/build && make -j8 -w all VERBOSE=ON
+RUN if $no_parallel; then cd src/build && make all VERBOSE=ON; else \
+                  cd src/build && make -j8 -w all VERBOSE=ON; fi
 RUN $no_check || (cd src/build && make check)
 RUN $no_install || (cd src/build && make install)