Add DSC comments to non-packaged resource.

bwipp · Jan 19, 2014 · 74f84d6 · 74f84d6
1 parent 757b765
commit 74f84d6
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 28 deletions.
diff --git a/Makefile b/Makefile
@@ -167,8 +167,8 @@ $(MONOLITHIC_MKDIRSTAMP):
 	mkdir -p $(MONOLITHIC_MKDIRS)
 	touch $@
 
-$(MONOLITHIC_FILE): $(SOURCES) $(SRCDIR)/ps.head $(VERSION_FILE) $(UPR_FILE) $(MONOLITHIC_MKDIRSTAMP)
-	$(DSTDIR)/make_monolithic >$@
+$(MONOLITHIC_FILE): $(TARGETS_RES) $(SRCDIR)/ps.head $(VERSION_FILE) $(UPR_FILE) $(MONOLITHIC_MKDIRSTAMP)
+	$(DSTDIR)/make_monolithic $(RESDIR)/Resource >$@
 $(MONOLITHIC_FILE_WITH_SAMPLE): $(MONOLITHIC_FILE) $(SRCDIR)/sample $(MONOLITHIC_MKDIRSTAMP)
 	cat $(MONOLITHIC_FILE) $(SRCDIR)/sample > $@
 $(MONOLITHIC_DIR)/README: $(SRCDIR)/README.monolithic $(MONOLITHIC_MKDIRSTAMP)

diff --git a/build/make_monolithic b/build/make_monolithic
@@ -33,26 +33,24 @@ while ($upr=~/^(.*)=(.*)$/mg) {
   my $src=join('',<SRC>);
   close(SRC);
 
-  (my $begin, $_, $_, my $meta, my $body, my $end)=$src=~/
+  (my $begin, $_, $_, my $meta, my $end)=$src=~/
     (^%\ --BEGIN\ (ENCODER|RENDERER|RESOURCE)\ ([\w-]+?)--$)
     (.*?)
-    (^[^%].*?)
+    ^[^%].*?
     (^%\ --END\ \2\ \3--$)
   /msgx;
 
-  if ($resourcedir ne '') {
-    open(RES,$resfile) || die "Unable to open resource file: $resfile";
-    my $res=join('',<RES>);
-    close(RES);
-    $res=~/
-      (^%%BeginResource:\ [\w\.]+\ [\w\.-]+?\ .*?$)
-      .*
-      (^%%BeginData:.*?$
-      .*
-      ^%%EndResource$)
-    /msgx;
-    $body="$1\n$2\n";
-  }
+  open(RES,$resfile) || die "Unable to open resource file: $resfile";
+  my $res=join('',<RES>);
+  close(RES);
+  $res=~/
+    (^%%BeginResource:\ [\w\.]+\ [\w\.-]+?\ .*?$)
+    .*
+    (^%%BeginData:.*?$
+    .*
+    ^%%EndResource$)
+  /msgx;
+  my $body="$1\n$2\n";
 
   print $begin;
   print $meta;

diff --git a/build/make_packaged_resource b/build/make_packaged_resource
@@ -4,10 +4,13 @@
 
 use strict;
 use File::Temp;
+use File::Basename;
 
 my $abspath=`pwd`;
 chomp $abspath;
 
+my $scriptname=basename($0);
+
 my $infile=$ARGV[0];
 my $outfile=$ARGV[1];
 
@@ -61,7 +64,7 @@ my $vmusagefile=mktemp('/tmp/vmusage.XXXXXX');
 (my $yyyy, my $mm, my $dd, $_, my $rr)=$version=~/^(\d{4})-(\d{2})-(\d{2})(-(\d{1,2}))?$/ or die 'Malformed version';
 my $qualifier="0.0 $yyyy$mm$dd".sprintf("%02d",$rr||0);
 
-print `cd build/packaged_resource/Resource && gs -P -dQUIET -dNOPAUSE -dBATCH -sDEVICE=nullpage -sInputFilename='$abspath/$outfile.tmp' -sOutputFilename='$abspath/$outfile' -sVMusageFilename='$vmusagefile' -sCategory='$category' -sKey='$key' -sVMusage='$vmusage' -sQualifier='$qualifier' -sVersion='$version' -sNeededResources='$neededresources' -sPostWatermark='$category/$key $qualifier' -- ../../make_packaged_resource.ps`;
+print `cd build/resource/Resource && gs -P -dQUIET -dNOPAUSE -dBATCH -sDEVICE=nullpage -sInputFilename='$abspath/$outfile.tmp' -sOutputFilename='$abspath/$outfile' -sVMusageFilename='$vmusagefile' -sCategory='$category' -sKey='$key' -sVMusage='$vmusage' -sQualifier='$qualifier' -sVersion='$version' -sNeededResources='$neededresources' -sPostWatermark='$category/$key $qualifier' -- ../../$scriptname.ps`;
 die 'GS create resource error' if $?;
 unlink("$outfile.tmp");
 

diff --git a/build/make_resource b/build/make_resource
@@ -3,23 +3,25 @@
 # $Id$
 
 use strict;
+use File::Temp;
+use File::Basename;
+
+my $abspath=`pwd`;
+chomp $abspath;
+
+my $scriptname=basename($0);
 
 my $infile=$ARGV[0];
 my $outfile=$ARGV[1];
 
-open(PS,$infile) || die "File not found: $infile";
-my $template=join('',<PS>);
-close(PS);
-
 open(VER,'src/VERSION') || die 'Unable to open VERSION';
 my $version=join('',<VER>);
 close VER;
 chomp $version;
 
-open(HEAD,'src/ps.head') || die 'Unable to open ps.head';
-my $head=join('',<HEAD>);
-close HEAD;
-$head=~s/XXXX-XX-XX/$version/;
+open(PS,$infile) || die "File not found: $infile";
+my $template=join('',<PS>);
+close(PS);
 
 $template=~/
     ^%\ --BEGIN\ (ENCODER|RENDERER|RESOURCE)\ ([\w-]+?)--$
@@ -28,10 +30,57 @@ $template=~/
     ^%\ --END\ \1\ \2--$
 /msgx;
 
+my $resource=$2;
+my $meta=$3;
 my $body=$4;
 
-open(PS,">$outfile") || die "Failed to write $outfile";
-print PS $head;
+(my $reqs)=$meta=~/^% --REQUIRES (.*)--$/mg;
+$reqs='' unless defined $reqs;
+
+my $neededresources='';
+foreach (split /\s+/, $reqs) {
+  if ($_ eq 'preamble') {
+    $neededresources.="Category/uk.co.terryburton.bwipp ";
+  } else {
+    $neededresources.="uk.co.terryburton.bwipp/$_ ";
+  }
+} 
+$neededresources=~s/\s+$//;
+
+open(PS,">$outfile.tmp") || die "Failed to write $outfile";
 print PS $body;
 close(PS);
 
+my $category='uk.co.terryburton.bwipp';
+my $key=$resource;
+if ($resource eq 'preamble') {
+  $category='Category';
+  $key='uk.co.terryburton.bwipp';
+}
+
+my $vmusage='0 0';
+my $vmusagefile=mktemp('/tmp/vmusage.XXXXXX');
+
+(my $yyyy, my $mm, my $dd, $_, my $rr)=$version=~/^(\d{4})-(\d{2})-(\d{2})(-(\d{1,2}))?$/ or die 'Malformed version';
+my $qualifier="0.0 $yyyy$mm$dd".sprintf("%02d",$rr||0);
+
+print `cd build/resource/Resource && gs -P -dQUIET -dNOPAUSE -dBATCH -sDEVICE=nullpage -sInputFilename='$abspath/$outfile.tmp' -sOutputFilename='$abspath/$outfile' -sVMusageFilename='$vmusagefile' -sCategory='$category' -sKey='$key' -sVMusage='$vmusage' -sQualifier='$qualifier' -sVersion='$version' -sNeededResources='$neededresources' -sPostWatermark='$category/$key $qualifier' -- ../../$scriptname.ps`;
+die 'GS create resource error' if $?;
+unlink("$outfile.tmp");
+
+my $vmout=`gs -dQUIET -dNOPAUSE -dBATCH -sDEVICE=nullpage -- $vmusagefile`;
+die 'GS measure VMusage error' if $?;
+($vmusage)=$vmout=~/VMusage \((\d+ \d+)\) def/ or die 'Failed to determine VMusage';
+unlink($vmusagefile);
+
+# Stamp VMusage into the resource
+{
+  $^I='';
+  @ARGV=($outfile);
+  while (<>) {
+    s/%%VMusage: \d+ \d+/%%VMusage: $vmusage/g;
+    s/%%BeginResource: (.*) \d+ \d+/%%BeginResource: $1 $vmusage/g;
+    print;
+  }
+}
+
diff --git a/build/make_resource.ps b/build/make_resource.ps