Changeset 2328 for box/trunk/infrastructure

Timestamp:

05/10/2008 16:14:24 (4 years ago)

Author:

chris

Message:

Move parcel_* functions into BoxPlatform? package to share them with
other scripts.

Add a script to print the path to the current parcel directory, for
use in configure.ac to allow this to be placed in substitutions
(contrib/windows/installer/boxbackup.mpi in particular).

Location:

box/trunk/infrastructure

Files:

• BoxPlatform.pm.in (modified) (4 diffs)
• makeparcels.pl.in (modified) (4 diffs)
• parcelpath.pl (copied) (copied from box/trunk/infrastructure/msvc/getversion.pl) (1 diff)

box/trunk/infrastructure/BoxPlatform.pm.in

@@ -6 +6 @@
 BEGIN
 {
-
         # which OS are we building under?
         $target_os = '@target_os@';
@@ -39 +38 @@
 
         # get version
-        if (! -r "VERSION.txt" and -r "../../VERSION.txt")
-        {
-                open VERSION,"../../VERSION.txt" or die "../../VERSION.txt: $!";
-        }
-        else
-        {
-                open VERSION,"VERSION.txt" or die "VERSION.txt: $!";
-        }
+        my $version_file = "VERSION.txt";
+        if (not -r $version_file) { $version_file = "../../$version_file" }
+        die "missing version file: $version_file" unless $version_file;
 
+        open VERSION, $version_file or die "$version_file: $!";
         $product_version = <VERSION>;
         chomp $product_version;
@@ -53 +48 @@
         chomp $product_name;
         close VERSION;
+
         if($product_version =~ /USE_SVN_VERSION/)
         {
@@ -117 +113 @@
 }
 
+sub parcel_root
+{
+        my $tos = $_[1] || $target_os;
+        return $product_name.'-'.$product_version.'-'.$_[0].'-'.$tos;
+}
+
+sub parcel_dir
+{
+        'parcels/'.parcel_root($_[0], $_[1])
+}
+
+sub parcel_target
+{
+        parcel_dir($_[0]).'.tgz'
+}
+
 1;
 

box/trunk/infrastructure/makeparcels.pl.in

@@ -99 +99 @@
 for my $parcel (@parcels)
 {
-        print MAKE "\trm -rf ",parcel_dir($parcel),"\n";
-        print MAKE "\trm -f ",parcel_target($parcel),"\n";
+        print MAKE "\trm -rf ", BoxPlatform::parcel_dir($parcel),    "\n";
+        print MAKE "\trm -f ",  BoxPlatform::parcel_target($parcel), "\n";
 }
 print MAKE "\tif [ `uname -o` = 'Cygwin' ]; then find release debug -type f | xargs -r rm -f; else find release debug -type f -exec rm -f {} \\;; fi\n";
@@ -111 +111 @@
 for my $parcel (@parcels)
 {
-        my $target = parcel_target($parcel);
-        my $dir = parcel_dir($parcel);
+        my $target = BoxPlatform::parcel_target($parcel);
+        my $dir    = BoxPlatform::parcel_dir($parcel);
         my @parcel_deps;
 
@@ -216 +216 @@
         }
         
-        my $root = parcel_root($parcel);
+        my $root = BoxPlatform::parcel_root($parcel);
 
         unless ($target_windows)
@@ -257 +257 @@
 close INSTALLMSG;
 
-sub parcel_root
-{
-        $product_name.'-'.$product_version.'-'.$_[0].'-'.$target_os
-}
-
-sub parcel_dir
-{
-        'parcels/'.parcel_root($_[0])
-}
-
-sub parcel_target
-{
-        parcel_dir($_[0]).'.tgz'
-}

box/trunk/infrastructure/parcelpath.pl

@@ -1 +1 @@
 #!perl
 
+unless (@ARGV == 2)
+{
+        die "Usage: $0 <parcel-name> <target-os>\n";
+}
+
 $basedir = $0;
-$basedir =~ s/\\[^\\]*$//;
-$basedir =~ s/\\[^\\]*$//;
-$basedir =~ s/\\[^\\]*$//;
-$basedir =~ s/\\[^\\]*$//;
-$basedir =~ s/\\[^\\]*$//;
+$basedir =~ s|/.*||;
+$basedir .= "/..";
 -d $basedir or die "$basedir: $!";
 chdir $basedir or die "$basedir: $!";
+require "infrastructure/BoxPlatform.pm.in";
 
-require "$basedir\\infrastructure\\BoxPlatform.pm.in";
-
-open VERSIONFILE, "> $basedir/lib/common/BoxVersion.h" 
-        or die "BoxVersion.h: $!";
-print VERSIONFILE "#define BOX_VERSION \"$BoxPlatform::product_version\"\n";
-close VERSIONFILE;
+print BoxPlatform::parcel_dir(@ARGV) . "\n";
 
 exit 0;