X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=build-pspp;h=4ed0a4909bbe143e023ba91d5e9e3fe025515098;hb=b16e955a5e4c6b7a8b73765100b03d52adabf1ea;hp=2fff2c853ec2cb693b7fb53c93e1edc5df056a83;hpb=9869b64641f5197bd495a5e62cdbb3f985adbeee;p=pspp

diff --git a/build-pspp b/build-pspp
index 2fff2c853e..4ed0a4909b 100755
--- a/build-pspp
+++ b/build-pspp
@@ -15,10 +15,13 @@ my $build_binary = 1;
 my $batch = 0;
 my $builddir;
 my $build_number;
+my $builder = `hostname`;
+chomp $builder;
 GetOptions ("h|help" => \$help,
 	    "binary!" => \$build_binary,
 	    "batch!" => \$batch,
 	    "o|output=s" => \$builddir,
+	    "builder=s" => \$builder,
 	    "build-number=i" => \$build_number);
 
 usage () if $help;
@@ -61,11 +64,11 @@ VARS->autoflush (1);
 our $logfile = "$resultsdir/LOG";
 open (LOG, '>', $logfile) or die "creating $logfile failed: $!\n";
 
-my $build_host = `hostname`;
-chomp $build_host;
-set_var ("build_host", $build_host);
+set_var ("builder", $builder);
 set_var ("build_number", $build_number);
 
+our $GIT = "git --git-dir=$topdir/.git";
+
 sub start_step {
     my ($msg) = @_;
     print LOG "\n$msg\n";
@@ -122,11 +125,24 @@ sub ref_to_commit {
     return $commit;
 }
 
-my $GIT = "git --git-dir=$topdir/.git";
-
+my $ssw = "spread-sheet-widget-0.4";
 if (@ARGV == 2) {
     my ($repo, $branch) = @ARGV;
 
+    my $ssw_tar = "$topdir/$ssw.tar.gz";
+    #save_result ("spread-sheet-widget source", $ssw_tar);
+    start_step ("Extract spread-sheet-widget");
+    run ("tar xzf $ssw_tar");
+
+    start_step ("Configure spread-sheet-widget");
+    run ("cd $ssw && ./configure --prefix=''");
+
+    start_step ("Build spread-sheet-widget");
+    run ("cd $ssw && make -j10");
+
+    start_step ("Install spread-sheet-widget");
+    run ("cd $ssw && make -j10 install DESTDIR=\$PWD/inst");
+
     start_step ("Fetch branch from Git");
     set_var ("git_repo", $repo);
     set_var ("git_branch", $branch);
@@ -221,7 +237,7 @@ if (@ARGV == 2) {
 Changes from $repo_version to $version:
 
  * Built from PSPP commit $revision
-   in branch $branch on host $build_host.
+   in branch $branch on builder $builder.
 
  * Built from Gnulib commit $gnulib_commit.
 
@@ -235,7 +251,7 @@ EOF
       or die "rename $fullname.new to $fullname failed: $!\n";
 
     # If we don't already have that Gnulib commit, update Gnulib.
-    system ("$GIT rev-parse --verify --quiet $gnulib_commit > /dev/null");
+    system ("$GIT rev-parse --verify --quiet $gnulib_commit^0 > /dev/null");
     if ($? != 0) {
 	start_step ("Updating Gnulib to obtain commit");
 	run ("$GIT fetch gnulib");
@@ -249,11 +265,11 @@ EOF
 
     # Bootstrap.
     start_step ("Bootstrap (make -f Smake)");
-    run ("cd pspp && make -f Smake", "bootstrap");
+    run ("cd pspp && make -f Smake -j10", "bootstrap");
 
     # Configure.
     start_step ("Configure source");
-    run ("cd pspp && mkdir _build && cd _build && ../configure", "configure");
+    run ("cd pspp && mkdir _build && cd _build && ../configure PKG_CONFIG_PATH=\$PWD/../../../source/$ssw/inst/lib/pkgconfig", "configure");
 
     # Distribute.
     start_step ("Make source tarball");
@@ -268,16 +284,15 @@ EOF
 
     # Build user manual
     start_step ("Build user manual");
-    run ("cd pspp && cp _build/doc/*.texi doc/");
-    run ("cd pspp && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp.texinfo -o $resultsdir/user-manual --email bug-gnu-pspp\@gnu.org pspp \"GNU PSPP User Manual\"", "user-manual");
+    run ("cd pspp && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp.texi -I doc -o $resultsdir/user-manual --email bug-gnu-pspp\@gnu.org pspp \"GNU PSPP User Manual\"", "user-manual");
     saved_result ("User Manual", "user-manual");
 
     # Build developer's guide
     start_step ("Build developers guide");
-    run ("cd pspp && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp-dev.texinfo -o $resultsdir/dev-guide --email bug-gnu-pspp\@gnu.org pspp-dev \"GNU PSPP Developers Guide\"", "dev-guide");
+    run ("cd pspp && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp-dev.texi -I doc -o $resultsdir/dev-guide --email bug-gnu-pspp\@gnu.org pspp-dev \"GNU PSPP Developers Guide\"", "dev-guide");
     saved_result ("Developers Guide", "dev-guide");
 } else {
-    $tarball = saved_result ("source distribution", $tarball);
+    start_step ("Starting from $tarball");
 }
 
 if ($build_binary) {
@@ -286,6 +301,11 @@ if ($build_binary) {
     set_var ("dist_ref", "refs/builds/$build_number/dist");
     set_var ("dist_commit", ref_to_commit ("refs/builds/$build_number/dist"));
 
+    start_step ("Determining $tarball target directory");
+    my $sample_filename = `zcat $tarball | tar tf - | head -1`;
+    my ($tarball_dir) = $sample_filename =~ m%^(?:[./])*([^/]+)/%;
+    set_var ("dist_dir", $tarball_dir);
+
     start_step ("Extracting source tarball");
     run ("zcat $tarball | (cd $builddir && tar xf -)");
 
@@ -293,15 +313,16 @@ if ($build_binary) {
     my ($version) = `cd $builddir/$tarball_dir && ./configure --version | head -1`
       =~ /configure (\S+)$/;
     set_var ("dist_version", $version);
-    my ($binary_version) = "$version-$build_host-build$build_number";
+    my ($binary_version) = "$version-$builder-build$build_number";
     set_var ("binary_version", $binary_version);
 
     start_step ("Configuring");
     run ("chmod -R a-w $builddir/$tarball_dir");
     run ("chmod u+w $builddir/$tarball_dir");
+    run ("chmod -R u+w $builddir/$tarball_dir/perl-module");
     run ("mkdir $builddir/$tarball_dir/_build");
     run ("chmod a-w $builddir/$tarball_dir");
-    my $ok = try_run ("cd $builddir/$tarball_dir/_build && ../configure --enable-relocatable --prefix=''", "bin-configure");
+    my $ok = try_run ("cd $builddir/$tarball_dir/_build && ../configure --with-perl-module --enable-relocatable --prefix='' PKG_CONFIG_PATH=\$PWD/../../../source/$ssw/inst/lib/pkgconfig CPPFLAGS=\"-I\$PWD/../../../source/$ssw/inst/include\" LDFLAGS=\"-L\$PWD/../../../source/$ssw/inst/lib\"", "bin-configure");
     for my $basename ("config.h", "config.log") {
 	save_result_if_exists ("build configuration",
 			       "$builddir/$tarball_dir/_build/$basename");
@@ -309,10 +330,14 @@ if ($build_binary) {
     fail () if !$ok;
 
     start_step ("Build");
-    run ("cd $builddir/$tarball_dir/_build && make", "build");
+    run ("cd $builddir/$tarball_dir/_build && make -j10", "build");
+    run ("cd $builddir/$tarball_dir/_build/perl-module && perl Makefile.PL && make -j10", "build Perl module");
 
     start_step ("Install");
     run ("cd $builddir/$tarball_dir/_build && make install DESTDIR=\$PWD/pspp-$binary_version", "install");
+    run ("cd ../source/$ssw && make -j10 install DESTDIR=$builddir/$tarball_dir/_build/pspp-$binary_version");
+    run ("cd $builddir/$tarball_dir/_build/perl-module && make install DESTDIR=$builddir/$tarball_dir/_build/pspp-$binary_version", "install Perl module");
+    run ("cd $builddir/$tarball_dir/_build/perl-module && make install DESTDIR=\$PWD/inst");
 
     start_step ("Make binary distribution");
     run ("cd $builddir/$tarball_dir/_build && tar cfz pspp-$binary_version.tar.gz pspp-$binary_version");
@@ -326,9 +351,11 @@ if ($build_binary) {
     fail () if !$ok;
 
     start_step ("Uninstall");
+    run ("cd ../source/$ssw && make -j10 uninstall DESTDIR=$builddir/$tarball_dir/_build/pspp-$binary_version");
     run ("cd $builddir/$tarball_dir/_build && make uninstall DESTDIR=\$PWD/pspp-$binary_version", "uninstall");
 
     start_step ("Check uninstall");
+    run ("(cd $builddir/$tarball_dir/_build/perl-module/inst && find -type f -print) | (cd $builddir/$tarball_dir/_build/pspp-$binary_version && xargs rm)", "uninstall Perl module");
     run ("cd $builddir/$tarball_dir/_build && make distuninstallcheck distuninstallcheck_dir=\$PWD/pspp-$binary_version", "distuninstallcheck");
 
     # distcleancheck