Changeset 12 for trunk

Timestamp:

11/04/05 17:55:08 (19 years ago)

Author:

kdeugau

Message:

/trunk

Checkpoint
%prep, %build, and %install should all be (almost) complete
Still need handling for %{sourcenn} outside of %prep

File:

• trunk/debbuild (modified) (12 diffs)

trunk/debbuild

@@ -333 +333 @@
         redo LINE;
       }
-        if (/^\%build/) {
+      if (/^\%build/) {
         # %build.  This is pretty much just a shell script.  There
         # *are* a few macros, but we're not going to deal with them yet.
@@ -339 +339 @@
 BUILDSCRIPT: while (<SPECFILE>) {
           if (/^\%configure/) {
-            my $tmp = expandmacros($_,'cg');
-            $buildscript .= $tmp;
+            $buildscript .= expandmacros($_,'cgbp');
+          } elsif (/^\%\{(__)?make\}/) {
+            $buildscript .= expandmacros($_,'mgbp');
           } else {
-        # Need to handle %make
             last BUILDSCRIPT if /^\%/;
             $buildscript .= $_;
@@ -351 +351 @@
       if (/^\%install/) {
         $installscript .= "cd $tarballdir\n";
-        while (<SPECFILE>) {
-        # Need to handle %makeinstall
-          redo LINE if /^\%/;
-          $installscript .= $_;
-        }
+INSTALLSCRIPT: while (<SPECFILE>) {
+          if (/^\%makeinstall/) {
+            $installscript .= expandmacros($_,'igbp');
+print $installscript;
+#print "\n$tmp\n"; die;
+#            $installscript .= $tmp;
+          } else {
+            last INSTALLSCRIPT if /^\%/;
+            $installscript .= $_;
+          }
+        }
+        redo LINE;
       }
       if (/^\%clean/) {
@@ -362 +369 @@
           $cleanscript .= $_;
         }
+        $cleanscript = expandmacros($cleanscript,'gp');
       }
       if (/^\%post/) {
@@ -414 +422 @@
 
   # Expand macros as necessary.
-  $scriptletbase = expandmacros($scriptletbase,'g');
+  $scriptletbase = expandmacros($scriptletbase,'gp');
 
   $buildroot = $cmdbuildroot if $cmdbuildroot;
-  $buildroot = expandmacros($buildroot,'pg');
+  $buildroot = expandmacros($buildroot,'gp');
 
 } # end parse_spec()
@@ -428 +436 @@
 sub prep {
   # Replace some things here just to make sure.
-  $prepscript =~ s/\%\{name\}/$pkgdata{main}{name}/g;
+  $prepscript = expandmacros($prepscript,'gp');
 
   # create script filename
@@ -452 +460 @@
 # to do as rpm does and actually create a little shell script.
 sub build {
+  # Expand the macros
+  $buildscript = expandmacros($buildscript,'cgbp');
+
   # create script filename
   my $buildscriptfile = "/var/tmp/deb-tmp.build.".int(rand(99998)+1);
@@ -457 +468 @@
         or die $!;
   print BUILDSCRIPT $scriptletbase;
-
-  $buildscript = expandmacros($buildscript,'cg');
   print BUILDSCRIPT $buildscript;
   close BUILDSCRIPT;
@@ -477 +486 @@
 # Creates and executes %install script(let)
 sub install {
+  # Expand the macros
+  $installscript = expandmacros($installscript,'igbp');
+
   # create script filename
   my $installscriptfile = "/var/tmp/deb-tmp.inst.".int(rand(99998)+1);
@@ -568 +580 @@
   my $section = shift;  # We'll want to split things up a bit eventually.
 
+  # To allow the FHS-ish %configure, %make, and %makeinstall to work The Right Way.
+  # (Without clobbering the global $buildroot.)
+  my $prefix = '';
+
+# %configure, %make, and %makeinstall all share quite a pile.
+# I call it the FHS block, so it gets pushed forward as %{fhs}.
   if ($section =~ /c/) {
-    # %configure-ish macros
-    # Note that these are processed in reverse order to get the substitution order right
-    # Foistly, %configure itself:
+    # %configure macro
+    $macrostring =~ s'%configure'./configure %{fhs}';
+  } # done %configure
+
+  if ($section =~ /m/) {
+    $macrostring =~ s'%make'make %{fhs}';
+    $macrostring =~ s'%{__make}'make ';
+  } # done %make
+
+  if ($section =~ /i/) {
+    # This is where we need to mangle $prefix.
+    $macrostring =~ s'%makeinstall'make %{fhs}
+        install';
+    $prefix = $buildroot;
+  } # done %install and/or %makeinstall
+
+  # Build data
+  # Note that these are processed in reverse order to get the substitution order right
+  if ($section =~ /b/) {
 # Don't know what it's for, don't have a useful default replacement
 #       --program-prefix=%{_program_prefix} \
-# Coding Q:  Why does this not work if I move the subst string into its own isolated quotes?
-    $macrostring =~ s'%configure'./configure --host=$DEB_HOST_GNU_TYPE \
+    $macrostring =~ s'%{fhs}'--host=$DEB_HOST_GNU_TYPE \
         --build=$DEB_BUILD_GNU_TYPE \
         --prefix=%{_prefix} \
@@ -592 +625 @@
 
     # Note that the above regex terminates with the extra space
-    # "Just In Case" of user additions to the %configure line,
-    # which will then get neatly tagged on the end where they
-    # take precedence (supposedly) over the "default" ones.
-
-    $macrostring =~ s'%{_mandir}'%{_prefix}/man'g;
-    $macrostring =~ s'%{_infodir}'%{_prefix}/info'g;
-    $macrostring =~ s'%{_oldincludedir}'/usr/include'g;
-    $macrostring =~ s'%{_includedir}'%{_prefix}/include'g;
-    $macrostring =~ s'%{_libdir}'%{_exec_prefix}/%{_lib}'g;
-    $macrostring =~ s'%{_lib}'lib'g;
-    $macrostring =~ s'%{_localstatedir}'%{_prefix}/var'g;
-    $macrostring =~ s'%{_sharedstatedir}'%{_prefix}/com'g;
-    $macrostring =~ s'%{_sysconfdir}'%{_prefix}/etc'g;
-    $macrostring =~ s'%{_datadir}'%{_prefix}/share'g;
-    $macrostring =~ s'%{_libexecdir}'%{_exec_prefix}/libexec'g;
-    $macrostring =~ s'%{_sbindir}'%{_exec_prefix}/sbin'g;
-    $macrostring =~ s'%{_bindir}'%{_exec_prefix}/bin'g;
-    $macrostring =~ s'%{_exec_prefix}'%{_prefix}'g;
-    $macrostring =~ s'%{_prefix}'/usr'g;
+    # "Just In Case" of user additions, which will then get neatly
+    # tagged on the end where they take precedence (supposedly)
+    # over the "default" ones.
+
+    $macrostring =~ s|%{_mandir}|%{_datadir}/man|g;     #/usr/share/man
+    $macrostring =~ s|%{_infodir}|%{_datadir}/info|g;   #/usr/share/info
+    $macrostring =~ s|%{_oldincludedir}|$prefix/usr/include|g;  #/usr/include
+    $macrostring =~ s|%{_includedir}|$prefix%{_prefix\}/include|g;      #/usr/include
+    $macrostring =~ s|%{_libdir}|$prefix%{_exec_prefix}/%{_lib}|g;      #/usr/lib
+    $macrostring =~ s|%{_lib}|lib|g;                                            #?
+    $macrostring =~ s|%{_localstatedir}|$prefix/var|g;                  #/var
+    $macrostring =~ s|%{_sharedstatedir}|$prefix%{_prefix}/com|g;       #/usr/com WTF?
+    $macrostring =~ s|%{_sysconfdir}|$prefix/etc|g;                             #/etc
+    $macrostring =~ s|%{_datadir}|$prefix%{_prefix}/share|g;            #/usr/share
+    $macrostring =~ s|%{_libexecdir}|$prefix%{_exec_prefix}/libexec|g;  #/usr/libexec
+    $macrostring =~ s|%{_sbindir}|$prefix%{_exec_prefix}/sbin|g;                #/usr/sbin
+    $macrostring =~ s|%{_bindir}|$prefix%{_exec_prefix}/bin|g;          #/usr/bin
+    $macrostring =~ s|%{_exec_prefix}|$prefix%{_prefix}|g;              #/usr
+    $macrostring =~ s|%{_prefix}|/usr|g;                        #/usr
   } # done with config section
 
-  if ($section =~ /g/) {
-    $macrostring =~ s/\%\{_topdir\}/$topdir/g;
-
-    # "fake" globals (may be tweaked by package)
+  # Package data
+  if ($section =~ /p/) {
     $macrostring =~ s/\%\{buildroot\}/$buildroot/g;
 
-    # sub-package(compatible) stuff
-    $macrostring =~ s/\%\{name\}/$pkgdata{main}{name}/g;
-    $macrostring =~ s/\%\{version\}/$pkgdata{main}{version}/g;
-    $macrostring =~ s/\%\{release\}/$pkgdata{main}{release}/g;
-  } # done with globals section
-
-  if ($section =~ /p/) {
     $macrostring =~ s/\%\{name\}/$pkgdata{main}{name}/g;
     $macrostring =~ s/\%\{version\}/$pkgdata{main}{version}/g;
@@ -631 +655 @@
   }
 
+  # Globals, and not-so-globals
+  if ($section =~ /g/) {
+    $macrostring =~ s/\%\{_topdir\}/$topdir/g;
+    $macrostring =~ s'%{_tmppath}'/var/tmp'g;
+    $macrostring =~ s'%{_docdir}'/usr/share/doc'g;
+  } # done with globals section
+
   return $macrostring;
 } # end expandmacros()