From: Wei Liu <wei.liu2@citrix.com>
Date: Sun, 18 Jan 2015 14:23:38 +0000 (+0000)
Subject: Change paths and retab
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a9da0aac23341f4c1d9ff53975b3414127433ef6;p=people%2Fliuw%2Frump-build-script-junk.git

Change paths and retab
---

diff --git a/pkg-config b/pkg-config
index 920f002..738a1c7 100755
--- a/pkg-config
+++ b/pkg-config
@@ -6,7 +6,7 @@ esac
 
 package="${@:$#}"
 package="${package%% *}"
-cfgdir=$HOME/work/Rump-kernels/prefix/lib/pkgconfig
+cfgdir=/local/scratch/Rump-kernels/prefix/lib/pkgconfig
 cfgfile="$cfgdir/$package".pc
 if test -e "$cfgfile"; then
 	PKG_CONFIG_PATH="$cfgdir" exec pkg-config "$@"
diff --git a/qemu-configure-rune b/qemu-configure-rune
index c153fa5..29f1326 100755
--- a/qemu-configure-rune
+++ b/qemu-configure-rune
@@ -1,33 +1,33 @@
-export PKG_CONFIG=/u/iwj/work/Rump-kernels/junk/pkg-config
+export PKG_CONFIG=/local/scratch/Rump-kernels/rump-build-script-junk/pkg-config
 ./configure \
  --disable-linux-user \
- --cc=/u/iwj/work/Rump-kernels/rumpuser-xen/app-tools/rumpapp-xen-cc.configure \
+ --cc=/local/scratch/Rump-kernels/rumpuser-xen/app-tools/rumpapp-xen-cc.configure \
  --static --cxx=false \
  --enable-xen --target-list=i386-softmmu \
                 --enable-debug --enable-trace-backend=stderr \
-                --prefix=/u/iwj/work/Rump-kernels/prefix-qemu \
-                --libdir=/u/iwj/work/Rump-kernels/prefix-qemu/lib \
+                --prefix=/local/scratch/Rump-kernels/prefix-qemu \
+                --libdir=/local/scratch/Rump-kernels/prefix-qemu/lib \
                 --source-path=. \
                 --extra-cflags="
-                -I/u/iwj/work/Rump-kernels/xen.git/tools/../tools/include \
-                -I/u/iwj/work/Rump-kernels/xen.git/tools/../tools/libxc \
-                -I/u/iwj/work/Rump-kernels/xen.git/tools/../tools/xenstore \
-                -I/u/iwj/work/Rump-kernels/xen.git/tools/../tools/xenstore/compat \
-                -I/u/iwj/work/Rump-kernels/prefix/include \
+                -I/local/scratch/Rump-kernels/xen.git/tools/../tools/include \
+                -I/local/scratch/Rump-kernels/xen.git/tools/../tools/libxc \
+                -I/local/scratch/Rump-kernels/xen.git/tools/../tools/xenstore \
+                -I/local/scratch/Rump-kernels/xen.git/tools/../tools/xenstore/compat \
+                -I/local/scratch/Rump-kernels/prefix/include \
                 " \
                 --extra-ldflags="
-                -L/u/iwj/work/Rump-kernels/xen.git/tools/../tools/libxc \
-                -L/u/iwj/work/Rump-kernels/xen.git/tools/../tools/xenstore \
-                -L/u/iwj/work/Rump-kernels/prefix/lib \
+                -L/local/scratch/Rump-kernels/xen.git/tools/../tools/libxc \
+                -L/local/scratch/Rump-kernels/xen.git/tools/../tools/xenstore \
+                -L/local/scratch/Rump-kernels/prefix/lib \
                 " \
-                --bindir=/u/iwj/work/Rump-kernels/prefix-qemu/bin \
-                --datadir=/u/iwj/work/Rump-kernels/prefix-qemu/share/qemu-xen \
+                --bindir=/local/scratch/Rump-kernels/prefix-qemu/bin \
+                --datadir=/local/scratch/Rump-kernels/prefix-qemu/share/qemu-xen \
                 --localstatedir=/var \
                 --disable-kvm \
                 --disable-docs \
-                --includedir=/u/iwj/work/Rump-kernels/prefix/include \
-                --extra-cflags=-I/u/iwj/work/Rump-kernels/prefix/include \
-                --extra-ldflags=-I/u/iwj/work/Rump-kernels/prefix/lib \
+                --includedir=/local/scratch/Rump-kernels/prefix/include \
+                --extra-cflags=-I/local/scratch/Rump-kernels/prefix/include \
+                --extra-ldflags=-I/local/scratch/Rump-kernels/prefix/lib \
                 --disable-guest-agent
 
 #                \
diff --git a/runes b/runes
index ff3ed8b..f05e63c 100644
--- a/runes
+++ b/runes
@@ -1,10 +1,10 @@
 wget http://ftp.gnome.org/pub/gnome/sources/glib/2.32/glib-2.32.4.tar.xz
 
-../rumpuser-xen/app-tools/rumpapp-xen-configure ./configure --prefix=$HOME/work/Rump-kernels/prefix
+../rumpuser-xen/app-tools/rumpapp-xen-configure ./configure --prefix=/local/scratch/Rump-kernels/prefix
 
-PKG_CONFIG=/u/iwj/work/Rump-kernels/junk/pkg-config ../rumpuser-xen/app-tools/rumpapp-xen-configure ./configure --prefix=$HOME/work/Rump-kernels/prefix
+PKG_CONFIG=/local/scratch/Rump-kernels/rump-build-script-junk/pkg-config ../rumpuser-xen/app-tools/rumpapp-xen-configure ./configure --prefix=/local/scratch/Rump-kernels/prefix
 
-PKG_CONFIG=/u/iwj/work/Rump-kernels/junk/pkg-config ../rumpuser-xen/app-tools/rumpapp-xen-configure ./configure --prefix=$HOME/work/Rump-kernels/prefix --disable-shared
+PKG_CONFIG=/local/scratch/Rump-kernels/rump-build-script-junk/pkg-config ../rumpuser-xen/app-tools/rumpapp-xen-configure ./configure --prefix=/local/scratch/Rump-kernels/prefix --disable-shared
 
 ../rumpuser-xen/app-tools/rumpapp-xen-make -j4
 ../rumpuser-xen/app-tools/rumpapp-xen-make install
diff --git a/script b/script
index 2528fa4..021dff5 100755
--- a/script
+++ b/script
@@ -3,61 +3,61 @@
 set -e
 
 x () {
-	echo >&2 "x $*"
+        echo >&2 "x $*"
         "$@"
 }
 
 setdir () {
-	dir=$1
-	echo "==================== $dir ===================="
+        dir=$1
+        echo "==================== $dir ===================="
 }
 
 gettar () {
-	setdir $1
+        setdir $1
         local url=$2
-	if ! test -d $dir; then
-        	local dlfile="${url##*/}"
-        	rm -f "$dlfile"
+        if ! test -d $dir; then
+                local dlfile="${url##*/}"
+                rm -f "$dlfile"
                 wget "$url"
                 rm -rf d; mkdir d; cd d
-		x tar axf ../"$dlfile"
+                x tar axf ../"$dlfile"
                 cd ..
                 mv d/$dir .
-	fi
+        fi
 }
 
 dirx () {
-	cd $dir
+        cd $dir
         x "$@"
         cd ..
 }
 
 stdconfigure () {
-        dirx env PKG_CONFIG=/u/iwj/work/Rump-kernels/junk/pkg-config \
-		../rumpuser-xen/app-tools/rumpapp-xen-configure ./configure \
-		--prefix=$HOME/work/Rump-kernels/prefix --disable-shared
+        dirx env PKG_CONFIG=/local/scratch/Rump-kernels/rump-build-script-junk/pkg-config \
+                ../rumpuser-xen/app-tools/rumpapp-xen-configure ./configure \
+                --prefix=/local/scratch/Rump-kernels/prefix --disable-shared
 }
 
 stdmake () {
-	dirx ../rumpuser-xen/app-tools/rumpapp-xen-make -j4
+        dirx ../rumpuser-xen/app-tools/rumpapp-xen-make -j4
 }
 
 stdmakeinstall () {
-	dirx ../rumpuser-xen/app-tools/rumpapp-xen-make install
+        dirx ../rumpuser-xen/app-tools/rumpapp-xen-make install
 }
 
 want () {
-	gettar $1 "$2"
-	stdconfigure
-	stdmake
-	stdmakeinstall
+        gettar $1 "$2"
+        stdconfigure
+        stdmake
+        stdmakeinstall
 }
 
 gettar zlib-1.2.8 http://zlib.net/zlib-1.2.8.tar.gz
-dirx env CC=$HOME/work/Rump-kernels/rumpuser-xen/app-tools/rumpapp-xen-cc \
-        ./configure --static --prefix=$HOME/work/Rump-kernels/prefix \
-        	--libdir=$HOME/work/Rump-kernels/prefix/lib \
-                --includedir=$HOME/work/Rump-kernels/prefix/include
+dirx env CC=/local/scratch/Rump-kernels/rumpuser-xen/app-tools/rumpapp-xen-cc \
+        ./configure --static --prefix=/local/scratch/Rump-kernels/prefix \
+                --libdir=/local/scratch/Rump-kernels/prefix/lib \
+                --includedir=/local/scratch/Rump-kernels/prefix/include
 stdmake
 stdmakeinstall