[26637] users/pipping

[source_changes at macosforge.org]

Revision: 26637
          http://trac.macosforge.org/projects/macports/changeset/26637
Author:   pipping at macports.org
Date:     2007-07-01 02:01:03 -0700 (Sun, 01 Jul 2007)

Log Message:
-----------
== test scripts ==
remove obsolete test from create_testheaders
use a TOP_DIR constant that's identical across all tests
== merge.rb ==
make ORIGINAL_DIR into a constant

Modified Paths:
--------------
    users/pipping/build_coreutils.sh
    users/pipping/build_openssl.sh
    users/pipping/create_testheaders.sh
    users/pipping/merge.rb

Modified: users/pipping/build_coreutils.sh
===================================================================
--- users/pipping/build_coreutils.sh	2007-07-01 08:58:13 UTC (rev 26636)
+++ users/pipping/build_coreutils.sh	2007-07-01 09:01:03 UTC (rev 26637)
@@ -2,7 +2,8 @@
 
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
-TARGET=/tmp/coreutils
+TOP_DIR=/tmp
+TARGET=$TOP_DIR/coreutils
 MAKEOPTS='-s -j3'
 mkdir $TARGET
 cd $TARGET

Modified: users/pipping/build_openssl.sh
===================================================================
--- users/pipping/build_openssl.sh	2007-07-01 08:58:13 UTC (rev 26636)
+++ users/pipping/build_openssl.sh	2007-07-01 09:01:03 UTC (rev 26637)
@@ -2,7 +2,8 @@
 
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
-TARGET=/tmp/openssl
+TOP_DIR=/tmp
+TARGET=$TOP_DIR/openssl
 mkdir $TARGET
 cd $TARGET
 curl -O ftp://ftp.openssl.org/source/openssl-0.9.8e.tar.gz

Modified: users/pipping/create_testheaders.sh
===================================================================
--- users/pipping/create_testheaders.sh	2007-07-01 08:58:13 UTC (rev 26636)
+++ users/pipping/create_testheaders.sh	2007-07-01 09:01:03 UTC (rev 26637)
@@ -1,17 +1,10 @@
-TARGET=/tmp
+TOP_DIR=/tmp
+TARGET=$TOP_DIR/headers
 
 for dir in ppc ppc64 i386 x86_64; do
-    mkdir -p "$TARGET/headers_1/$dir" "$TARGET/headers_2/$dir"
+    mkdir -p "$TARGET/$dir"
 done
 
 for dir in ppc ppc64 i386 x86_64; do
-  echo "foo_${dir}_bar" > "$TARGET/headers_1/$dir/header.hpp"
+  echo "foo_${dir}_bar" > "$TARGET/$dir/header.hpp"
 done
-
-for dir in ppc i386; do
-  echo foo > "$TARGET/headers_2/$dir/header.hpp"
-done
-
-for dir in ppc64 x86_64; do
-  echo bar > "$TARGET/headers_2/$dir/header.hpp"
-done

Modified: users/pipping/merge.rb
===================================================================
--- users/pipping/merge.rb	2007-07-01 08:58:13 UTC (rev 26636)
+++ users/pipping/merge.rb	2007-07-01 09:01:03 UTC (rev 26637)
@@ -105,7 +105,7 @@
 
 arguments = MergeArguments.new(ARGV)
 
-# prevent duplicates and trailing slashes
+# avoid duplicates and trailing slashes
 ARGS=ARGV.collect {|arg| arg.chomp('/')}.uniq
 
 def true_for_all? (path, args, &block)
@@ -138,12 +138,12 @@
   end
 end
 
-original_dir=Dir.pwd
+ORIGINAL_DIR=Dir.pwd
 processed=Set.new
 
 if File.directory?(File.expand_path(arguments[:root]))
   ARGS.each {|architecture|
-    FileUtils.cd original_dir, :verbose => false
+    FileUtils.cd ORIGINAL_DIR, :verbose => false
     if File.directory? File.join(
       File.expand_path(arguments[:root]), architecture
     )
@@ -296,7 +296,7 @@
       }
     else
       raise sprintf(
-        'architecture missing from root directory: %s',
+        'architecture missing or not a directory: %s',
         architecture
       )
     end
@@ -308,4 +308,4 @@
   )
 end
 
-FileUtils.cd original_dir, :verbose => false
+FileUtils.cd ORIGINAL_DIR, :verbose => false

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070701/0ddfd660/attachment.html