Build patches for IRIX. (Chad Austin)

git-svn-id: http://scons.tigris.org/svn/scons/trunk@342 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/SConstruct b/SConstruct
index dd880451b1711cc61a210307b7526b2de7d50512..e41bf1e0642f5792da58dbe066bdbce55460cc55 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -169,6 +169,9 @@ else:
     python_project_subinst_dir = lib_project
     project_script_subinst_dir = 'bin'
 
+
+zcat = 'gzip -d -c'
+    
 #
 # Figure out if we can handle .zip files.
 #
@@ -257,6 +260,8 @@ env = Environment(
                    UNZIP               = unzip,
                    UNZIPFLAGS          = '-o -d $UNPACK_ZIP_DIR',
 
+                   ZCAT                = zcat,
+
                    TEST_DEB_DIR        = test_deb_dir,
                    TEST_RPM_DIR        = test_rpm_dir,
                    TEST_SRC_TAR_GZ_DIR = test_src_tar_gz_dir,
@@ -552,7 +557,7 @@ for p in [ scons ]:
                                   src_files)
         env.Command(unpack_tar_gz_files, tar_gz, [
                     "rm -rf %s" % os.path.join(unpack_tar_gz_dir, pkg_version),
-                    "zcat $SOURCES > .temp",
+                    "$ZCAT $SOURCES > .temp",
                     "tar xf .temp -C $UNPACK_TAR_GZ_DIR",
                     "rm -f .temp",
         ])
@@ -785,7 +790,7 @@ if change:
             # with separate zcat-tar-rm commands.
             env.Command(unpack_tar_gz_files, src_tar_gz, [
                 "rm -rf %s" % os.path.join(unpack_tar_gz_dir, psv),
-                "zcat $SOURCES > .temp",
+                "$ZCAT $SOURCES > .temp",
                 "tar xf .temp -C $UNPACK_TAR_GZ_DIR",
                 "rm -f .temp",
             ])

diff --git a/doc/SConscript b/doc/SConscript
index 898f370e161b99f1fd6924e266bea4cef6b89beb..c436fb4847303f49985ce4411998bb0f867a27ef 100644 (file)
--- a/doc/SConscript
+++ b/doc/SConscript
@@ -36,9 +36,9 @@ Import('env', 'whereis')
 #
 #
 #
-doc_tar_gz = os.path.join('#build',
-                          'dist',
-                          'scons-doc-%s.tar.gz' % env.Dictionary('VERSION'))
+doc_tar = os.path.join('#build',
+                       'dist',
+                       'scons-doc-%s.tar' % env.Dictionary('VERSION'))
 
 #
 # We'll only try to build text files (for some documents)
@@ -276,5 +276,8 @@ if man2html:
 # for easy distribution to the web site.
 #
 if tar_deps:
-    env.Command(doc_tar_gz, tar_deps,
-                "tar zc${TAR_HFLAG} -f $TARGET -C build/doc %s" % tar_list)
+    doc_tar_gz = doc_tar + ".gz"
+    env.Command(doc_tar, tar_deps,
+                "tar cf${TAR_HFLAG} $TARGET -C build/doc %s" % tar_list)
+    env.Command(doc_tar_gz, doc_tar,
+                "gzip $SOURCES")

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 60c44254c1bc39a3da60117eb700d8d9e1dbbd8a..5db4d54b6a7a45f3c17a94ef4859ae47a3d192ff 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -10,6 +10,10 @@
 
 RELEASE 0.07 - 
 
+  From Chad Austin:
+
+  - Changes to build SCons packages on IRIX (and other *NIces).
+
   From Charles Crain:
 
   - Internal cleanup of environment passing to function Actions.