X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=build-pspp;h=83f5d1aa71f2af6e54e8ceef37add31efd1578a8;hb=7036cc841d028475016f848ef49a2e7d7fc04edb;hp=62e8a75030545f7c348c0a528c167fc10d808392;hpb=4138eb6b6199bcb31345250dd0292f8559f14558;p=pspp

diff --git a/build-pspp b/build-pspp
index 62e8a75030..83f5d1aa71 100755
--- a/build-pspp
+++ b/build-pspp
@@ -284,10 +284,10 @@ if len(args) == 2:
     run("cd %s && ./configure --prefix=''" % ssw_dir)
 
     start_step("Build spread-sheet-widget")
-    run("cd %s && make -j10" % ssw_dir)
+    run("cd %s && make -j$(nproc)" % ssw_dir)
 
     start_step("Install spread-sheet-widget")
-    run("cd %s && make -j10 install DESTDIR=$PWD/inst" % ssw_dir)
+    run("cd %s && make -j$(nproc) install DESTDIR=$PWD/inst" % ssw_dir)
 
     start_step("Fetch branch from Git")
     set_var("git_repo", repo)
@@ -410,7 +410,7 @@ Changes from %(repo_version)s to %(version)s:
 
     # Bootstrap.
     start_step("Bootstrap (make -f Smake)")
-    run("cd pspp && make -f Smake -j10", "bootstrap")
+    run("cd pspp && make -f Smake -j$(nproc)", "bootstrap")
 
     # Configure.
     start_step("Configure source")
@@ -422,7 +422,7 @@ Changes from %(repo_version)s to %(version)s:
 
     # Distribute.
     start_step("Make source tarball")
-    run("cd pspp/_build && make dist", "dist")
+    run("cd pspp/_build && make -j$(nproc) dist", "dist")
     tarname = "pspp-%s.tar.gz" % version
     tarball = save_result("source distribution", "pspp/_build/%s" % tarname, 1)
 
@@ -432,11 +432,15 @@ Changes from %(repo_version)s to %(version)s:
         potfile = "pspp/po/pspp.pot"
     save_result("translation templates", potfile)
 
+    # Build examples for user manual.
+    start_step("Build examples for user manual")
+    run("cd pspp/_build && make -j$(nproc) figure-spvs figure-txts figure-texis figure-htmls")
+
     # Build user manual
     start_step("Build user manual")
     run("cd pspp && "
         "GENDOCS_TEMPLATE_DIR=%s %s/gendocs.sh -s doc/pspp.texi -I doc "
-        "-o %s/user-manual --email bug-gnu-pspp@gnu.org "
+        "-I _build/doc -o %s/user-manual --email bug-gnu-pspp@gnu.org "
         "pspp \"GNU PSPP User Manual\"" % (topdir, topdir, resultsdir),
         "user-manual")
     saved_result("User Manual", "user-manual")
@@ -499,20 +503,21 @@ if build_binary:
         fail()
 
     start_step("Build")
-    run("cd %s/%s/_build && make -j10" % (builddir, tarball_dir), "build")
-    run("cd %s/%s/_build/perl-module && perl Makefile.PL && make -j10"
+    run("cd %s/%s/_build && make -j$(nproc)" % (builddir, tarball_dir), "build")
+    run("cd %s/%s/_build/perl-module && perl Makefile.PL && make -j$(nproc)"
         % (builddir, tarball_dir), "build Perl module")
 
     start_step("Install")
-    run("cd %s/%s/_build && make install DESTDIR=$PWD/pspp-%s"
+    run("cd %s/%s/_build && make -j$(nproc) install DESTDIR=$PWD/pspp-%s"
         % (builddir, tarball_dir, binary_version), "install")
-    run("cd ../source/%s && make -j10 install DESTDIR=%s/%s/_build/pspp-%s"
+    run("cd ../source/%s && make -j$(nproc) install DESTDIR=%s/%s/_build/pspp-%s"
         % (ssw_dir, builddir, tarball_dir, binary_version))
     run("cd %s/%s/_build/perl-module && "
-        "make install DESTDIR=%s/%s/_build/pspp-%s"
+        "make -j$(nproc)  install DESTDIR=%s/%s/_build/pspp-%s"
         % (builddir, tarball_dir, builddir, tarball_dir, binary_version),
         "install Perl module")
-    run("cd %s/%s/_build/perl-module && make install DESTDIR=$PWD/inst"
+    run("cd %s/%s/_build/perl-module && "
+        "make -j$(nproc) install DESTDIR=$PWD/inst"
         % (builddir, tarball_dir))
 
     start_step("Make binary distribution")
@@ -522,8 +527,8 @@ if build_binary:
                 % (builddir, tarball_dir, binary_version), 1)
 
     start_step("Check")
-    ok = try_run("cd %s/%s/_build && make check" % (builddir, tarball_dir),
-                 "check")
+    ok = try_run("cd %s/%s/_build && make check TESTSUITEFLAGS=-j$(nproc)"
+                 % (builddir, tarball_dir), "check")
     for basename in ("tests/testsuite.log", "tests/testsuite.dir"):
         save_result_if_exists("test logs", "%s/%s/_build/%s"
                               % (builddir, tarball_dir, basename))
@@ -531,9 +536,9 @@ if build_binary:
         fail()
 
     start_step("Uninstall")
-    run("cd ../source/%s && make -j10 uninstall DESTDIR=%s/%s/_build/pspp-%s"
+    run("cd ../source/%s && make -j$(nproc) uninstall DESTDIR=%s/%s/_build/pspp-%s"
         % (ssw_dir, builddir, tarball_dir, binary_version))
-    run("cd %s/%s/_build && make uninstall DESTDIR=$PWD/pspp-%s"
+    run("cd %s/%s/_build && make -j$(nproc) uninstall DESTDIR=$PWD/pspp-%s"
         % (builddir, tarball_dir, binary_version), "uninstall")
 
     start_step("Check uninstall")
@@ -542,7 +547,7 @@ if build_binary:
         % (builddir, tarball_dir,
            builddir, tarball_dir, binary_version), "uninstall Perl module")
     run("cd %s/%s/_build && "
-        "make distuninstallcheck distuninstallcheck_dir=$PWD/pspp-%s"
+        "make -j$(nproc) distuninstallcheck distuninstallcheck_dir=$PWD/pspp-%s"
         % (builddir, tarball_dir, binary_version),
         "distuninstallcheck")